[solr] branch main updated: SOLR-16262: Update in-repo htaccess file

[ho...@apache.org]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new aad2abc4230 SOLR-16262: Update in-repo htaccess file
aad2abc4230 is described below

commit aad2abc4230c0ad2025ede33e9b2a5186bb5b624
Author: Houston Putman <ho...@apache.org>
AuthorDate: Thu Jun 30 13:10:54 2022 -0400

    SOLR-16262: Update in-repo htaccess file
---
 dev-tools/scripts/refguide/htaccess.txt | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/dev-tools/scripts/refguide/htaccess.txt b/dev-tools/scripts/refguide/htaccess.txt
index fdb04cdaca7..419467d09dd 100644
--- a/dev-tools/scripts/refguide/htaccess.txt
+++ b/dev-tools/scripts/refguide/htaccess.txt
@@ -1,11 +1,12 @@
-# Existing pages moved to sub path
+# Existing pages moved to sub path in the 9.0 guide
 RedirectMatch 301 ^/guide/(about-this-guide|relevance|solr-glossary|solr-tutorial)\.html /guide/solr/latest/getting-started/$1.html
-RedirectMatch 301 ^/guide/(aliases|audit-logging|authentication-and-authorization-plugins|basic-authentication-plugin|circuit-breakers|client-apis|cloud-screens|cluster-node-management|collection-management|collections-core-admin|configuring-logging|enabling-ssl|hadoop-authentication-plugin|indexupgrader-tool|installing-solr|jvm-settings|jwt-authentication-plugin|kerberos-authentication-plugin|mbean-request-handler|metrics-reporting|performance-statistics-reference|ping|plugins-stats-scr [...]
-RedirectMatch 301 ^/guide/(analysis-screen|analyzers|charfilterfactories|content-streams|de-duplication|documents-screen|docvalues|dynamic-fields|field-properties-by-use-case|field-type-definitions-and-properties|field-types-included-with-solr|indexing-nested-documents|language-analysis|luke-request-handler|phonetic-matching|post-tool|reindexing|schema-api|schema-browser-screen|schema-designer|schemaless-mode|tokenizers|transforming-and-indexing-custom-json)\.html /guide/solr/latest/inde [...]
-RedirectMatch 301 ^/guide/(analytics-expression-sources|analytics-mapping-functions|analytics-reduction-functions|analytics|collapse-and-expand-results|common-query-parameters|computational-geometry|curve-fitting|dsp|exporting-result-sets|faceting|function-queries|graph-traversal|graph|highlighting|json-facet-api|json-faceting-domain-changes|json-query-dsl|json-request-api|learning-to-rank|loading|logs|machine-learning|math-expressions|math-start|matrix-math|morelikethis|numerical-analys [...]
-RedirectMatch 301 ^/guide/(codec-factory|collections-api|config-api|config-sets|configsets-api|configuring-solrconfig-xml|coreadmin-api|implicit-requesthandlers|libs|managed-resources|package-manager-internals|package-manager|realtime-get|request-parameters-api|resource-loading|solr-plugins|update-request-processors|v2-api)\.html /guide/solr/latest/configuration-guide/$1.html
+RedirectMatch 301 ^/guide/(aliases|audit-logging|authentication-and-authorization-plugins|basic-authentication-plugin|circuit-breakers|client-apis|cloud-screens|cluster-node-management|collection-management|collections-core-admin|configuring-logging|enabling-ssl|hadoop-authentication-plugin|indexupgrader-tool|installing-solr|jvm-settings|jwt-authentication-plugin|kerberos-authentication-plugin|mbean-request-handler|metrics-reporting|performance-statistics-reference|ping|plugins-stats-scr [...]
+RedirectMatch 301 ^/guide/(analysis-screen|analyzers|charfilterfactories|content-streams|de-duplication|documents-screen|docvalues|dynamic-fields|field-properties-by-use-case|field-type-definitions-and-properties|field-types-included-with-solr|indexing-nested-documents|language-analysis|luke-request-handler|phonetic-matching|post-tool|reindexing|schema-api|schema-browser-screen|schema-designer|schemaless-mode|tokenizers|transforming-and-indexing-custom-json|language-detection|schema-elem [...]
+RedirectMatch 301 ^/guide/(analytics-expression-sources|analytics-mapping-functions|analytics-reduction-functions|analytics|collapse-and-expand-results|common-query-parameters|computational-geometry|curve-fitting|dsp|exporting-result-sets|faceting|function-queries|graph-traversal|graph|highlighting|json-facet-api|json-faceting-domain-changes|json-query-dsl|json-request-api|learning-to-rank|loading|logs|machine-learning|math-expressions|math-start|matrix-math|morelikethis|numerical-analys [...]
+RedirectMatch 301 ^/guide/(codec-factory|collections-api|config-api|config-sets|configsets-api|configuring-solrconfig-xml|coreadmin-api|implicit-requesthandlers|libs|managed-resources|package-manager-internals|package-manager|realtime-get|request-parameters-api|resource-loading|solr-plugins|update-request-processors|v2-api|script-update-processor|core-discovery)\.html /guide/solr/latest/configuration-guide/$1.html
 RedirectMatch 301 ^/guide/(major-changes-in-solr-7|major-changes-in-solr-8|solr-upgrade-notes)\.html /guide/solr/latest/upgrade-notes/$1.html
-# Page renames in 9.0
+# Page renames between 8.x and 9.0
+RewriteRule ^guide/9_0/solr-tutorial.html /guide/solr/latest/getting-started/solr-tutorial.html [R=301,NE,L]
 RewriteRule ^guide/a-quick-overview.html /guide/solr/latest/getting-started/introduction.html [R=301,NE,L]
 RewriteRule ^guide/about-filters.html /guide/solr/latest/indexing-guide/filters.html [R=301,NE,L]
 RewriteRule ^guide/about-tokenizers.html /guide/solr/latest/indexing-guide/tokenizers.html [R=301,NE,L]
@@ -110,14 +111,16 @@ RewriteRule ^guide/working-with-currencies-and-exchange-rates.html /guide/solr/l
 RewriteRule ^guide/working-with-dates.html /guide/solr/latest/indexing-guide/date-formatting-math.html [R=301,NE,L]
 RewriteRule ^guide/working-with-enum-fields.html /guide/solr/latest/indexing-guide/enum-fields.html [R=301,NE,L]
 RewriteRule ^guide/working-with-external-files-and-processes.html /guide/solr/latest/indexing-guide/external-files-processes.html [R=301,NE,L]
+RewriteRule ^guide/fields-and-schema-design.html /guide/solr/latest/indexing-guide/schema-elements.html [R=301,NE,L]
+RewriteRule ^guide/deployment-guide.html /guide/solr/latest/deployment-guide/system-requirements.html [R=301,NE,L]
+RewriteRule ^guide/neural-search.html /guide/solr/latest/query-guide/dense-vector-search.html [R=301,NE,L]
+RewriteRule ^guide/real-time-get.html /guide/solr/latest/configuration-guide/realtime-get.html [R=301,NE,L]
 # Removed pages redirected to latest 8.x guide
 RedirectMatch 301 ^/guide/(adding-custom-plugins-in-solrcloud-mode|blob-store-api|blockjoin-faceting|cdcr-api|cdcr-architecture|cdcr-config|cdcr-operations|colocating-collections|cross-data-center-replication-cdcr|dataimport-screen|errata|metrics-history|migrate-to-policy-rule|putting-the-pieces-together|rule-based-replica-placement|solrcloud-autoscaling-api|solrcloud-autoscaling-auto-add-replicas|solrcloud-autoscaling-fault-tolerance|solrcloud-autoscaling-listeners|solrcloud-autoscaling [...]
 # Paths we could not map
 
 
 # Do not index old reference guide pages on search engines, except for pages that don't exist in 9+
-<If "%{REQUEST_URI} =~ m#^/guide/(6|7|8)_.*#">
-  <If "%{REQUEST_URI} !~ m#^/guide/8_11/(adding-custom-plugins-in-solrcloud-mode|blob-store-api|blockjoin-faceting|cdcr-api|cdcr-architecture|cdcr-config|cdcr-operations|colocating-collections|cross-data-center-replication-cdcr|dataimport-screen|errata|metrics-history|migrate-to-policy-rule|putting-the-pieces-together|rule-based-replica-placement|solrcloud-autoscaling-api|solrcloud-autoscaling-auto-add-replicas|solrcloud-autoscaling-fault-tolerance|solrcloud-autoscaling-listeners|solrclo [...]
-    Header set X-Robots-Tag "noindex,nofollow,noarchive"
-  </If>
+<If "%{REQUEST_URI} =~ m#/guide/(6|7|8)_.*# && %{REQUEST_URI} !~ m#/guide/8_11/(adding-custom-plugins-in-solrcloud-mode|blob-store-api|blockjoin-faceting|cdcr-api|cdcr-architecture|cdcr-config|cdcr-operations|colocating-collections|cross-data-center-replication-cdcr|dataimport-screen|errata|metrics-history|migrate-to-policy-rule|putting-the-pieces-together|rule-based-replica-placement|solrcloud-autoscaling-api|solrcloud-autoscaling-auto-add-replicas|solrcloud-autoscaling-fault-tolerance| [...]
+  Header set X-Robots-Tag "noindex,nofollow,noarchive"
 </If>