From commits-return-22452-archive-asf-public=cust-asf.ponee.io@cayenne.apache.org Mon Jan 8 14:01:39 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id B072F180607 for ; Mon, 8 Jan 2018 14:01:39 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id A02C8160C2C; Mon, 8 Jan 2018 13:01:39 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E4D8D160C1E for ; Mon, 8 Jan 2018 14:01:38 +0100 (CET) Received: (qmail 69232 invoked by uid 500); 8 Jan 2018 13:01:38 -0000 Mailing-List: contact commits-help@cayenne.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cayenne.apache.org Delivered-To: mailing list commits@cayenne.apache.org Received: (qmail 69223 invoked by uid 99); 8 Jan 2018 13:01:38 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Jan 2018 13:01:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5955CDFBEC; Mon, 8 Jan 2018 13:01:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ntimofeev@apache.org To: commits@cayenne.apache.org Message-Id: <9136cd71685f4fe58a044cd31d2d98b6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cayenne-website git commit: test publish Date: Mon, 8 Jan 2018 13:01:35 +0000 (UTC) Repository: cayenne-website Updated Branches: refs/heads/asf-site 021ae4498 -> ed46da0da 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/ed46da0d Tree: http://git-wip-us.apache.org/repos/asf/cayenne-website/tree/ed46da0d Diff: http://git-wip-us.apache.org/repos/asf/cayenne-website/diff/ed46da0d Branch: refs/heads/asf-site Commit: ed46da0da01675b988e1e679b419f44a4cfbfcf8 Parents: 021ae44 Author: Nikita Timofeev Authored: Mon Jan 8 16:01:33 2018 +0300 Committer: Nikita Timofeev Committed: Mon Jan 8 16:01:33 2018 +0300 ---------------------------------------------------------------------- .htaccess | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/ed46da0d/.htaccess ---------------------------------------------------------------------- diff --git a/.htaccess b/.htaccess index c395df7..c735229 100644 --- a/.htaccess +++ b/.htaccess @@ -25,18 +25,19 @@ Redirect permanent /support.html /about/support/ Redirect permanent /download.html /download/ # 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 +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 +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/ Redirect permanent /about.html / Redirect permanent /collaboration.html / Redirect permanent /thanks.html / -RedirectMatch permanent /legacy(.*).html / +Redirect permanent /release-guide-2.0.html /dev/release-guide.html +RedirectMatch permanent ^/legacy(.*).html$ / # Custom 404 error page ErrorDocument 404 /404.html