[lucene-site] branch master updated: Next try...

[us...@apache.org]

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 f8d9266  Next try...
f8d9266 is described below

commit f8d926678fc3421eaaf4f6c33f826306072ab2c4
Author: Uwe Schindler <us...@apache.org>
AuthorDate: Wed Feb 26 10:53:07 2020 +0100

    Next try...
---
 themes/lucene/templates/htaccess.template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/themes/lucene/templates/htaccess.template b/themes/lucene/templates/htaccess.template
index 3d9c871..8abd8b9 100644
--- a/themes/lucene/templates/htaccess.template
+++ b/themes/lucene/templates/htaccess.template
@@ -57,8 +57,8 @@ RewriteRule ^solr/mailing_lists.html solr/resources.html#community
 
 # Simple redirect to "directory", so later rules match
 RedirectMatch temp ^/(core|solr)/api$ $0/
-RedirectMatch temp ^/(core|solr)/\d+_\d+_\d+$ $0/
-RedirectMatch temp ^/solr/guide/\d+_\d+$ $0/
+RedirectMatch Permanent ^/(core|solr)/\d+_\d+_\d+$ $0/
+RedirectMatch Permanent ^/solr/guide/\d+_\d+$ $0/
 
 # Other pages can always be redirected to the "most current" released javadocs
 # using "temp" instead of permanent so crawlers know that they
@@ -129,10 +129,9 @@ RedirectMatch Permanent ^/lucy/(.*)$ https://lucy.apache.org/
 
 ### Javadocs & Solr Refguide
 
-# This fixes redirects generated by directory-without-slash to not have the __root from next rule in it:
-RewriteRule ^__root/docs.lucene.apache.org/content/(.*)$ /$1 [R=301,L]
-
 # __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|solr)/(\d+_\d+_\d+/.*)$ __root/docs.lucene.apache.org/content/$1/$2 [PT]
 RewriteRule ^solr/guide/(\d+_\d+/.*)$ __root/docs.lucene.apache.org/content/solr/guide/$1 [PT]
 
+# This fixes redirects generated by directory-without-slash to not have the __root in it:
+Header always edit Location /__root/docs.lucene.apache.org/content/(.*)$ /$1