summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2013-04-12 17:08:08 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-12 17:08:08 +0000
commit4dd4c697bcc6f69c333b68a3e1c63e4e03a3c1dc (patch)
tree06652c6bce4297e3aef8fa6f80cfc7afada74c77 /docs
parent64461bf4f261164cb9e3022761fd217fd0028ac5 (diff)
parent21fe719dbeb815be3f739ba0d558edfdd8429574 (diff)
downloadframeworks_base-4dd4c697bcc6f69c333b68a3e1c63e4e03a3c1dc.zip
frameworks_base-4dd4c697bcc6f69c333b68a3e1c63e4e03a3c1dc.tar.gz
frameworks_base-4dd4c697bcc6f69c333b68a3e1c63e4e03a3c1dc.tar.bz2
Merge "add redirects to match changes in I1cac3419835fe8402d416c14eb11652c89b0dd81" into jb-mr1.1-docs
Diffstat (limited to 'docs')
-rw-r--r--docs/html/_redirects.yaml7
1 files changed, 4 insertions, 3 deletions
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 @@ redirects:
- 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