This is an automated email from the ASF dual-hosted git repository.
uschindler 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 6671c2c Move the refguide and javadocs
6671c2c is described below
commit 6671c2c1a9dced6a33c71f62598a878431de282d
Author: Uwe Schindler <[email protected]>
AuthorDate: Tue Aug 17 12:42:49 2021 +0200
Move the refguide and javadocs
---
themes/solr/templates/htaccess.template | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/themes/solr/templates/htaccess.template
b/themes/solr/templates/htaccess.template
index bbc9f4f..14c2c8e 100644
--- a/themes/solr/templates/htaccess.template
+++ b/themes/solr/templates/htaccess.template
@@ -76,10 +76,8 @@ RewriteRule ^operator/downloads/?$ operator/downloads.html
[PT]
### Javadocs & Refguide
# Hack: Append slash, if folder name does not end with slash - everything
containing a "." is treated as file and excluded from redirect:
-RewriteRule ^docs/\d+_\d+_\d+/(?!.+\.\w+$|.+/$).+$ $0/ [R=301,L]
-RewriteRule ^guide/\d+_\d+/(?!.+\.\w+$|.+/$).+$ $0/ [R=301,L]
+RewriteRule ^(docs|guide)/(?!.+\.\w+$|.+/$).+$ $0/ [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
+# __root/docs.solr.apache.org/ is a special alias added by INFRA-19439, so we
can refer to stuff in other places like SVN
# TODO: Move solr specific content to own root location and change these rules
-RewriteRule ^docs/(\d+_\d+_\d+/.*)$
__root/docs.lucene.apache.org/content/solr/$1 [PT]
-RewriteRule ^guide/\d+_\d+/.*$
__root/docs.lucene.apache.org/content/solr/$0 [PT]
+RewriteRule ^(docs|guide)/\d+$ __root/docs.solr.apache.org/$0 [PT]
