This is an automated email from the ASF dual-hosted git repository.
houston pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new 1e45ecd Various small cleanup items
1e45ecd is described below
commit 1e45ecd456995989706dd5284629b767ad9130d5
Author: Houston Putman <[email protected]>
AuthorDate: Fri Feb 18 11:18:40 2022 -0500
Various small cleanup items
- Remove incorrect Changelog section header
- Fix path references to ref-guide pages
(cherry picked from commit 220b386e505981ef935e0fb2055a278e19ffd946)
---
README.md | 2 +-
dev-tools/scripts/addVersion.py | 5 +----
solr/.gitattributes | 2 +-
solr/.gitignore | 2 --
solr/CHANGES.txt | 4 +---
5 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/README.md b/README.md
index 567e9b2..9c99cfe 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.py
index cbdb693..b84c39f 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/.gitattributes
index 108fefa..5add7a2 100644
--- a/solr/.gitattributes
+++ b/solr/.gitattributes
@@ -44,4 +44,4 @@ bin/post text eol=lf
# Other files to ignore from eol normalization
licenses/* -text
-solr-ref-guide/src/fonts/Inconsolata/OFL.txt -text
+solr-ref-guide/ui-src/font/Inconsolata/OFL.txt -text
diff --git a/solr/.gitignore b/solr/.gitignore
index d78365b..e6e2e7e 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.txt
index 8f3df14..f3e0fc3 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
================== 9.1.0 ==================
-Docker and modules have separate CHANGES.md files.
-
New Features
---------------------
(No changes)
