[solr-site] branch main updated: Redirect /guide/9_x to /guide/solr/9_x/ Move htaccess.ref-guide-old redirects further up in htaccess file

[ja...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

janhoy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr-site.git


The following commit(s) were added to refs/heads/main by this push:
     new f192613fd Redirect /guide/9_x to /guide/solr/9_x/ Move htaccess.ref-guide-old redirects further up in htaccess file
f192613fd is described below

commit f192613fdeada9846b3bbf5efaebec724c2fece0
Author: Jan Høydahl <ja...@users.noreply.github.com>
AuthorDate: Thu May 12 10:49:55 2022 +0200

    Redirect /guide/9_x to /guide/solr/9_x/
    Move htaccess.ref-guide-old redirects further up in htaccess file
---
 themes/solr/templates/htaccess.template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/themes/solr/templates/htaccess.template b/themes/solr/templates/htaccess.template
index 330d85aad..d35688b5c 100644
--- a/themes/solr/templates/htaccess.template
+++ b/themes/solr/templates/htaccess.template
@@ -45,6 +45,9 @@ RewriteRule ^mirrors-solr-redir.html downloads.html                    [R=301,NE
 
 RedirectMatch Permanent ^/issue_tracking.html https://issues.apache.org/jira/browse/SOLR
 
+# Redirects to help the transistion from the Solr 6-8 ref-guide to the Solr 9+ ref-guide.
+{% include "htaccess.ref-guide-old" %}
+
 # Top-level javadoc redirect in case redirected from Lucene site /solr/X_Y_Z -> solr.apache.org/x_Y_Z
 RedirectMatch Permanent ^/(\d+_\d+_\d+)$ /docs/$1/
 RedirectMatch Permanent ^/(\d+_\d+_\d+/.*)$ /docs/$1
@@ -87,6 +90,7 @@ RewriteRule ^docs/\d+.*$  __root/docs.solr.apache.org/$0 [PT]
 # Ref-guides up to 8.x
 RewriteRule ^guide/(6|7|8)_\d+.*$  __root/docs.solr.apache.org/$0 [PT]
 # Ref-guides from 9.0
+RewriteRule ^guide/(9_\d+)/?$          guide/solr/$1/ [R=301,L]
 RewriteRule ^guide/(_/.+|search-index.js)$  __root/docs.solr.apache.org/$0 [PT]
 RewriteRule ^guide/solr/(latest|\d+(?!.+\.\w+$|.+/$).+)$          $0/ [R=301,L]
 RewriteRule ^guide/solr/\d+_\d+/.*$  __root/docs.solr.apache.org/$0 [PT]
@@ -94,7 +98,3 @@ RewriteRule ^guide/solr/\d+_\d+/.*$  __root/docs.solr.apache.org/$0 [PT]
 # Redirects generated by Antora for the ref-guide
 
 {% include "htaccess.ref-guide-antora" %}
-
-# Redirects to help the transistion from the Solr 6-8 ref-guide to the Solr 9+ ref-guide.
-
-{% include "htaccess.ref-guide-old" %}