From commits-return-112456-archive-asf-public=cust-asf.ponee.io@lucene.apache.org Sat Jan 4 14:37:08 2020 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 5930A18065E for ; Sat, 4 Jan 2020 15:37:08 +0100 (CET) Received: (qmail 25790 invoked by uid 500); 4 Jan 2020 14:37:07 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 25781 invoked by uid 99); 4 Jan 2020 14:37:07 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 04 Jan 2020 14:37:07 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 818E38D80D; Sat, 4 Jan 2020 14:37:07 +0000 (UTC) Date: Sat, 04 Jan 2020 14:37:07 +0000 To: "commits@lucene.apache.org" Subject: [lucene-site] branch master updated: tweak regex for refguide/javadocs so it works with 2digit versions (e.g., 4_10_0). Also comine javadocs into one. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <157814862747.9757.371081286803281026@gitbox.apache.org> From: uschindler@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: lucene-site X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 0c27720d683fe380350e3c344a3b398499c337b6 X-Git-Newrev: 3fa9933b276897f89525c61301d9e4e2da863b85 X-Git-Rev: 3fa9933b276897f89525c61301d9e4e2da863b85 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. uschindler pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/lucene-site.git The following commit(s) were added to refs/heads/master by this push: new 3fa9933 tweak regex for refguide/javadocs so it works with 2digit versions (e.g., 4_10_0). Also comine javadocs into one. 3fa9933 is described below commit 3fa9933b276897f89525c61301d9e4e2da863b85 Author: Uwe Schindler AuthorDate: Sat Jan 4 15:36:54 2020 +0100 tweak regex for refguide/javadocs so it works with 2digit versions (e.g., 4_10_0). Also comine javadocs into one. --- content/.htaccess | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/content/.htaccess b/content/.htaccess index 2202d78..a041adc 100644 --- a/content/.htaccess +++ b/content/.htaccess @@ -121,6 +121,5 @@ RedirectMatch Permanent ^/lucy/(.*)$ https://lucy.apache.org/ ### Javadocs & Solr Refguide # __root/docs.lucene.apache.org/content/ is a special alias added by INFRA-19439, so we can refer to stuff in other places like SVN -RewriteRule ^core/(\d_\d_\d\b.*$) __root/docs.lucene.apache.org/content/core/$1 [PT] -RewriteRule ^solr/(\d_\d_\d\b.*$) __root/docs.lucene.apache.org/content/solr/$1 [PT] -RewriteRule ^solr/guide/(\d_\d\b.*$) __root/docs.lucene.apache.org/content/solr/guide/$1 [PT] +RewriteRule ^(core|solr)/(\d\d?_\d\d?_\d\d?\b.*$) __root/docs.lucene.apache.org/content/$1/$2 [PT] +RewriteRule ^solr/guide/(\d\d?_\d\d?\b.*$) __root/docs.lucene.apache.org/content/solr/guide/$1 [PT]