summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2012-12-02 18:01:55 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-12-02 18:01:55 -0800
commit4167988cdbb7c7c225e8edc0e47c9560bb2c2c8d (patch)
tree1f2f7a014dc6e4552bdce04acf6a56b47565d5ea /scripts
parent58e2715424a59f0620b61d88a5ec3d4b0036ffe2 (diff)
parent7bac2b5dd6c7115f4b7f73fda96b5d66a5471f41 (diff)
downloadandroid_development-4167988cdbb7c7c225e8edc0e47c9560bb2c2c8d.tar.gz
android_development-4167988cdbb7c7c225e8edc0e47c9560bb2c2c8d.tar.bz2
android_development-4167988cdbb7c7c225e8edc0e47c9560bb2c2c8d.zip
am 7bac2b5d: am 81c152c6: am 51b6b20f: am 6d198012: Redirects /guide/google to /google/.
* commit '7bac2b5dd6c7115f4b7f73fda96b5d66a5471f41': Redirects /guide/google to /google/.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/app_engine_server/redirects.yaml30
1 files changed, 25 insertions, 5 deletions
diff --git a/scripts/app_engine_server/redirects.yaml b/scripts/app_engine_server/redirects.yaml
index aa56bd54b..34b16a46a 100644
--- a/scripts/app_engine_server/redirects.yaml
+++ b/scripts/app_engine_server/redirects.yaml
@@ -123,13 +123,33 @@ redirects:
# new one
- src: /guide/market/
- dst: /guide/google/play/
+ dst: /google/play/
type: permanent
comment: redirect billing to new loc
+- src: /guide/google/gcm/client-javadoc/.*
+ dst: /reference/com/google/android/gcm/package-summary.html
+ type: permanent
+ comment: redirect to new loc
+
+- src: /guide/google/gcm/server-javadoc/.*
+ dst: /reference/com/google/android/gcm/server/package-summary.html
+ type: permanent
+ comment: redirect to new loc
+
+- src: /guide/google/play/services.html
+ dst: /google/play-services/index.html
+ type: permanent
+ comment: redirect to new loc
+
+- src: /guide/google/
+ dst: /google/
+ type: permanent
+ comment: redirect to new loc
+
# new one
- src: /guide/publishing/licensing.html
- dst: /guide/google/play/licensing/index.html
+ dst: /google/play/licensing/index.html
type: permanent
comment: Redirect Licensing docs to new location
@@ -149,7 +169,7 @@ redirects:
comment: bug 6755311, aidl doc found by search under tools
- src: /guide/market/publishing/multiple-apks.html
- dst: /guide/google/play/publishing/multiple-apks.html
+ dst: /google/play/publishing/multiple-apks.html
type: permanent
comment: Redirect to new location
@@ -241,7 +261,7 @@ redirects:
# new one
- src: /guide/appendix/market-filters.html
- dst: /guide/google/play/filters.html
+ dst: /google/play/filters.html
type: permanent
comment: Redirect to new location
@@ -463,7 +483,7 @@ redirects:
# ------------------- TRAINING -------------------
- src: /training/cloudsync/aesync.html
- dst: /guide/google/gcm/index.html
+ dst: /google/gcm/index.html
type: permanent
comment: Syncing with App Engine was removed because it's obsolete.