merge redirects file from ics and add redirects for tutorials
Change-Id: I28b64f6e48d6363a3c89a4e34f87db458d29e2b8
diff --git a/scripts/app_engine_server/redirects.yaml b/scripts/app_engine_server/redirects.yaml
index 87e38dd..cd07186 100644
--- a/scripts/app_engine_server/redirects.yaml
+++ b/scripts/app_engine_server/redirects.yaml
@@ -41,20 +41,324 @@
# # Redirect /android to /droids/android and /bugdroid to
# # /droids/bugdroid. However, it will not redirect /droid or
# # /bugdroids.
+
#
# - src: /google
# dst: http://www.google.com
# type: temporary
# # This is an example of a redirect to an absolute URI.
#
+#
+# WATCH OUT -- SRC LINE HAS TO START WITH A HYPHEN !!
redirects:
- src: /%2B/?$
- dst: https://plus.google.com/b/108967384991768947849/
+ dst: https://plus.google.com/108967384991768947849/posts
type: permanent
comment: Redirect /+ and /+/ to Google+
+# new one works
+- src: /sdk/android-
+ dst: /about/versions/android-
+ type: permanent
+ comment: Redirect sdk reference to new location
+
+# new one works
+- src: /sdk/oem-usb.html
+ dst: /tools/extras/oem-usb.html
+ type: permanent
+ comment: Redirect sdk reference to new location
+
+# new one works
+- src: /sdk/compatibility-library.html
+ dst: /tools/extras/support-library.html
+ type: permanent
+ comment: Redirect sdk reference to new location
+
+# new one works
+- src: /sdk/eclipse-adt.html
+ dst: /tools/sdk/eclipse-adt.html
+ type: permanent
+ comment: Redirect sdk reference to new location
+
+# new one works
+- src: /sdk/tools-notes.html
+ dst: /tools/sdk/tools-notes.html
+ type: permanent
+ comment: Redirect sdk reference to new location
+
+# new one works
+- src: /sdk/adding-components.html
+ dst: /sdk/exploring.html
+ type: permanent
+ comment: Redirect sdk reference to new location
+
+#new one works
+- src: /sdk/ndk/
+ dst: /tools/sdk/ndk/
+ type: permanent
+ comment: Redirect sdk reference to new location
+
+#new one works
+- src: /sdk/requirements.html
+ dst: /sdk/index.html
+ type: permanent
+ comment: Redirect sdk reference to new location
+
+#- src: /sdk/(?!index.html|installing/|exploring)
+# dst: /tools/sdk/
+# type: permanent
+# comment: Redirect sdk reference to new location
+
+#- src: /sdk/compatibility
+# dst: /tools/sdk/support-package.html
+# type: permanent
+# comment: Redirect to new location
+
+# new one
+- src: /guide/market/
+ dst: /guide/google/play/
+ type: permanent
+ comment: redirect billing to new loc
+
+# new one
- src: /guide/publishing/licensing.html
- dst: /guide/market/licensing/index.html
+ dst: /guide/google/play/licensing/index.html
type: permanent
comment: Redirect Licensing docs to new location
+
+- src: /guide/developing/tools/
+ dst: /tools/help/
+ type: permanent
+ comment: Redirect to new location
+
+- src: /guide/developing/
+ dst: /tools/
+ type: permanent
+ comment: Redirect to new location
+
+- src: /guide/market/publishing/multiple-apks.html
+ dst: /guide/google/play/publishing/multiple-apks.html
+ type: permanent
+ comment: Redirect to new location
+
+- src: /guide/publishing/publishing.html
+ dst: /distribute/googleplay/publish/preparing.html
+ type: permanent
+ comment: Redirect to new location
+
+- src: /guide/publishing/
+ dst: /tools/publishing/
+ type: permanent
+ comment: Redirect to new location
+
+- src: /guide/topics/fundamentals.html
+ dst: /guide/components/fundamentals.html
+ type: permanent
+
+- src: /guide/topics/fundamentals/
+ dst: /guide/components/
+ type: permanent
+ comment: Redirect to new location
+
+- src: /guide/topics/clipboard/copy-paste.html
+ dst: /guide/topics/text/copy-paste.html
+ type: permanent
+ comment: Redirect to new location
+
+# new one
+- src: /guide/topics/wireless/
+ dst: /guide/topics/connectivity/
+ type: permanent
+ comment: Redirect to new location
+
+# new one
+- src: /guide/topics/drawing/.*
+ dst: /guide/topics/graphics/opengl.html
+ type: permanent
+ comment: Redirect to new location
+
+- src: /guide/topics/usb
+ dst: /guide/topics/connectivity/usb
+ type: permanent
+ comment: Redirect to new location
+
+# new one
+- src: /guide/appendix/api-levels.html
+ dst: /guide/topics/manifest/uses-sdk-element.html#ApiLevels
+ type: permanent
+ comment: Redirect to new location
+
+- src: /guide/appendix/install-location.html
+ dst: /guide/topics/data/install-location.html
+ type: permanent
+ comment: Redirect to new location
+
+# new one
+- src: /guide/basics/what-is-android.html
+ dst: /about/index.html
+ type: permanent
+ comment: Redirect to new location
+
+- src: /guide/topics/security/security.html
+ dst: /guide/topics/security/permissions.html
+ type: permanent
+ comment: Redirect to new location
+
+# new one
+- src: /guide/appendix/market-filters.html
+ dst: /guide/google/play/filters.html
+ type: permanent
+ comment: Redirect to new location
+
+- src: /guide/topics/graphics/animation.html
+ dst: /guide/topics/graphics/overview.html
+ type: permanent
+ comment: Redirect to new location
+
+- src: /guide/topics/graphics/renderscript.html
+ dst: /guide/topics/graphics/renderscript/index.html
+ type: permanent
+ comment: Redirect to new location
+
+- src: /guide/topics/renderscript/
+ dst: /guide/topics/graphics/renderscript/
+ type: permanent
+ comment: Redirect to new location
+
+- src: /guide/topics/location/obtaining-user-location.html
+ dst: /guide/topics/location/strategies.html
+ type: permanent
+ comment: Redirect to new location
+
+# new one
+- src: /guide/topics/nfc/
+ dst: /guide/topics/connectivity/nfc/
+ type: permanent
+ comment: Redirect to new location
+
+# new one
+- src: /guide/topics/wireless/
+ dst: /guide/topics/connectivity/
+ type: permanent
+ comment: Redirect to new location
+
+# new one
+- src: /guide/topics/network/
+ dst: /guide/topics/connectivity/
+ type: permanent
+ comment: Redirect to new location
+
+# new one
+- src: /resources/tutorials/hello-world.html
+ dst: /training/basics/firstapp/index.html
+ type: permanent
+ comment: Redirect to new location
+
+# add the rest of the tutorials here
+
+- src: /guide/practices/design/
+ dst: /guide/practices/
+ type: permanent
+ comment: Redirect to new location
+
+# new one
+- src: /resources/dashboard/.*
+ dst: /about/dashboards/index.html
+ type: permanent
+ comment: Redirect to new location
+
+- src: /resources/community-groups.html
+ dst: /support.html
+ type: permanent
+ comment: Redirect to new location
+
+- src: /guide/tutorials/
+ dst: /resources/tutorials/
+ type: permanent
+
+- src: /resources/tutorials/views/hello-linearlayout.html
+ dst: /guide/topics/ui/layout/linear.html
+ type: permanent
+ comment: Redirect to new location
+
+- src: /resources/tutorials/views/hello-relativelayout.html
+ dst: /guide/topics/ui/layout/relative.html
+ type: permanent
+ comment: Redirect to new location
+
+- src: /resources/tutorials/views/hello-listview.html
+ dst: /guide/topics/ui/layout/listview.html
+ type: permanent
+ comment: Redirect to new location
+
+- src: /resources/tutorials/views/hello-gridview.html
+ dst: /guide/topics/ui/layout/gridview.html
+ type: permanent
+ comment: Redirect to new location
+
+- src: /resources/tutorials/views/hello-webview.html
+ dst: /guide/webapps/webview.html
+ type: permanent
+ comment: Redirect to new location
+
+- src: /resources/tutorials/views/hello-formstuff.html
+ dst: /guide/topics/ui/controls/index.html
+ type: permanent
+ comment: Redirect to new location
+
+- src: /resources/tutorials/views/hello-datepicker.html
+ dst: /guide/topics/ui/controls/pickers.html
+ type: permanent
+ comment: Redirect to new location
+
+- src: /resources/tutorials/views/hello-timepicker.html
+ dst: /guide/topics/ui/controls/pickers.html
+ type: permanent
+ comment: Redirect to new location
+
+- src: /resources/tutorials/views/hello-autocomplete.html
+ dst: /guide/topics/ui/controls/text.html
+ type: permanent
+ comment: Redirect to new location
+
+- src: /resources/tutorials/views/hello-spinner.html
+ dst: /guide/topics/ui/controls/spinner.html
+ type: permanent
+ comment: Redirect to new location
+
+- src: /resources/tutorials/opengl/opengl-es10.html
+ dst: /training/graphics/opengl/index.html
+ type: permanent
+
+- src: /resources/tutorials/opengl/opengl-es20.html
+ dst: /training/graphics/opengl/index.html
+ type: permanent
+
+- src: /resources/samples/.*
+ dst: /tools/samples/index.html
+ type: permanent
+ comment: Redirect to new location
+
+- src: /resources/(?!articles)
+ dst: /training/
+ type: permanent
+ comment: Redirect to new location
+
+- src: /guide/publishing/publishing.html#BuildaButton
+ dst: /distribute/googleplay/promote/badges.html
+ type: permanent
+ comment: Redirect to new location
+
+- src: /guide/index.html
+ dst: /guide/components/index.html
+ type: permanent
+ comment: Redirect to new location
+
+- src: /shareables/
+ dst: http://commondatastorage.googleapis.com/androiddevelopers/shareables/
+ type: permanent
+ comment: Redirect to new location
+
+
+
\ No newline at end of file