Repository: cayenne-website Updated Branches: refs/heads/asf-site b78019ea1 -> 021ae4498
test publish Project: http://git-wip-us.apache.org/repos/asf/cayenne-website/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne-website/commit/021ae449 Tree: http://git-wip-us.apache.org/repos/asf/cayenne-website/tree/021ae449 Diff: http://git-wip-us.apache.org/repos/asf/cayenne-website/diff/021ae449 Branch: refs/heads/asf-site Commit: 021ae449814f550247542b1d21c1fb228fd2c6aa Parents: b78019e Author: Nikita Timofeev <stari...@gmail.com> Authored: Mon Jan 8 15:54:10 2018 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Mon Jan 8 15:54:10 2018 +0300 ---------------------------------------------------------------------- .htaccess | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/021ae449/.htaccess ---------------------------------------------------------------------- diff --git a/.htaccess b/.htaccess index 651c5e3..c395df7 100644 --- a/.htaccess +++ b/.htaccess @@ -24,29 +24,12 @@ Redirect permanent /running-unit-tests.html /dev/running-unit-tests.html Redirect permanent /support.html /about/support/ Redirect permanent /download.html /download/ -# 3.1 docs -RedirectMatch permanent /docs/3\.1/tutorial/(.*)\.html$ /docs/3.1/getting-started/\#$1 -RedirectMatch permanent /docs/3\.1/tutorial-rop/(.*)\.html$ /docs/3.1/getting-started-rop/\#$1 -RedirectMatch permanent /docs/3\.1/cayenne-guide/(.*)\.html$ /docs/3.1/cayenne-guide/\#$1 -RedirectMatch permanent /docs/3\.1/upgrade-guide/(.*)\.html$ /docs/3.1/upgrade-guide/#$1 -#Redirect permanent /docs/3.1/tutorial /docs/3.1/getting-started-guide -#Redirect permanent /docs/3.1/tutorial-rop /docs/3.1/getting-started-rop - -# 4.0 docs -RedirectMatch permanent /docs/4\.0/tutorial/(.*)\.html$ /docs/4.0/getting-started/#$1 -RedirectMatch permanent /docs/4\.0/tutorial-rop/(.*)\.html$ /docs/4.0/getting-started-rop/\#$1 -RedirectMatch permanent /docs/4\.0/cayenne-guide/(.*)\.html$ /docs/4.0/cayenne-guide/#$1 -RedirectMatch permanent /docs/4\.0/upgrade-guide/(.*)\.html$ /docs/4.0/upgrade-guide/#$1 -#Redirect permanent /docs/4.0/tutorial /docs/4.0/getting-started-guide -#Redirect permanent /docs/4.0/tutorial-rop /docs/4.0/getting-started-rop - -# 4.1 docs -RedirectMatch permanent /docs/4\.1/tutorial/(.*)\.html$ /docs/4.1/getting-started/$1 -RedirectMatch permanent /docs/4\.1/tutorial-rop/(.*)\.html$ /docs/4.1/getting-started-rop/\#$1 -RedirectMatch permanent /docs/4\.1/cayenne-guide/(.*)\.html$ /docs/4.1/cayenne-guide/#$1 -RedirectMatch permanent /docs/4\.1/upgrade-guide/(.*)\.html$ /docs/4.1/upgrade-guide/#$1 -#Redirect permanent /docs/4.1/tutorial /docs/4.1/getting-started-guide -#Redirect permanent /docs/4.1/tutorial-rop /docs/4.1/getting-started-rop +# Remaping docbook based docs to asciidocs based +RedirectMatch permanent /docs/([0-9\.]+)/tutorial/(.*)\.html$ /docs/$1/getting-started-guide/\#$2 +RedirectMatch permanent /docs/([0-9\.]+)/tutorial-rop/(.*)\.html$ /docs/$1/getting-started-rop/\#$2 +# Redirect all except index.html to exclude cyclic redirection +RedirectMatch permanent /docs/([0-9\.]+)/cayenne-guide/(?!index)(.*)\.html$ /docs/$1/cayenne-guide/#$2 +RedirectMatch permanent /docs/([0-9\.]+)/upgrade-guide/(?!index)(.*)\.html$ /docs/$1/upgrade-guide/#$2 # Links without direct replacement in new site Redirect permanent /docs/legacy.html /docs/3.0/
