summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2013-02-04 13:19:46 -0800
committerDirk Dougherty <ddougherty@google.com>2013-02-04 13:19:46 -0800
commit388ea1e3e55bf37f22a6b98bcd57da1cb4b31032 (patch)
tree4b9fff09dfd2ada8b8e0b110d7401fcd72e31958 /scripts
parent2e5555e04b1e78f2d6fc48e8069b33399a4cf028 (diff)
downloadandroid_development-388ea1e3e55bf37f22a6b98bcd57da1cb4b31032.tar.gz
android_development-388ea1e3e55bf37f22a6b98bcd57da1cb4b31032.tar.bz2
android_development-388ea1e3e55bf37f22a6b98bcd57da1cb4b31032.zip
Minor updates to keep androiddevdocs redirect in sync with devsite version (in frameworks/base)
Change-Id: If2fdf0b92d560fcfbbcfe0f5ec65dd6dcf471560
Diffstat (limited to 'scripts')
-rw-r--r--scripts/app_engine_server/redirects.yaml25
1 files changed, 10 insertions, 15 deletions
diff --git a/scripts/app_engine_server/redirects.yaml b/scripts/app_engine_server/redirects.yaml
index 352e9ce26..8a5ac27d3 100644
--- a/scripts/app_engine_server/redirects.yaml
+++ b/scripts/app_engine_server/redirects.yaml
@@ -171,7 +171,6 @@ redirects:
- src: /tools/aidl.html
dst: /guide/components/aidl.html
type: permanent
- comment: bug 6755311, aidl doc found by search under tools
- src: /guide/market/publishing/multiple-apks.html
dst: /google/play/publishing/multiple-apks.html
@@ -260,7 +259,7 @@ redirects:
comment: Redirect to new location
- src: /guide/topics/security/security.html
- dst: /guide/topics/security/permissions.html
+ dst: /training/articles/security-tips.html
type: permanent
comment: Redirect to new location
@@ -535,33 +534,31 @@ redirects:
- src: /4.2
dst: /about/versions/android-4.2.html
type: permanent
-
+
- src: /4.1
dst: /about/versions/android-4.1.html
type: permanent
-- src: /jb
- dst: /about/versions/jelly-bean.html
- type: permanent
-
- src: /4.0
dst: /about/versions/android-4.0.html
type: permanent
-- src: /ics
+- src: /(j|jb|jellybean)/?$
+ dst: /about/versions/jelly-bean.html
+ type: permanent
+
+- src: /(i|ics|icecreamsandwich)/?$
dst: /about/versions/android-4.0-highlights.html
type: permanent
-- src: /hc
+- src: /(h|hc|honeycomb)/?$
dst: /about/versions/android-3.0-highlights.html
type: permanent
-- src: /gb
+- src: /(g|gb|gingerbread)/?$
dst: /about/versions/android-2.3-highlights.html
type: permanent
-
-
# ---------- MISC -----------------
- src: /%2B/?$
@@ -587,6 +584,4 @@ redirects:
- src: /deviceart
dst: http://developer.android.com/distribute/promote/device-art.html
- type: permanent
-
-
+ type: permanent \ No newline at end of file