am 6dcbcb7a: am 90b9ab16: Merge commit \'b1637825\' into manualmerge

* commit '6dcbcb7a539a7704672cc22dba3ac12cf5622b36': Adjust the redirects for edu and a couple others.
2013-06-26 11:05:13 -07:00
parent 61cf860801 6dcbcb7a53
commit f3136431df
1 changed files with 10 additions and 6 deletions
--- a/scripts/app_engine_server/redirects.yaml
+++ b/scripts/app_engine_server/redirects.yaml
@@ -655,18 +655,22 @@ redirects:
  dst: http://www.youtube.com/user/androiddevelopers
  type: permanent

- src: /playbadge
+- src: /playbadge/?$
  dst: http://developer.android.com/distribute/googleplay/promote/badges.html
  type: permanent

- src: /deviceart
+- src: /deviceart/?$
  dst: http://developer.android.com/distribute/promote/device-art.html
  type: permanent

+- src: /edu/signup/?$
+  dst: https://services.google.com/fb/forms/playedu
+  type: permanent
+
+- src: /edu/?$
+  dst: /distribute/googleplay/edu/index.html
+  type: permanent
+
 - src: /edu/signup
  dst: https://services.google.com/fb/forms/playedu
  type: permanent
-
- src: /edu
-  dst: /distribute/googleplay/edu/index.html
-  type: permanent