commit d6c7d6a7e33da6f182ff138227fecc924b3c6e21
author Scott Main <smain@google.com> Fri Apr 12 10:18:39 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Apr 12 10:18:39 2013 -0700
tree e500726344b64741cca406b672cddc11efec0bc1
parent 8d53821d055a826f7b6745ab17769308df5eb547
parent 8b3516e0bba2b3ecf46b3ca8f7c459e3f8b2ac7c

am 8b3516e0: am 600d40a6: am 2545e285: am 4dd4c697: Merge "add redirects to match changes in I1cac3419835fe8402d416c14eb11652c89b0dd81" into jb-mr1.1-docs

* commit '8b3516e0bba2b3ecf46b3ca8f7c459e3f8b2ac7c':
  add redirects to match changes in I1cac3419835fe8402d416c14eb11652c89b0dd81

docs/html/_redirects.yaml

diff --git a/docs/html/_redirects.yaml b/docs/html/_redirects.yaml
index 2ca77dd..ab0d349 100644
--- a/docs/html/_redirects.yaml
+++ b/docs/html/_redirects.yaml
@@ -113,13 +113,14 @@
 - from: /guide/appendix/install-location.html
   to: /guide/topics/data/install-location.html
 
-- from: /guide/basics/what-is-android.html
+- from: /guide/basics/...
   to: /about/index.html
 
 - from: /guide/topics/security/security.html
   to: /training/articles/security-tips.html
-#  type: permanent
-#  comment: Move content and then adjust this
+
+- from: /guide/topics/security/index.html
+  to: /training/articles/security-tips.html
 
 - from: /guide/appendix/market-filters.html
   to: /google/play/filters.html