Apache Solr open-source search software
Various small cleanup items
Houston Putman220b386e5059
diff --git a/README.md b/README.mdindex 567e9b28454..9c99cfeabf8 100644--- a/README.md+++ b/README.md@@ -103,7 +103,7 @@ In order to start Solr in clustered mode, run the following.`docker run -p 8983:8983 solr solr-fg -c`For documentation on using the official docker builds, please refer to the [DockerHub page](https://hub.docker.com/_/solr).-Up to date documentation for running locally built images of this branch can be found in the [local reference guide](solr/solr-ref-guide/src/running-solr-in-docker.adoc).+Up to date documentation for running locally built images of this branch can be found in the [local reference guide](solr/solr-ref-guide/modules/deployment-guide/pages/solr-in-docker.adoc).There is also a gradle task for building custom Solr images from your local checkout.These local images are built identically to the official image except for retrieving the Solr artifacts locally instead of from the official release.diff --git a/dev-tools/scripts/addVersion.py b/dev-tools/scripts/addVersion.pyindex cbdb6934b4c..b84c39f4c3b 100755--- a/dev-tools/scripts/addVersion.py+++ b/dev-tools/scripts/addVersion.py@@ -136,10 +136,7 @@ def parse_properties_file(filename):return dict(parser.items('DUMMY_SECTION'))def get_solr_init_changes():- return dedent('''- Docker and modules have separate CHANGES.md files.-- ''')+ return ''def main():if not os.path.exists('build.gradle'):diff --git a/solr/.gitattributes b/solr/.gitattributesindex 108fefa79c4..5add7a2e5b5 100644--- a/solr/.gitattributes+++ b/solr/.gitattributes@@ -44,4 +44,4 @@ bin/post text eol=lf# Other files to ignore from eol normalizationlicenses/* -text-solr-ref-guide/src/fonts/Inconsolata/OFL.txt -text+solr-ref-guide/ui-src/font/Inconsolata/OFL.txt -textdiff --git a/solr/.gitignore b/solr/.gitignoreindex d78365b46bc..e6e2e7e442f 100644--- a/solr/.gitignore+++ b/solr/.gitignore@@ -25,5 +25,3 @@lib/test-lib/--/solr-ref-guide/node_modules/diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 7efe3e3ee6d..a40fdb89bdf 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -2,12 +2,10 @@This file lists Solr's raw release notes with details of every change to Solr.Most people will find the solr-upgrade-notes.adoc file more approachable.-https://github.com/apache/solr/blob/main/solr/solr-ref-guide/src/solr-upgrade-notes.adoc+https://github.com/apache/solr/blob/main/solr/solr-ref-guide/modules/upgrade-notes/pages/solr-upgrade-notes.adoc================== 10.0.0 ==================-Docker and modules have separate CHANGES.md files.-New Features---------------------(No changes)@@ -31,8 +29,6 @@ Other Changes================== 9.1.0 ==================-Docker and modules have separate CHANGES.md files.-New Features---------------------(No changes)