You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by db...@apache.org on 2016/03/08 23:50:57 UTC
[1/2] docs commit: Fixing /latest/ redirects.
Repository: cordova-docs
Updated Branches:
refs/heads/master 9b3848504 -> 89cb3dae4
Fixing /latest/ redirects.
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/5e590cc2
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/5e590cc2
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/5e590cc2
Branch: refs/heads/master
Commit: 5e590cc220b7c76eba2974873294a57c9886b4b0
Parents: c2b8c34
Author: Dmitry Blotsky <dm...@gmail.com>
Authored: Tue Mar 8 14:50:33 2016 -0800
Committer: Dmitry Blotsky <dm...@gmail.com>
Committed: Tue Mar 8 14:50:33 2016 -0800
----------------------------------------------------------------------
www/.htaccess | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/5e590cc2/www/.htaccess
----------------------------------------------------------------------
diff --git a/www/.htaccess b/www/.htaccess
index c757f81..e93d960 100644
--- a/www/.htaccess
+++ b/www/.htaccess
@@ -32,15 +32,6 @@ RewriteRule ^.*docs/(\w\w)/$ {{site.baseurl}}/docs/$1/latest/ [R=302,L]
# docs/XX/latest -> docs/XX/latest/
RewriteRule ^.*docs/(\w\w)/latest$ {{site.baseurl}}/docs/$1/latest/ [R=302,L]
-# rewrite only:
-# /docs/XX/latest/* -> /docs/XX/Y.Y.Y/*
-#
-# NOTE:
-# This does NOT return a redirect. It returns the resource *as if* the
-# redirected URI was requested. That is, both URIs return the same
-# resource, but the browser won't change the URI (no redirects followed).
-RewriteRule ^.*docs/(\w\w)/latest/(.*)$ {{site.baseurl}}/docs/$1/{{site.latest_docs_version}}/$2 [L]
-
# 301 (perm):
# docs/XX/edge -> docs/xx/edge/
# docs/XX/edge/ -> docs/xx/dev/
@@ -71,3 +62,17 @@ RewriteRule ^.*docs/(\w\w)/6.0.0/(.*)$ {{site.baseurl}}/docs/$1/6.x/$2 [R=301,L]
# old pages -> new pages
{% for redirect in site.data.redirects.general %}RewriteRule ^.*/{{redirect.old}}$ {{site.baseurl}}/{{redirect.new}} [NE,R=301,L]
{% endfor %}
+
+# rewrite only:
+# /docs/XX/latest/* -> /docs/XX/Y.Y.Y/*
+#
+# NOTE:
+# This does NOT return a redirect. It returns the resource *as if* the
+# redirected URI was requested. That is, both URIs return the same
+# resource, but the browser won't change the URI (no redirects followed).
+# NOTE:
+# This needs to be *after* the docs redirects because they might need the
+# "/latest/" to be in the URI in order to activate. Placing this rule
+# before them will rewrite "/latest/" to the latest version and redirects
+# for "/latest/some/path.html" will never activate.
+RewriteRule ^.*docs/(\w\w)/latest/(.*)$ {{site.baseurl}}/docs/$1/{{site.latest_docs_version}}/$2 [L]
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/2] docs commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/cordova-docs
Posted by db...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-docs
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/89cb3dae
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/89cb3dae
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/89cb3dae
Branch: refs/heads/master
Commit: 89cb3dae4c1a7dc7b1bf1b8ee2d45589be93eb32
Parents: 5e590cc 9b38485
Author: Dmitry Blotsky <dm...@gmail.com>
Authored: Tue Mar 8 14:50:39 2016 -0800
Committer: Dmitry Blotsky <dm...@gmail.com>
Committed: Tue Mar 8 14:50:39 2016 -0800
----------------------------------------------------------------------
www/docs/en/dev/guide/platforms/win8/plugin.md | 177 ++++++++++----------
1 file changed, 90 insertions(+), 87 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org