You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2021/02/24 20:08:42 UTC

[lucene-site] branch main/solr updated (d462ac2 -> 843b2c1)

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

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


    from d462ac2  Remove mention of 8.8.0 from downloads
     new 7b22ab8  Update website links in news, including "mirrors-solr-latest-redir" -> downloads.html and wiki -> cwiki
     new bfc5876  Link to both Solr release archive and Lucene release archive
     new fb9e507  Move Editing website from resources page to its own page, linked from footer. Add more video links
     new 5d9c4ec  More lucene.apache.org/solr -> solr.apache.org and wiki -> cwiki changes
     new 843b2c1  Edit some rewrite rules

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 README.md                                          |  2 +-
 content/pages/editing-website.md                   | 38 ++++++++++++++++++++++
 content/pages/quickstart.md                        |  2 +-
 content/pages/resources.md                         | 22 ++++++-------
 content/pages/security.md                          |  2 +-
 content/solr/security/2017-02-15-cve-2017-3163.md  |  2 +-
 content/solr/security/2017-07-07-cve-2017-7660.md  |  2 +-
 content/solr/security/2017-09-18-cve-2017-9803.md  |  2 +-
 content/solr/security/2017-10-18-cve-2017-9803.md  |  4 +--
 content/solr/security/2017-10-26-cve-2016-6809.md  |  2 +-
 content/solr/security/2018-04-08-cve-2018-1308.md  |  2 +-
 content/solr/security/2019-11-18-cve-2019-12409.md |  2 +-
 content/solr/security/2020-08-14-cve-2020-13941.md |  2 +-
 content/solr/security/2020-10-12-cve-2020-13957.md |  4 +--
 .../solr/solr_news/2014-02-26-4-7-0-available.md   |  2 +-
 .../solr/solr_news/2014-04-02-4-7-1-available.md   |  2 +-
 .../solr/solr_news/2014-04-15-4-7-2-available.md   |  2 +-
 .../solr/solr_news/2014-04-28-4-8-0-available.md   |  2 +-
 .../solr/solr_news/2014-05-20-4-8-1-available.md   |  2 +-
 .../solr/solr_news/2014-06-25-4-9-0-available.md   |  2 +-
 .../solr/solr_news/2014-09-03-4-10-0-available.md  |  2 +-
 .../solr/solr_news/2014-09-22-4-9-1-available.md   |  2 +-
 .../solr/solr_news/2014-09-29-4-10-1-available.md  |  2 +-
 .../solr/solr_news/2014-10-31-4-10-2-available.md  |  2 +-
 .../solr/solr_news/2014-12-29-4-10-3-available.md  |  2 +-
 .../solr_news/2015-02-20-5-0-0-ref-available.md    |  2 +-
 .../solr_news/2015-06-07-5-2-0-ref-available.md    |  2 +-
 .../solr/solr_news/2015-06-15-5-2-1-available.md   |  4 +--
 .../solr_news/2015-08-24-5-3-0-ref-available.md    |  4 +--
 .../solr/solr_news/2015-09-24-5-3-1-available.md   |  2 +-
 .../solr/solr_news/2015-12-14-5-4-0-available.md   |  2 +-
 .../solr/solr_news/2016-01-23-5-4-1-available.md   |  2 +-
 .../solr_news/2016-02-08-solr-dev-moves-to-git.md  |  4 +--
 .../solr_news/2016-02-22-5-5-0-ref-available.md    |  2 +-
 .../solr/solr_news/2016-04-08-6-0-0-available.md   |  2 +-
 .../solr/solr_news/2016-05-28-6-0-1-available.md   |  2 +-
 .../solr/solr_news/2016-06-17-6-1-0-available.md   |  4 +--
 .../solr/solr_news/2016-06-25-5-5-2-available.md   |  2 +-
 .../solr/solr_news/2016-08-25-6-2-0-available.md   |  4 +--
 .../solr/solr_news/2016-09-09-5-5-3-available.md   |  2 +-
 .../solr/solr_news/2016-09-20-6-2-1-available.md   |  2 +-
 .../solr/solr_news/2016-11-08-6-3-0-available.md   |  2 +-
 .../solr/solr_news/2017-01-23-6-4-0-available.md   |  2 +-
 .../solr/solr_news/2017-02-06-6-4-1-available.md   |  2 +-
 .../solr/solr_news/2017-02-15-5-5-4-available.md   |  2 +-
 .../solr/solr_news/2017-03-07-6-4-2-available.md   |  2 +-
 .../solr/solr_news/2017-03-27-6-5-0-available.md   |  2 +-
 .../solr/solr_news/2017-04-27-6-5-1-available.md   |  2 +-
 .../solr/solr_news/2017-06-06-6-6-0-available.md   |  2 +-
 .../solr/solr_news/2017-09-07-6-6-1-available.md   |  2 +-
 .../solr/solr_news/2017-09-20-7-0-0-available.md   |  2 +-
 .../solr/solr_news/2017-10-02-7-0-ref-available.md |  2 +-
 .../solr/solr_news/2017-10-06-7-0-1-available.md   |  4 +--
 .../solr/solr_news/2017-10-17-7-1-0-available.md   |  4 +--
 .../solr/solr_news/2017-10-18-6-6-2-available.md   |  2 +-
 .../solr/solr_news/2017-10-24-5-5-5-available.md   |  2 +-
 .../solr/solr_news/2017-11-02-7-1-ref-available.md |  2 +-
 .../solr/solr_news/2017-12-21-7-2-0-available.md   |  4 +--
 .../solr/solr_news/2018-01-15-7-2-1-available.md   |  2 +-
 .../solr/solr_news/2018-03-07-6-6-3-available.md   |  4 +--
 .../solr/solr_news/2018-04-04-7-3-0-available.md   |  6 ++--
 .../solr/solr_news/2018-05-15-7-3-1-available.md   |  2 +-
 .../solr/solr_news/2018-05-18-6-6-4-available.md   |  2 +-
 .../solr/solr_news/2018-06-27-7-4-0-available.md   |  4 +--
 .../solr/solr_news/2018-07-03-6-6-5-available.md   |  2 +-
 .../solr/solr_news/2018-09-24-7-5-0-available.md   |  4 +--
 .../solr/solr_news/2018-12-14-7-6-0-available.md   |  4 +--
 .../solr/solr_news/2019-02-11-7-7-0-available.md   |  4 +--
 .../solr/solr_news/2019-03-01-7-7-1-available.md   |  4 +--
 .../solr/solr_news/2019-03-11-7-7-ref-available.md |  2 +-
 .../solr/solr_news/2019-03-14-8-0-0-available.md   |  6 ++--
 .../solr/solr_news/2019-04-05-6-6-6-available.md   |  2 +-
 .../solr/solr_news/2019-05-16-8-1-0-available.md   |  4 +--
 .../solr/solr_news/2019-05-28-8-1-1-available.md   |  4 +--
 .../solr/solr_news/2019-06-04-7-7-2-available.md   |  4 +--
 .../solr/solr_news/2019-07-26-8-2-0-available.md   |  4 +--
 .../solr/solr_news/2019-11-02-8-3-0-available.md   |  4 +--
 .../solr/solr_news/2019-12-03-8-3-1-available.md   |  6 ++--
 .../solr/solr_news/2019-12-29-8-4-0-available.md   |  6 ++--
 .../solr/solr_news/2020-01-13-8-4-1-available.md   |  6 ++--
 .../solr/solr_news/2020-03-24-8-5-0-available.md   |  4 +--
 .../solr/solr_news/2020-04-16-8-5-1-available.md   |  2 +-
 .../solr/solr_news/2020-04-28-7-7-3-available.md   |  4 +--
 .../solr/solr_news/2020-05-26-8-5-2-available.md   |  6 ++--
 .../solr/solr_news/2020-07-15-8-6-0-available.md   |  6 ++--
 .../solr/solr_news/2020-08-13-8-6-1-available.md   |  6 ++--
 .../solr/solr_news/2020-09-01-8-6-2-available.md   |  8 ++---
 .../solr/solr_news/2020-10-07-8-6-3-available.md   |  6 ++--
 .../solr/solr_news/2020-11-03-8-7-0-available.md   |  6 ++--
 .../solr/solr_news/2021-01-29-8-8-0-available.md   |  6 ++--
 .../solr/solr_news/2021-02-22-8-8-1-available.md   |  6 ++--
 themes/solr/templates/_footer.html                 |  1 +
 themes/solr/templates/downloads.html               |  2 +-
 themes/solr/templates/features.html                |  2 +-
 themes/solr/templates/htaccess.template            | 23 ++++++++-----
 themes/solr/templates/index.html                   |  4 +--
 themes/solr/templates/resources.html               |  1 -
 97 files changed, 207 insertions(+), 164 deletions(-)
 create mode 100644 content/pages/editing-website.md


[lucene-site] 02/05: Link to both Solr release archive and Lucene release archive

Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit bfc5876fa3b624c7de880e13f1e2fce9dc8ba1ea
Author: Jan Høydahl <ja...@cominvent.com>
AuthorDate: Wed Feb 24 21:04:32 2021 +0100

    Link to both Solr release archive and Lucene release archive
---
 themes/solr/templates/downloads.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/solr/templates/downloads.html b/themes/solr/templates/downloads.html
index 087b1e5..e8370fb 100644
--- a/themes/solr/templates/downloads.html
+++ b/themes/solr/templates/downloads.html
@@ -77,7 +77,7 @@
     <a class="headerlink" href="#past-versions" title="Permanent link">&para;</a>
   </h2>
 
-  <p>Archives for all past versions of Solr are available at <a href="https://archive.apache.org/dist/lucene/solr/">the Apache archives</a>.</p>
+  <p>Archives for all past versions of Solr are available at <a href="https://archive.apache.org/dist/solr/">the Apache archives</a>. Se the <a href="https://archive.apache.org/dist/lucene/solr/">Lucene archives for pre-9.0 releases</a></p>
 
   <h2 id="about-downloads">About downloads
     <a class="headerlink" href="#about-downloads" title="Permanent link">&para;</a>


[lucene-site] 05/05: Edit some rewrite rules

Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 843b2c1997067f58c2c0a19c537c4eca6a70e2de
Author: Jan Høydahl <ja...@cominvent.com>
AuthorDate: Wed Feb 24 21:07:30 2021 +0100

    Edit some rewrite rules
---
 themes/solr/templates/htaccess.template | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/themes/solr/templates/htaccess.template b/themes/solr/templates/htaccess.template
index d3b88a3..9c2be12 100644
--- a/themes/solr/templates/htaccess.template
+++ b/themes/solr/templates/htaccess.template
@@ -30,15 +30,20 @@ RedirectMatch Permanent ^/solr/doap.rdf https://gitbox.apache.org/repos/asf?p=so
 
 # Solr site redesign
 # needs to use mod_rewrite because of the anchor fragments
-RewriteRule ^solr/books.html resources.html#solr-books                      [R=301,NE,L]
-RewriteRule ^solr/discussion.html resources.html#community                  [R=301,NE,L]
-RewriteRule ^solr/documentation.html resources.html#documentation           [R=301,NE,L]
-RewriteRule ^solr/screenshots.html features.html                            [R=301,NE,L]
-RewriteRule ^solr/solrnews.html news.html                                   [R=301,NE,L]
-RewriteRule ^solr/tutorial.html resources.html#tutorials                    [R=301,NE,L]
-RewriteRule ^solr/versioncontrol.html resources.html#solr-version-control   [R=301,NE,L]
-RewriteRule ^solr/version_control.html resources.html#solr-version-control  [R=301,NE,L]
-RewriteRule ^solr/mailing_lists.html resources.html#community               [R=301,NE,L]
+RewriteRule ^books.html resources.html#solr-books                      [R=301,NE,L]
+RewriteRule ^discussion.html community.html#mailing-lists-chat         [R=301,NE,L]
+RewriteRule ^documentation.html resources.html#documentation           [R=301,NE,L]
+RewriteRule ^screenshots.html features.html                            [R=301,NE,L]
+RewriteRule ^solrnews.html news.html                                   [R=301,NE,L]
+RewriteRule ^tutorial.html resources.html#tutorials                    [R=301,NE,L]
+RewriteRule ^versioncontrol.html resources.html#solr-version-control   [R=301,NE,L]
+RewriteRule ^version_control.html resources.html#solr-version-control  [R=301,NE,L]
+RewriteRule ^mailing_lists.html community.html#mailing-lists-chat      [R=301,NE,L]
+
+RedirectMatch Permanent ^issue_tracking.html https://issues.apache.org/jira/browse/SOLR
+RedirectMatch Permanent ^mirrors-solr-latest-redir.html downloads.html
+RedirectMatch Permanent ^mirrors-solr-3x-redir downloads.html
+RedirectMatch Permanent ^mirrors-solr-redir.html downloads.html
 
 # Simple redirect to "directory", so later rules match
 RedirectMatch temp ^/(core|solr)/api$ $0/


[lucene-site] 04/05: More lucene.apache.org/solr -> solr.apache.org and wiki -> cwiki changes

Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 5d9c4ec0ffe28ba21c8671e18acffeb92dfac47a
Author: Jan Høydahl <ja...@cominvent.com>
AuthorDate: Wed Feb 24 21:07:01 2021 +0100

    More lucene.apache.org/solr -> solr.apache.org and wiki -> cwiki changes
---
 README.md                           | 2 +-
 content/pages/quickstart.md         | 2 +-
 content/pages/security.md           | 2 +-
 themes/solr/templates/features.html | 2 +-
 themes/solr/templates/index.html    | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index fc1bb20..5813f99 100644
--- a/README.md
+++ b/README.md
@@ -83,5 +83,5 @@ Modify `SOLR_LATEST_RELEASE` and `SOLR_PREVIOUS_MAJOR_RELEASE`, and
 [5]: https://ci2.apache.org/#/builders/3
 [6]: https://solr.staged.apache.org
 [7]: https://lists.apache.org/list.html?commits@solr.apache.org
-[8]: https://wiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories
+[8]: https://wiki.apache.org/confluence/display/INFRA/Git+-+.asf.yaml+features
 [9]: http://daringfireball.net/projects/markdown/syntax
diff --git a/content/pages/quickstart.md b/content/pages/quickstart.md
index 3a39cb5..45466af 100644
--- a/content/pages/quickstart.md
+++ b/content/pages/quickstart.md
@@ -8,4 +8,4 @@ template: page
 
 # Solr Quick Start
 
-Please see the [Solr Tutorial](https://lucene.apache.org/solr/guide/solr-tutorial.html) or additional [Resources](/resources.html).
+Please see the [Solr Tutorial](https://solr.apache.org/guide/solr-tutorial.html) or additional [Resources](/resources.html).
diff --git a/content/pages/security.md b/content/pages/security.md
index a53b106..7ed73b1 100644
--- a/content/pages/security.md
+++ b/content/pages/security.md
@@ -7,7 +7,7 @@ template: security
 If you believe you have discovered a vulnerability in Solr, you may first want to consult the [list of known false positives](https://cwiki.apache.org/confluence/display/SOLR/SolrSecurity#SolrSecurity-SolrandVulnerabilityScanningTools) to make sure you are reporting a real vulnerability.
 Then please disclose responsibly by following [these ASF guidelines](https://www.apache.org/security/) for reporting.
 
-You may file your request by email to <ma...@lucene.apache.org> or alternatively file a **private** security issue in [Solr JIRA](https://issues.apache.org/jira/browse/SOLR).
+You may file your request by email to <ma...@solr.apache.org>.
 
 ## More information
 You will find more security related information on our Wiki: <https://cwiki.apache.org/confluence/display/SOLR/SolrSecurity>, such as information on how to treat the automated reports from security scanning tools.
diff --git a/themes/solr/templates/features.html b/themes/solr/templates/features.html
index 860d6b6..296f3e6 100644
--- a/themes/solr/templates/features.html
+++ b/themes/solr/templates/features.html
@@ -586,7 +586,7 @@
     </div>
     <div class="row">
       <div class="centered">
-        <a class="btn1" href="http://wiki.apache.org/solr/HowToContribute">How to contribute</a>
+        <a class="btn1" href="https://cwiki.apache.org/confluence/display/solr/HowToContribute">How to contribute</a>
       <div>
     </div>
   </ul>
diff --git a/themes/solr/templates/index.html b/themes/solr/templates/index.html
index 8225928..76136e1 100644
--- a/themes/solr/templates/index.html
+++ b/themes/solr/templates/index.html
@@ -81,7 +81,7 @@
         </a>
       </li>
       <li>
-        <a href="/resources.html#community">
+        <a href="/community.html">
           <div class="box">
             <div class="img"><img src="{{ SITEURL }}/theme/images/icon-community.svg"/></div>
             <div class="title">
@@ -215,7 +215,7 @@
     </ul>
   </div>
   <div class="text-center small">
-    <p>Want to see more?  Want to see your app or website here? Visit Solr's <a href="https://wiki.apache.org/solr/PublicServers">Public Servers</a> listing page to learn more.</p>
+    <p>Want to see more?  Want to see your app or website here? Visit Solr's <a href="https://cwiki.apache.org/confluence/display/solr/PublicServers">Public Servers</a> listing page to learn more.</p>
   </div>
 </section>
 


[lucene-site] 01/05: Update website links in news, including "mirrors-solr-latest-redir" -> downloads.html and wiki -> cwiki

Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 7b22ab86716cb96ba625c07cd2512352bb47fafe
Author: Jan Høydahl <ja...@cominvent.com>
AuthorDate: Wed Feb 24 21:02:46 2021 +0100

    Update website links in news, including "mirrors-solr-latest-redir" -> downloads.html and wiki -> cwiki
---
 content/solr/security/2017-02-15-cve-2017-3163.md          | 2 +-
 content/solr/security/2017-07-07-cve-2017-7660.md          | 2 +-
 content/solr/security/2017-09-18-cve-2017-9803.md          | 2 +-
 content/solr/security/2017-10-18-cve-2017-9803.md          | 4 ++--
 content/solr/security/2017-10-26-cve-2016-6809.md          | 2 +-
 content/solr/security/2018-04-08-cve-2018-1308.md          | 2 +-
 content/solr/security/2019-11-18-cve-2019-12409.md         | 2 +-
 content/solr/security/2020-08-14-cve-2020-13941.md         | 2 +-
 content/solr/security/2020-10-12-cve-2020-13957.md         | 4 ++--
 content/solr/solr_news/2014-02-26-4-7-0-available.md       | 2 +-
 content/solr/solr_news/2014-04-02-4-7-1-available.md       | 2 +-
 content/solr/solr_news/2014-04-15-4-7-2-available.md       | 2 +-
 content/solr/solr_news/2014-04-28-4-8-0-available.md       | 2 +-
 content/solr/solr_news/2014-05-20-4-8-1-available.md       | 2 +-
 content/solr/solr_news/2014-06-25-4-9-0-available.md       | 2 +-
 content/solr/solr_news/2014-09-03-4-10-0-available.md      | 2 +-
 content/solr/solr_news/2014-09-22-4-9-1-available.md       | 2 +-
 content/solr/solr_news/2014-09-29-4-10-1-available.md      | 2 +-
 content/solr/solr_news/2014-10-31-4-10-2-available.md      | 2 +-
 content/solr/solr_news/2014-12-29-4-10-3-available.md      | 2 +-
 content/solr/solr_news/2015-02-20-5-0-0-ref-available.md   | 2 +-
 content/solr/solr_news/2015-06-07-5-2-0-ref-available.md   | 2 +-
 content/solr/solr_news/2015-06-15-5-2-1-available.md       | 4 ++--
 content/solr/solr_news/2015-08-24-5-3-0-ref-available.md   | 4 ++--
 content/solr/solr_news/2015-09-24-5-3-1-available.md       | 2 +-
 content/solr/solr_news/2015-12-14-5-4-0-available.md       | 2 +-
 content/solr/solr_news/2016-01-23-5-4-1-available.md       | 2 +-
 content/solr/solr_news/2016-02-08-solr-dev-moves-to-git.md | 4 ++--
 content/solr/solr_news/2016-02-22-5-5-0-ref-available.md   | 2 +-
 content/solr/solr_news/2016-04-08-6-0-0-available.md       | 2 +-
 content/solr/solr_news/2016-05-28-6-0-1-available.md       | 2 +-
 content/solr/solr_news/2016-06-17-6-1-0-available.md       | 4 ++--
 content/solr/solr_news/2016-06-25-5-5-2-available.md       | 2 +-
 content/solr/solr_news/2016-08-25-6-2-0-available.md       | 4 ++--
 content/solr/solr_news/2016-09-09-5-5-3-available.md       | 2 +-
 content/solr/solr_news/2016-09-20-6-2-1-available.md       | 2 +-
 content/solr/solr_news/2016-11-08-6-3-0-available.md       | 2 +-
 content/solr/solr_news/2017-01-23-6-4-0-available.md       | 2 +-
 content/solr/solr_news/2017-02-06-6-4-1-available.md       | 2 +-
 content/solr/solr_news/2017-02-15-5-5-4-available.md       | 2 +-
 content/solr/solr_news/2017-03-07-6-4-2-available.md       | 2 +-
 content/solr/solr_news/2017-03-27-6-5-0-available.md       | 2 +-
 content/solr/solr_news/2017-04-27-6-5-1-available.md       | 2 +-
 content/solr/solr_news/2017-06-06-6-6-0-available.md       | 2 +-
 content/solr/solr_news/2017-09-07-6-6-1-available.md       | 2 +-
 content/solr/solr_news/2017-09-20-7-0-0-available.md       | 2 +-
 content/solr/solr_news/2017-10-02-7-0-ref-available.md     | 2 +-
 content/solr/solr_news/2017-10-06-7-0-1-available.md       | 4 ++--
 content/solr/solr_news/2017-10-17-7-1-0-available.md       | 4 ++--
 content/solr/solr_news/2017-10-18-6-6-2-available.md       | 2 +-
 content/solr/solr_news/2017-10-24-5-5-5-available.md       | 2 +-
 content/solr/solr_news/2017-11-02-7-1-ref-available.md     | 2 +-
 content/solr/solr_news/2017-12-21-7-2-0-available.md       | 4 ++--
 content/solr/solr_news/2018-01-15-7-2-1-available.md       | 2 +-
 content/solr/solr_news/2018-03-07-6-6-3-available.md       | 4 ++--
 content/solr/solr_news/2018-04-04-7-3-0-available.md       | 6 +++---
 content/solr/solr_news/2018-05-15-7-3-1-available.md       | 2 +-
 content/solr/solr_news/2018-05-18-6-6-4-available.md       | 2 +-
 content/solr/solr_news/2018-06-27-7-4-0-available.md       | 4 ++--
 content/solr/solr_news/2018-07-03-6-6-5-available.md       | 2 +-
 content/solr/solr_news/2018-09-24-7-5-0-available.md       | 4 ++--
 content/solr/solr_news/2018-12-14-7-6-0-available.md       | 4 ++--
 content/solr/solr_news/2019-02-11-7-7-0-available.md       | 4 ++--
 content/solr/solr_news/2019-03-01-7-7-1-available.md       | 4 ++--
 content/solr/solr_news/2019-03-11-7-7-ref-available.md     | 2 +-
 content/solr/solr_news/2019-03-14-8-0-0-available.md       | 6 +++---
 content/solr/solr_news/2019-04-05-6-6-6-available.md       | 2 +-
 content/solr/solr_news/2019-05-16-8-1-0-available.md       | 4 ++--
 content/solr/solr_news/2019-05-28-8-1-1-available.md       | 4 ++--
 content/solr/solr_news/2019-06-04-7-7-2-available.md       | 4 ++--
 content/solr/solr_news/2019-07-26-8-2-0-available.md       | 4 ++--
 content/solr/solr_news/2019-11-02-8-3-0-available.md       | 4 ++--
 content/solr/solr_news/2019-12-03-8-3-1-available.md       | 6 +++---
 content/solr/solr_news/2019-12-29-8-4-0-available.md       | 6 +++---
 content/solr/solr_news/2020-01-13-8-4-1-available.md       | 6 +++---
 content/solr/solr_news/2020-03-24-8-5-0-available.md       | 4 ++--
 content/solr/solr_news/2020-04-16-8-5-1-available.md       | 2 +-
 content/solr/solr_news/2020-04-28-7-7-3-available.md       | 4 ++--
 content/solr/solr_news/2020-05-26-8-5-2-available.md       | 6 +++---
 content/solr/solr_news/2020-07-15-8-6-0-available.md       | 6 +++---
 content/solr/solr_news/2020-08-13-8-6-1-available.md       | 6 +++---
 content/solr/solr_news/2020-09-01-8-6-2-available.md       | 8 ++++----
 content/solr/solr_news/2020-10-07-8-6-3-available.md       | 6 +++---
 content/solr/solr_news/2020-11-03-8-7-0-available.md       | 6 +++---
 content/solr/solr_news/2021-01-29-8-8-0-available.md       | 6 +++---
 content/solr/solr_news/2021-02-22-8-8-1-available.md       | 6 +++---
 86 files changed, 136 insertions(+), 136 deletions(-)

diff --git a/content/solr/security/2017-02-15-cve-2017-3163.md b/content/solr/security/2017-02-15-cve-2017-3163.md
index e4cbbae..16160ad 100644
--- a/content/solr/security/2017-02-15-cve-2017-3163.md
+++ b/content/solr/security/2017-02-15-cve-2017-3163.md
@@ -33,5 +33,5 @@ This issue was discovered by Hrishikesh Gadre of Cloudera Inc.
 **References:**
 
 * [https://issues.apache.org/jira/browse/SOLR-10031](https://issues.apache.org/jira/browse/SOLR-10031)
-* [https://wiki.apache.org/solr/SolrSecurity](https://wiki.apache.org/solr/SolrSecurity)
+* [https://cwiki.apache.org/confluence/display/solr/SolrSecurity](https://cwiki.apache.org/confluence/display/solr/SolrSecurity)
 
diff --git a/content/solr/security/2017-07-07-cve-2017-7660.md b/content/solr/security/2017-07-07-cve-2017-7660.md
index 1440a63..44230b0 100644
--- a/content/solr/security/2017-07-07-cve-2017-7660.md
+++ b/content/solr/security/2017-07-07-cve-2017-7660.md
@@ -39,6 +39,6 @@ This issue was discovered by Noble Paul of Lucidworks Inc.
 **References**:
 
   - <https://issues.apache.org/jira/browse/SOLR-10624>
-  - <https://wiki.apache.org/solr/SolrSecurity>
+  - <https://cwiki.apache.org/confluence/display/solr/SolrSecurity>
 
 
diff --git a/content/solr/security/2017-09-18-cve-2017-9803.md b/content/solr/security/2017-09-18-cve-2017-9803.md
index 7080e59..25c64b9 100644
--- a/content/solr/security/2017-09-18-cve-2017-9803.md
+++ b/content/solr/security/2017-09-18-cve-2017-9803.md
@@ -30,5 +30,5 @@ This issue was discovered by Hrishikesh Gadre of Cloudera Inc.
 **References**:
 
   - <https://issues.apache.org/jira/browse/SOLR-11184>
-  - <https://wiki.apache.org/solr/SolrSecurity>
+  - <https://cwiki.apache.org/confluence/display/solr/SolrSecurity>
 
diff --git a/content/solr/security/2017-10-18-cve-2017-9803.md b/content/solr/security/2017-10-18-cve-2017-9803.md
index 63c2dae..ab70183 100644
--- a/content/solr/security/2017-10-18-cve-2017-9803.md
+++ b/content/solr/security/2017-10-18-cve-2017-9803.md
@@ -32,7 +32,7 @@ At the time of the above report, this was a 0-day vulnerability with a
 working exploit affecting the versions of Solr mentioned in the
 previous section. However, mitigation steps were announced to protect
 Solr users the same day. See
-https://lucene.apache.org/solr/news.html#12-october-2017-please-secure-your-apache-solr-servers-since-a-zero-day-exploit-has-been-reported-on-a-public-mailing-list
+https://solr.apache.org/news.html#12-october-2017-please-secure-your-apache-solr-servers-since-a-zero-day-exploit-has-been-reported-on-a-public-mailing-list
 
 **Mitigation:**  
 Users are advised to upgrade to either Solr 6.6.2 or Solr 7.1.0
@@ -59,4 +59,4 @@ file re-maps the xmlparser to the edismax parser:
 
 * <https://issues.apache.org/jira/browse/SOLR-11482>
 * <https://issues.apache.org/jira/browse/SOLR-11477>
-* <https://wiki.apache.org/solr/SolrSecurity>
+* <https://cwiki.apache.org/confluence/display/solr/SolrSecurity>
diff --git a/content/solr/security/2017-10-26-cve-2016-6809.md b/content/solr/security/2017-10-26-cve-2016-6809.md
index 9502a32..e950ac4 100644
--- a/content/solr/security/2017-10-26-cve-2016-6809.md
+++ b/content/solr/security/2017-10-26-cve-2016-6809.md
@@ -39,4 +39,4 @@ Once upgrade is complete, no other steps are required.
 
 * <https://issues.apache.org/jira/browse/SOLR-11486>
 * <https://issues.apache.org/jira/browse/SOLR-10335>
-* <https://wiki.apache.org/solr/SolrSecurity>
+* <https://cwiki.apache.org/confluence/display/solr/SolrSecurity>
diff --git a/content/solr/security/2018-04-08-cve-2018-1308.md b/content/solr/security/2018-04-08-cve-2018-1308.md
index dffb790..338c971 100644
--- a/content/solr/security/2018-04-08-cve-2018-1308.md
+++ b/content/solr/security/2018-04-08-cve-2018-1308.md
@@ -43,4 +43,4 @@ secure Solr servers.
 **References:**
 
 [1] <https://issues.apache.org/jira/browse/SOLR-11971>  
-[2] <https://wiki.apache.org/solr/SolrSecurity>
+[2] <https://cwiki.apache.org/confluence/display/solr/SolrSecurity>
diff --git a/content/solr/security/2019-11-18-cve-2019-12409.md b/content/solr/security/2019-11-18-cve-2019-12409.md
index 1cc1fe8..37480cd 100644
--- a/content/solr/security/2019-11-18-cve-2019-12409.md
+++ b/content/solr/security/2019-11-18-cve-2019-12409.md
@@ -49,4 +49,4 @@ Solr JIRA user 'jnyryan' (John)
 
 **References:**  
 \[1] https://issues.apache.org/jira/browse/SOLR-13647  
-\[3] https://lucene.apache.org/solr/news.html
+\[3] https://solr.apache.org/news.html
diff --git a/content/solr/security/2020-08-14-cve-2020-13941.md b/content/solr/security/2020-08-14-cve-2020-13941.md
index e205624..806e027 100644
--- a/content/solr/security/2020-08-14-cve-2020-13941.md
+++ b/content/solr/security/2020-08-14-cve-2020-13941.md
@@ -10,7 +10,7 @@ Before Solr 8.6.  Some risks are specific to Windows.
 
 **Description:**
 Reported in SOLR-14515 (private) and fixed in SOLR-14561 (public), released in Solr version 8.6.0. 
-The Replication handler (https://lucene.apache.org/solr/guide/8_6/index-replication.html#http-api-commands-for-the-replicationhandler) allows commands backup, restore and deleteBackup. Each of these take a location parameter, which was not validated, i.e you could read/write to any location the solr user can access. 
+The Replication handler (https://solr.apache.org/guide/8_6/index-replication.html#http-api-commands-for-the-replicationhandler) allows commands backup, restore and deleteBackup. Each of these take a location parameter, which was not validated, i.e you could read/write to any location the solr user can access. 
 
 On a windows system SMB paths such as \\10.0.0.99\share\folder may also be used, leading to:
 
diff --git a/content/solr/security/2020-10-12-cve-2020-13957.md b/content/solr/security/2020-10-12-cve-2020-13957.md
index dd33a94..2ecfabc 100644
--- a/content/solr/security/2020-10-12-cve-2020-13957.md
+++ b/content/solr/security/2020-10-12-cve-2020-13957.md
@@ -16,8 +16,8 @@ Solr prevents some features considered dangerous (which could be used for remote
 **Mitigation:**
 Any of the following are enough to prevent this vulnerability:
 
-* Disable UPLOAD command in ConfigSets API if not used by setting the system property: `configset.upload.enabled` to `false` ([see docs](https://lucene.apache.org/solr/guide/8_6/configsets-api.html))
-* Use Authentication/Authorization and make sure unknown requests aren't allowed ([see docs](https://lucene.apache.org/solr/guide/8_6/authentication-and-authorization-plugins.html))
+* Disable UPLOAD command in ConfigSets API if not used by setting the system property: `configset.upload.enabled` to `false` ([see docs](https://solr.apache.org/guide/8_6/configsets-api.html))
+* Use Authentication/Authorization and make sure unknown requests aren't allowed ([see docs](https://solr.apache.org/guide/8_6/authentication-and-authorization-plugins.html))
 * Upgrade to `Solr 8.6.3` or greater.
 * If upgrading is not an option, consider applying the patch in [SOLR-14663](https://issues.apache.org/jira/browse/SOLR-14663)
 * No Solr API, including the Admin UI, is designed to be exposed to non-trusted parties. Tune your firewall so that only trusted computers and people are allowed access
diff --git a/content/solr/solr_news/2014-02-26-4-7-0-available.md b/content/solr/solr_news/2014-02-26-4-7-0-available.md
index 44dd985..a81b83d 100644
--- a/content/solr/solr_news/2014-02-26-4-7-0-available.md
+++ b/content/solr/solr_news/2014-02-26-4-7-0-available.md
@@ -15,7 +15,7 @@ fault tolerant distributed search and indexing, and powers the search
 and navigation features of many of the world's largest internet sites.
 
 Solr 4.7 is available for immediate download at:
-<https://lucene.apache.org/solr/mirrors-solr-latest-redir.html>
+<https://solr.apache.org/mirrors-solr-latest-redir.html>
 
 See the [CHANGES.txt](/solr/4_7_0/changes/Changes.html)
 file included with the release for a full list of details.
diff --git a/content/solr/solr_news/2014-04-02-4-7-1-available.md b/content/solr/solr_news/2014-04-02-4-7-1-available.md
index ae8f324..a00138f 100644
--- a/content/solr/solr_news/2014-04-02-4-7-1-available.md
+++ b/content/solr/solr_news/2014-04-02-4-7-1-available.md
@@ -14,7 +14,7 @@ fault tolerant distributed search and indexing, and powers the search
 and navigation features of many of the world's largest internet sites.
 
 Solr 4.7.1 is available for immediate download at:
-<https://lucene.apache.org/solr/mirrors-solr-latest-redir.html>
+<https://solr.apache.org/downloads.html>
 
 Solr 4.7.1 includes 28 bug fixes and one new configuration setting,
 as well as Lucene 4.7.1 and its bug fixes.
diff --git a/content/solr/solr_news/2014-04-15-4-7-2-available.md b/content/solr/solr_news/2014-04-15-4-7-2-available.md
index b503f3b..6738b3c 100644
--- a/content/solr/solr_news/2014-04-15-4-7-2-available.md
+++ b/content/solr/solr_news/2014-04-15-4-7-2-available.md
@@ -14,7 +14,7 @@ fault tolerant distributed search and indexing, and powers the search
 and navigation features of many of the world's largest internet sites.
 
 Solr 4.7.2 is available for immediate download at:
-<https://lucene.apache.org/solr/mirrors-solr-latest-redir.html>
+<https://solr.apache.org/downloads.html>
 
 Solr 4.7.2 includes 2 bug fixes,
 as well as Lucene 4.7.2 and its bug fixes.
diff --git a/content/solr/solr_news/2014-04-28-4-8-0-available.md b/content/solr/solr_news/2014-04-28-4-8-0-available.md
index 634cd8f..1c7822a 100644
--- a/content/solr/solr_news/2014-04-28-4-8-0-available.md
+++ b/content/solr/solr_news/2014-04-28-4-8-0-available.md
@@ -14,7 +14,7 @@ fault tolerant distributed search and indexing, and powers the search
 and navigation features of many of the world's largest internet sites.
 
 Solr 4.8.0 is available for immediate download at:
-<https://lucene.apache.org/solr/mirrors-solr-latest-redir.html>
+<https://solr.apache.org/downloads.html>
 
 See the [CHANGES.txt](/solr/4_8_0/changes/Changes.html)
 file included with the release for a full list of details.
diff --git a/content/solr/solr_news/2014-05-20-4-8-1-available.md b/content/solr/solr_news/2014-05-20-4-8-1-available.md
index 0c36d8d..19321fb 100644
--- a/content/solr/solr_news/2014-05-20-4-8-1-available.md
+++ b/content/solr/solr_news/2014-05-20-4-8-1-available.md
@@ -14,7 +14,7 @@ fault tolerant distributed search and indexing, and powers the search
 and navigation features of many of the world's largest internet sites.
 
 Solr 4.8.1 is available for immediate download at:
-<https://lucene.apache.org/solr/mirrors-solr-latest-redir.html>
+<https://solr.apache.org/downloads.html>
 
 Solr 4.8.1 includes 10 bug fixes,
 as well as Lucene 4.8.1 and its bug fixes.
diff --git a/content/solr/solr_news/2014-06-25-4-9-0-available.md b/content/solr/solr_news/2014-06-25-4-9-0-available.md
index 2a238aa..23cec79 100644
--- a/content/solr/solr_news/2014-06-25-4-9-0-available.md
+++ b/content/solr/solr_news/2014-06-25-4-9-0-available.md
@@ -14,7 +14,7 @@ fault tolerant distributed search and indexing, and powers the search
 and navigation features of many of the world's largest internet sites.
 
 Solr 4.9.0 is available for immediate download at:
-  <https://lucene.apache.org/solr/mirrors-solr-latest-redir.html>
+  <https://solr.apache.org/downloads.html>
 
 See the [CHANGES.txt](/solr/4_9_0/changes/Changes.html)
 file included with the release for a full list of details.
diff --git a/content/solr/solr_news/2014-09-03-4-10-0-available.md b/content/solr/solr_news/2014-09-03-4-10-0-available.md
index 5def7fb..6790340 100644
--- a/content/solr/solr_news/2014-09-03-4-10-0-available.md
+++ b/content/solr/solr_news/2014-09-03-4-10-0-available.md
@@ -14,7 +14,7 @@ fault tolerant distributed search and indexing, and powers the search
 and navigation features of many of the world's largest internet sites.
 
 Solr 4.10.0 is available for immediate download at:
-  <https://lucene.apache.org/solr/mirrors-solr-latest-redir.html>
+  <https://solr.apache.org/downloads.html>
 
 See the [CHANGES.txt](/solr/4_10_0/changes/Changes.html)
 file included with the release for a full list of details.
diff --git a/content/solr/solr_news/2014-09-22-4-9-1-available.md b/content/solr/solr_news/2014-09-22-4-9-1-available.md
index 698d0ab..1388e9f 100644
--- a/content/solr/solr_news/2014-09-22-4-9-1-available.md
+++ b/content/solr/solr_news/2014-09-22-4-9-1-available.md
@@ -14,7 +14,7 @@ fault tolerant distributed search and indexing, and powers the search
 and navigation features of many of the world's largest internet sites.
 
 Solr 4.9.1 is available for immediate download at:
-<https://lucene.apache.org/solr/mirrors-solr-latest-redir.html>
+<https://solr.apache.org/downloads.html>
 
 Solr 4.9.1 includes 2 bug fixes,
 as well as Lucene 4.9.1 and its 7 bug fixes.
diff --git a/content/solr/solr_news/2014-09-29-4-10-1-available.md b/content/solr/solr_news/2014-09-29-4-10-1-available.md
index 1c8ffdd..ae17a53 100644
--- a/content/solr/solr_news/2014-09-29-4-10-1-available.md
+++ b/content/solr/solr_news/2014-09-29-4-10-1-available.md
@@ -14,7 +14,7 @@ fault tolerant distributed search and indexing, and powers the search
 and navigation features of many of the world's largest internet sites.
 
 Solr 4.10.1 is available for immediate download at:
-<https://lucene.apache.org/solr/mirrors-solr-latest-redir.html>
+<https://solr.apache.org/downloads.html>
 
 Solr 4.10.1 includes 6 bug fixes,
 as well as Lucene 4.10.1 and its 7 bug fixes.
diff --git a/content/solr/solr_news/2014-10-31-4-10-2-available.md b/content/solr/solr_news/2014-10-31-4-10-2-available.md
index 9b45b34..74dc204 100644
--- a/content/solr/solr_news/2014-10-31-4-10-2-available.md
+++ b/content/solr/solr_news/2014-10-31-4-10-2-available.md
@@ -14,7 +14,7 @@ fault tolerant distributed search and indexing, and powers the search
 and navigation features of many of the world's largest internet sites.
 
 Solr 4.10.2 is available for immediate download at:
-<https://lucene.apache.org/solr/mirrors-solr-latest-redir.html>
+<https://solr.apache.org/downloads.html>
 
 Solr 4.10.2 includes 10 bug fixes,
 as well as Lucene 4.10.2 and its 2 bug fixes.
diff --git a/content/solr/solr_news/2014-12-29-4-10-3-available.md b/content/solr/solr_news/2014-12-29-4-10-3-available.md
index 40c522b..539f3aa 100644
--- a/content/solr/solr_news/2014-12-29-4-10-3-available.md
+++ b/content/solr/solr_news/2014-12-29-4-10-3-available.md
@@ -14,7 +14,7 @@ fault tolerant distributed search and indexing, and powers the search
 and navigation features of many of the world's largest internet sites.
 
 Solr 4.10.3 is available for immediate download at:
-<https://lucene.apache.org/solr/mirrors-solr-latest-redir.html>
+<https://solr.apache.org/downloads.html>
 
 Solr 4.10.3 includes 21 bug fixes, 5 other changes,
 as well as Lucene 4.10.3 and its 12 bug fixes.
diff --git a/content/solr/solr_news/2015-02-20-5-0-0-ref-available.md b/content/solr/solr_news/2015-02-20-5-0-0-ref-available.md
index 9a3f41a..db7c484 100644
--- a/content/solr/solr_news/2015-02-20-5-0-0-ref-available.md
+++ b/content/solr/solr_news/2015-02-20-5-0-0-ref-available.md
@@ -12,7 +12,7 @@ fault tolerant distributed search and indexing, and powers the search
 and navigation features of many of the world's largest internet sites.
 
 Solr 5.0 is available for immediate download at:
-<https://lucene.apache.org/solr/mirrors-solr-latest-redir.html>
+<https://solr.apache.org/downloads.html>
 
 See the [CHANGES.txt](/solr/5_0_0/changes/Changes.html) file included with the release for a full list of
 details.
diff --git a/content/solr/solr_news/2015-06-07-5-2-0-ref-available.md b/content/solr/solr_news/2015-06-07-5-2-0-ref-available.md
index 4fe95f5..8926b5a 100644
--- a/content/solr/solr_news/2015-06-07-5-2-0-ref-available.md
+++ b/content/solr/solr_news/2015-06-07-5-2-0-ref-available.md
@@ -12,7 +12,7 @@ fault tolerant distributed search and indexing, and powers the search
 and navigation features of many of the world's largest internet sites.
 
 Solr 5.2.0 is available for immediate download at:
-<https://lucene.apache.org/solr/mirrors-solr-latest-redir.html>
+<https://solr.apache.org/downloads.html>
 
 See the [CHANGES.txt](/solr/5_2_0/changes/Changes.html) file included with the release for a full list of details.
 
diff --git a/content/solr/solr_news/2015-06-15-5-2-1-available.md b/content/solr/solr_news/2015-06-15-5-2-1-available.md
index 71362b9..356286e 100644
--- a/content/solr/solr_news/2015-06-15-5-2-1-available.md
+++ b/content/solr/solr_news/2015-06-15-5-2-1-available.md
@@ -8,7 +8,7 @@ The Lucene PMC is pleased to announce the release of Apache Solr 5.2.1
 Solr is the popular, blazing fast, open source NoSQL search platform from the Apache Lucene project. Its major features include powerful full-text search, hit highlighting, faceted search, dynamic clustering, database integration, rich document (e.g., Word, PDF) handling, and geospatial search. Solr is highly scalable, providing fault tolerant distributed search and indexing, and powers the search and navigation features of many of the world's largest internet sites.
 
 This release contains various bug fixes and optimizations since the 5.2.0 release. The release is available for immediate download at:
-<https://lucene.apache.org/solr/mirrors-solr-latest-redir.html>
+<https://solr.apache.org/downloads.html>
 
 See the [CHANGES.txt](/solr/5_2_1/changes/Changes.html) file included with the release for a full list of details.
 
@@ -27,5 +27,5 @@ Release Highlights:
 
 See the CHANGES.txt file included with the release for a full list of changes and further details.
 
-Please report any feedback to the [mailing lists](https://lucene.apache.org/solr/discussion.html)
+Please report any feedback to the [mailing lists](https://solr.apache.org/discussion.html)
 
diff --git a/content/solr/solr_news/2015-08-24-5-3-0-ref-available.md b/content/solr/solr_news/2015-08-24-5-3-0-ref-available.md
index 8d3e3c1..2620720 100644
--- a/content/solr/solr_news/2015-08-24-5-3-0-ref-available.md
+++ b/content/solr/solr_news/2015-08-24-5-3-0-ref-available.md
@@ -12,7 +12,7 @@ fault tolerant distributed search and indexing, and powers the search
 and navigation features of many of the world's largest internet sites.
 
 Solr 5.3.0 is available for immediate download at:
-<https://lucene.apache.org/solr/mirrors-solr-latest-redir.html>
+<https://solr.apache.org/downloads.html>
 
 Solr 5.3 Release Highlights:
 
@@ -28,5 +28,5 @@ Solr 5.3 Release Highlights:
 
 See the [CHANGES.txt](/solr/5_3_0/changes/Changes.html) file included with the release for a full list of details.
 
-Please report any feedback to the [mailing lists](https://lucene.apache.org/solr/discussion.html)
+Please report any feedback to the [mailing lists](https://solr.apache.org/discussion.html)
 
diff --git a/content/solr/solr_news/2015-09-24-5-3-1-available.md b/content/solr/solr_news/2015-09-24-5-3-1-available.md
index 72b1073..1cf9791 100644
--- a/content/solr/solr_news/2015-09-24-5-3-1-available.md
+++ b/content/solr/solr_news/2015-09-24-5-3-1-available.md
@@ -5,7 +5,7 @@ save_as:
 
 The Lucene PMC is pleased to announce the release of Apache Solr 5.3.1
 
-The release can be downloaded from <https://lucene.apache.org/solr/mirrors-solr-latest-redir.html>
+The release can be downloaded from <https://solr.apache.org/downloads.html>
 
 ### Highlights of this Solr release include:
 #### Bug Fixes
diff --git a/content/solr/solr_news/2015-12-14-5-4-0-available.md b/content/solr/solr_news/2015-12-14-5-4-0-available.md
index 1df2cd9..822ba63 100644
--- a/content/solr/solr_news/2015-12-14-5-4-0-available.md
+++ b/content/solr/solr_news/2015-12-14-5-4-0-available.md
@@ -5,7 +5,7 @@ save_as:
 
 The Lucene PMC is pleased to announce the release of Apache Solr 5.4.0
 
-The release can be downloaded from <https://lucene.apache.org/solr/mirrors-solr-latest-redir.html>
+The release can be downloaded from <https://solr.apache.org/downloads.html>
 
 ### Highlights of this Solr release include:
 ####UI Changes
diff --git a/content/solr/solr_news/2016-01-23-5-4-1-available.md b/content/solr/solr_news/2016-01-23-5-4-1-available.md
index 73467be..da10294 100644
--- a/content/solr/solr_news/2016-01-23-5-4-1-available.md
+++ b/content/solr/solr_news/2016-01-23-5-4-1-available.md
@@ -14,7 +14,7 @@ fault tolerant distributed search and indexing, and powers the search
 and navigation features of many of the world's largest internet sites.
 
 Solr 5.4.1 is available for immediate download at:
-<https://lucene.apache.org/solr/mirrors-solr-latest-redir.html>
+<https://solr.apache.org/downloads.html>
 
 This release especially contains a fix for a faceting bug that could
 cause facet counts to include deleted documents and a fix for a
diff --git a/content/solr/solr_news/2016-02-08-solr-dev-moves-to-git.md b/content/solr/solr_news/2016-02-08-solr-dev-moves-to-git.md
index e8b616e..feadbf2 100644
--- a/content/solr/solr_news/2016-02-08-solr-dev-moves-to-git.md
+++ b/content/solr/solr_news/2016-02-08-solr-dev-moves-to-git.md
@@ -6,7 +6,7 @@ save_as:
 As of January 23rd 2016, Lucene/Solr source code is hosted in Apache's GIT repository.
 This means that the old SVN repository is now stale and should not be used.
 For information on working with git, please consult
-[the Solr web site](https://lucene.apache.org/solr/resources.html#solr-version-control)
+[the Solr web site](https://solr.apache.org/resources.html#solr-version-control)
 and the [wiki](https://wiki.apache.org/solr/Git%20commit%20process).
 
 The [GitHub mirror](https://github.com/apache/lucene-solr/) remains at
@@ -18,7 +18,7 @@ that other fork instead of to the Lucene developers. The only known solution is
 delete your existing fork and re-fork from [GitHub](https://github.com/apache/lucene-solr/).
 
 If you had active code changes and Pull Requests against our old GitHub mirror,
-please see [the wiki](https://wiki.apache.org/solr/HowToContribute#Working_with_GitHub)
+please see [the wiki](https://cwiki.apache.org/confluence/display/solr/HowToContribute#Working_with_GitHub)
 for some suggestions on how to proceed.
 
 The PMC is happy to answer any question you may have regarding this change.
diff --git a/content/solr/solr_news/2016-02-22-5-5-0-ref-available.md b/content/solr/solr_news/2016-02-22-5-5-0-ref-available.md
index 407c694..be1a5e4 100644
--- a/content/solr/solr_news/2016-02-22-5-5-0-ref-available.md
+++ b/content/solr/solr_news/2016-02-22-5-5-0-ref-available.md
@@ -14,7 +14,7 @@ fault tolerant distributed search and indexing, and powers the search
 and navigation features of many of the world's largest internet sites.
 
 Solr 5.5.0 is available for immediate download at:
-<https://lucene.apache.org/solr/mirrors-solr-latest-redir.html>
+<https://solr.apache.org/downloads.html>
 
 See the [CHANGES.txt](/solr/5_5_0/changes/Changes.html)
 file included with the release for a full list of details.
diff --git a/content/solr/solr_news/2016-04-08-6-0-0-available.md b/content/solr/solr_news/2016-04-08-6-0-0-available.md
index 7e26c44..ec65a0c 100644
--- a/content/solr/solr_news/2016-04-08-6-0-0-available.md
+++ b/content/solr/solr_news/2016-04-08-6-0-0-available.md
@@ -14,7 +14,7 @@ fault tolerant distributed search and indexing, and powers the search
 and navigation features of many of the world's largest internet sites.
 
 Solr 6.0.0 is available for immediate download at:
-<https://lucene.apache.org/solr/mirrors-solr-latest-redir.html>
+<https://solr.apache.org/downloads.html>
 
 See the [CHANGES.txt](/solr/6_0_0/changes/Changes.html)
 
diff --git a/content/solr/solr_news/2016-05-28-6-0-1-available.md b/content/solr/solr_news/2016-05-28-6-0-1-available.md
index eb4941e..a50ee69 100644
--- a/content/solr/solr_news/2016-05-28-6-0-1-available.md
+++ b/content/solr/solr_news/2016-05-28-6-0-1-available.md
@@ -19,6 +19,6 @@ since the 6.0.0 release.
 The release is available for immediate download at:
 <https://www.apache.org/dyn/closer.lua/lucene/solr/6.0.1>
 
-See the [CHANGES.txt](https://lucene.apache.org/solr/6_0_1/changes/Changes.html)
+See the [CHANGES.txt](https://solr.apache.org/6_0_1/changes/Changes.html)
 file included with the release for a detailed list of changes.
 
diff --git a/content/solr/solr_news/2016-06-17-6-1-0-available.md b/content/solr/solr_news/2016-06-17-6-1-0-available.md
index f30e7af..d9557ac 100644
--- a/content/solr/solr_news/2016-06-17-6-1-0-available.md
+++ b/content/solr/solr_news/2016-06-17-6-1-0-available.md
@@ -15,7 +15,7 @@ the search and navigation features of many of the world's largest
 internet sites.
 
 Solr 6.1.0 is available for immediate download at:
-<https://lucene.apache.org/solr/mirrors-solr-latest-redir.html>
+<https://solr.apache.org/downloads.html>
 
 Solr 6.1 Release Highlights:
 
@@ -31,6 +31,6 @@ Solr 6.1 Release Highlights:
 
  * New GeoJSON response writer for encoding geographic data in query responses.
 
-See the [CHANGES.txt](https://lucene.apache.org/solr/6_1_0/changes/Changes.html)
+See the [CHANGES.txt](https://solr.apache.org/6_1_0/changes/Changes.html)
 file included with the release for a detailed list of changes.
 
diff --git a/content/solr/solr_news/2016-06-25-5-5-2-available.md b/content/solr/solr_news/2016-06-25-5-5-2-available.md
index e59780e..c8eb1e4 100644
--- a/content/solr/solr_news/2016-06-25-5-5-2-available.md
+++ b/content/solr/solr_news/2016-06-25-5-5-2-available.md
@@ -19,6 +19,6 @@ since the 5.5.1 release.
 The release is available for immediate download at:
 <https://www.apache.org/dyn/closer.lua/lucene/solr/5.5.2>
 
-See the [CHANGES.txt](https://lucene.apache.org/solr/5_5_2/changes/Changes.html)
+See the [CHANGES.txt](https://solr.apache.org/5_5_2/changes/Changes.html)
 file included with the release for a detailed list of changes.
 
diff --git a/content/solr/solr_news/2016-08-25-6-2-0-available.md b/content/solr/solr_news/2016-08-25-6-2-0-available.md
index 871b7dc..32f6cbd 100644
--- a/content/solr/solr_news/2016-08-25-6-2-0-available.md
+++ b/content/solr/solr_news/2016-08-25-6-2-0-available.md
@@ -15,7 +15,7 @@ the search and navigation features of many of the world's largest
 internet sites.
 
 Solr 6.2.0 is available for immediate download at:
-<https://lucene.apache.org/solr/mirrors-solr-latest-redir.html>
+<https://solr.apache.org/downloads.html>
 
 Solr 6.2 Release Highlights:
 
@@ -63,6 +63,6 @@ Misc changes
 
   * Updated to Hadoop 2.7.2
 
-See the [CHANGES.txt](https://lucene.apache.org/solr/6_2_0/changes/Changes.html)
+See the [CHANGES.txt](https://solr.apache.org/6_2_0/changes/Changes.html)
 file included with the release for a detailed list of changes.
 
diff --git a/content/solr/solr_news/2016-09-09-5-5-3-available.md b/content/solr/solr_news/2016-09-09-5-5-3-available.md
index 3530bf1..ebc6c99 100644
--- a/content/solr/solr_news/2016-09-09-5-5-3-available.md
+++ b/content/solr/solr_news/2016-09-09-5-5-3-available.md
@@ -22,6 +22,6 @@ This release specially contains 2 critical fixes:
 The release is available for immediate download at:
 <https://www.apache.org/dyn/closer.lua/lucene/solr/5.5.3>
 
-See the [CHANGES.txt](https://lucene.apache.org/solr/5_5_3/changes/Changes.html)
+See the [CHANGES.txt](https://solr.apache.org/5_5_3/changes/Changes.html)
 file included with the release for a detailed list of changes.
 
diff --git a/content/solr/solr_news/2016-09-20-6-2-1-available.md b/content/solr/solr_news/2016-09-20-6-2-1-available.md
index c0699ad..95450ee 100644
--- a/content/solr/solr_news/2016-09-20-6-2-1-available.md
+++ b/content/solr/solr_news/2016-09-20-6-2-1-available.md
@@ -28,6 +28,6 @@ Furthermore, this release includes Apache Lucene 6.2.1 which includes 3 bug fixe
 The release is available for immediate download at:
 <https://www.apache.org/dyn/closer.lua/lucene/solr/6.2.1>
 
-See the [CHANGES.txt](https://lucene.apache.org/solr/6_2_1/changes/Changes.html)
+See the [CHANGES.txt](https://solr.apache.org/6_2_1/changes/Changes.html)
 file included with the release for a detailed list of changes.
 
diff --git a/content/solr/solr_news/2016-11-08-6-3-0-available.md b/content/solr/solr_news/2016-11-08-6-3-0-available.md
index 93d43b9..36333e8 100644
--- a/content/solr/solr_news/2016-11-08-6-3-0-available.md
+++ b/content/solr/solr_news/2016-11-08-6-3-0-available.md
@@ -15,7 +15,7 @@ the search and navigation features of many of the world's largest
 internet sites.
 
 Solr 6.3.0 is available for immediate download at:
-<https://lucene.apache.org/solr/mirrors-solr-latest-redir.html>
+<https://solr.apache.org/downloads.html>
 
 ### Highlights of this Solr release include:
 
diff --git a/content/solr/solr_news/2017-01-23-6-4-0-available.md b/content/solr/solr_news/2017-01-23-6-4-0-available.md
index 9961eba..604e23e 100644
--- a/content/solr/solr_news/2017-01-23-6-4-0-available.md
+++ b/content/solr/solr_news/2017-01-23-6-4-0-available.md
@@ -15,7 +15,7 @@ the search and navigation features of many of the world's largest
 internet sites.
 
 Solr 6.4.0 is available for immediate download at:
-<https://lucene.apache.org/solr/mirrors-solr-latest-redir.html>
+<https://solr.apache.org/downloads.html>
 
 ### Highlights of this Solr release include:
 
diff --git a/content/solr/solr_news/2017-02-06-6-4-1-available.md b/content/solr/solr_news/2017-02-06-6-4-1-available.md
index c35915e..709cefb 100644
--- a/content/solr/solr_news/2017-02-06-6-4-1-available.md
+++ b/content/solr/solr_news/2017-02-06-6-4-1-available.md
@@ -15,7 +15,7 @@ the search and navigation features of many of the world's largest
 internet sites.
 
 Solr 6.4.1 is available for immediate download at:
-<https://lucene.apache.org/solr/mirrors-solr-latest-redir.html>
+<https://solr.apache.org/downloads.html>
 
 ### Highlights of this Solr release include:
 
diff --git a/content/solr/solr_news/2017-02-15-5-5-4-available.md b/content/solr/solr_news/2017-02-15-5-5-4-available.md
index ecfff44..77c3c9e 100644
--- a/content/solr/solr_news/2017-02-15-5-5-4-available.md
+++ b/content/solr/solr_news/2017-02-15-5-5-4-available.md
@@ -15,7 +15,7 @@ the search and navigation features of many of the world's largest
 internet sites.
 
 Solr 5.5.4 is available for immediate download at:
-<https://lucene.apache.org/solr/mirrors-solr-latest-redir.html>
+<https://solr.apache.org/downloads.html>
 
 ### Highlights of this Solr release include:
 
diff --git a/content/solr/solr_news/2017-03-07-6-4-2-available.md b/content/solr/solr_news/2017-03-07-6-4-2-available.md
index 3b90982..037b23c 100644
--- a/content/solr/solr_news/2017-03-07-6-4-2-available.md
+++ b/content/solr/solr_news/2017-03-07-6-4-2-available.md
@@ -15,7 +15,7 @@ the search and navigation features of many of the world's largest
 internet sites.
 
 Solr 6.4.2 is available for immediate download at:
-<https://lucene.apache.org/solr/mirrors-solr-latest-redir.html>
+<https://solr.apache.org/downloads.html>
 
 ### Highlights of this Solr release include:
 
diff --git a/content/solr/solr_news/2017-03-27-6-5-0-available.md b/content/solr/solr_news/2017-03-27-6-5-0-available.md
index 00ddecd..8735ec6 100644
--- a/content/solr/solr_news/2017-03-27-6-5-0-available.md
+++ b/content/solr/solr_news/2017-03-27-6-5-0-available.md
@@ -15,7 +15,7 @@ the search and navigation features of many of the world's largest
 internet sites.
 
 Solr 6.5.0 is available for immediate download at:
-<https://lucene.apache.org/solr/mirrors-solr-latest-redir.html>
+<https://solr.apache.org/downloads.html>
 
 ### Highlights of this Solr release include:
 
diff --git a/content/solr/solr_news/2017-04-27-6-5-1-available.md b/content/solr/solr_news/2017-04-27-6-5-1-available.md
index 19fcefb..c25c8bf 100644
--- a/content/solr/solr_news/2017-04-27-6-5-1-available.md
+++ b/content/solr/solr_news/2017-04-27-6-5-1-available.md
@@ -14,7 +14,7 @@ distributed search and indexing, and powers the search and navigation features
 of many of the world's largest internet sites.
 
 Solr 6.5.1 is available for immediate download at:
-<https://lucene.apache.org/solr/mirrors-solr-latest-redir.html>
+<https://solr.apache.org/downloads.html>
 
 This release includes 11 bug fixes since the 6.5.0 release. Some of the major fixes are:
 
diff --git a/content/solr/solr_news/2017-06-06-6-6-0-available.md b/content/solr/solr_news/2017-06-06-6-6-0-available.md
index d47e12b..ce4a513 100644
--- a/content/solr/solr_news/2017-06-06-6-6-0-available.md
+++ b/content/solr/solr_news/2017-06-06-6-6-0-available.md
@@ -14,7 +14,7 @@ distributed search and indexing, and powers the search and navigation features
 of many of the world's largest internet sites.
 
 Solr 6.6.0 is available for immediate download at:
-<https://lucene.apache.org/solr/mirrors-solr-latest-redir.html>
+<https://solr.apache.org/downloads.html>
 
 ### Highlights of this Solr release include:
 
diff --git a/content/solr/solr_news/2017-09-07-6-6-1-available.md b/content/solr/solr_news/2017-09-07-6-6-1-available.md
index a5208ec..51c4518 100644
--- a/content/solr/solr_news/2017-09-07-6-6-1-available.md
+++ b/content/solr/solr_news/2017-09-07-6-6-1-available.md
@@ -14,7 +14,7 @@ distributed search and indexing, and powers the search and navigation features
 of many of the world's largest internet sites.
 
 Solr 6.6.1 is available for immediate download at:
-<https://lucene.apache.org/solr/mirrors-solr-latest-redir.html>
+<https://solr.apache.org/downloads.html>
 
 This release includes 15 bug fixes since the 6.6.0 release. Some of the major fixes are:
 
diff --git a/content/solr/solr_news/2017-09-20-7-0-0-available.md b/content/solr/solr_news/2017-09-20-7-0-0-available.md
index 3dcad72..68af49c 100644
--- a/content/solr/solr_news/2017-09-20-7-0-0-available.md
+++ b/content/solr/solr_news/2017-09-20-7-0-0-available.md
@@ -14,7 +14,7 @@ distributed search and indexing, and powers the search and navigation features
 of many of the world's largest internet sites.
 
 Solr 7.0.0 is available for immediate download at:
-<https://lucene.apache.org/solr/mirrors-solr-latest-redir.html>
+<https://solr.apache.org/downloads.html>
 
 ### Highlights for this Solr release include:
 
diff --git a/content/solr/solr_news/2017-10-02-7-0-ref-available.md b/content/solr/solr_news/2017-10-02-7-0-ref-available.md
index 37e0d2b..ede9873 100644
--- a/content/solr/solr_news/2017-10-02-7-0-ref-available.md
+++ b/content/solr/solr_news/2017-10-02-7-0-ref-available.md
@@ -9,5 +9,5 @@ This 1,035-page PDF is the definitive guide to Solr. This version adds documenta
 
 You can download the PDF from: <https://www.apache.org/dyn/closer.cgi/lucene/solr/ref-guide/apache-solr-ref-guide-7.0.pdf>.
 
-An HTML version is also available from: <https://lucene.apache.org/solr/guide/7_0/>.
+An HTML version is also available from: <https://solr.apache.org/guide/7_0/>.
 
diff --git a/content/solr/solr_news/2017-10-06-7-0-1-available.md b/content/solr/solr_news/2017-10-06-7-0-1-available.md
index 252f3a7..500953b 100644
--- a/content/solr/solr_news/2017-10-06-7-0-1-available.md
+++ b/content/solr/solr_news/2017-10-06-7-0-1-available.md
@@ -12,7 +12,7 @@ distributed search and indexing, and powers the search and navigation
 features of many of the world's largest internet sites.
 
 Solr 7.0.1 is available for immediate download at:
-<https://lucene.apache.org/solr/mirrors-solr-latest-redir.html>
+<https://solr.apache.org/downloads.html>
 
 This release includes 2 bug fixes since the 7.0.0 release:
 
@@ -30,5 +30,5 @@ The release is available for immediate download at:
 
 Please read CHANGES.txt for a detailed list of changes:
 
-   <https://lucene.apache.org/solr/7_0_1/changes/Changes.html>
+   <https://solr.apache.org/7_0_1/changes/Changes.html>
 
diff --git a/content/solr/solr_news/2017-10-17-7-1-0-available.md b/content/solr/solr_news/2017-10-17-7-1-0-available.md
index 052425e..e5cac1f 100644
--- a/content/solr/solr_news/2017-10-17-7-1-0-available.md
+++ b/content/solr/solr_news/2017-10-17-7-1-0-available.md
@@ -13,7 +13,7 @@ The release is available for immediate download at:
 
 Please read CHANGES.txt for a full list of new features and changes:
 
-   <https://lucene.apache.org/solr/7_1_0/changes/Changes.html>
+   <https://solr.apache.org/7_1_0/changes/Changes.html>
 
 ### Highlights for this Solr release include:
 
@@ -37,7 +37,7 @@ Please read CHANGES.txt for a full list of new features and changes:
 
  * Multiple other optimizations and bug fixes
 
-You are encouraged to thoroughly read the "Upgrade Notes" at <https://lucene.apache.org/solr/7_1_0/changes/Changes.html> or in the CHANGES.txt file accompanying the release.
+You are encouraged to thoroughly read the "Upgrade Notes" at <https://solr.apache.org/7_1_0/changes/Changes.html> or in the CHANGES.txt file accompanying the release.
 
 Solr 7.1 also includes many other new features as well as numerous optimizations and bugfixes of the corresponding Apache Lucene release.
 
diff --git a/content/solr/solr_news/2017-10-18-6-6-2-available.md b/content/solr/solr_news/2017-10-18-6-6-2-available.md
index 6698b15..b1072b2 100644
--- a/content/solr/solr_news/2017-10-18-6-6-2-available.md
+++ b/content/solr/solr_news/2017-10-18-6-6-2-available.md
@@ -19,5 +19,5 @@ The release is available for immediate download at:
 
 Please read CHANGES.txt for a detailed list of changes:
 
-   <https://lucene.apache.org/solr/6_6_2/changes/Changes.html>
+   <https://solr.apache.org/6_6_2/changes/Changes.html>
 
diff --git a/content/solr/solr_news/2017-10-24-5-5-5-available.md b/content/solr/solr_news/2017-10-24-5-5-5-available.md
index 494f31b..926e3e6 100644
--- a/content/solr/solr_news/2017-10-24-5-5-5-available.md
+++ b/content/solr/solr_news/2017-10-24-5-5-5-available.md
@@ -23,5 +23,5 @@ The release is available for immediate download at:
 
 Please read CHANGES.txt for a detailed list of changes:
 
-  <https://lucene.apache.org/solr/5_5_5/changes/Changes.html>
+  <https://solr.apache.org/5_5_5/changes/Changes.html>
 
diff --git a/content/solr/solr_news/2017-11-02-7-1-ref-available.md b/content/solr/solr_news/2017-11-02-7-1-ref-available.md
index c814e3a..4ee3479 100644
--- a/content/solr/solr_news/2017-11-02-7-1-ref-available.md
+++ b/content/solr/solr_news/2017-11-02-7-1-ref-available.md
@@ -9,5 +9,5 @@ This 1,077-page PDF is the definitive guide to using Apache Solr, the search ser
 
 The PDF Guide can be downloaded from: <https://www.apache.org/dyn/closer.cgi/lucene/solr/ref-guide/apache-solr-ref-guide-7.1.pdf>.
 
-It is also available online at <https://lucene.apache.org/solr/guide/7_1>.
+It is also available online at <https://solr.apache.org/guide/7_1>.
 
diff --git a/content/solr/solr_news/2017-12-21-7-2-0-available.md b/content/solr/solr_news/2017-12-21-7-2-0-available.md
index b55bf75..e3c056d 100644
--- a/content/solr/solr_news/2017-12-21-7-2-0-available.md
+++ b/content/solr/solr_news/2017-12-21-7-2-0-available.md
@@ -9,11 +9,11 @@ Solr is the popular, blazing fast, open source NoSQL search platform from the Ap
 
 Solr 7.2.0 is available for immediate download at:
 
-  <https://lucene.apache.org/solr/mirrors-solr-latest-redir.html>
+  <https://solr.apache.org/downloads.html>
 
 Please read CHANGES.txt for a full list of new features and changes:
 
-  <https://lucene.apache.org/solr/7_2_0/changes/Changes.html>
+  <https://solr.apache.org/7_2_0/changes/Changes.html>
 
 ### Solr 7.2.0 Release Highlights:
 
diff --git a/content/solr/solr_news/2018-01-15-7-2-1-available.md b/content/solr/solr_news/2018-01-15-7-2-1-available.md
index 7139d86..1fb3059 100644
--- a/content/solr/solr_news/2018-01-15-7-2-1-available.md
+++ b/content/solr/solr_news/2018-01-15-7-2-1-available.md
@@ -32,5 +32,5 @@ The release is available for immediate download at:
 
 Please read CHANGES.txt for a detailed list of changes:
 
-  <https://lucene.apache.org/solr/7_2_1/changes/Changes.html>
+  <https://solr.apache.org/7_2_1/changes/Changes.html>
 
diff --git a/content/solr/solr_news/2018-03-07-6-6-3-available.md b/content/solr/solr_news/2018-03-07-6-6-3-available.md
index b93024f..b94842f 100644
--- a/content/solr/solr_news/2018-03-07-6-6-3-available.md
+++ b/content/solr/solr_news/2018-03-07-6-6-3-available.md
@@ -21,9 +21,9 @@ This release contains three bugfixes:
 
 The release is available for immediate download at:
 
-  <https://lucene.apache.org/solr/mirrors-solr-redir.html>
+  <https://solr.apache.org/mirrors-solr-redir.html>
 
 Please read CHANGES.txt for a detailed list of changes:
 
-  <https://lucene.apache.org/solr/6_6_3/changes/Changes.html>
+  <https://solr.apache.org/6_6_3/changes/Changes.html>
 
diff --git a/content/solr/solr_news/2018-04-04-7-3-0-available.md b/content/solr/solr_news/2018-04-04-7-3-0-available.md
index 1696286..e346c89 100644
--- a/content/solr/solr_news/2018-04-04-7-3-0-available.md
+++ b/content/solr/solr_news/2018-04-04-7-3-0-available.md
@@ -9,11 +9,11 @@ Solr is the popular, blazing fast, open source NoSQL search platform from the Ap
 
 Solr 7.3.0 is available for immediate download at:
 
-  <https://lucene.apache.org/solr/mirrors-solr-latest-redir.html>
+  <https://solr.apache.org/downloads.html>
 
 Please read CHANGES.txt for a full list of new features and changes:
 
-  <https://lucene.apache.org/solr/7_3_0/changes/Changes.html>
+  <https://solr.apache.org/7_3_0/changes/Changes.html>
 
 ### Solr 7.3.0 Release Highlights:
 
@@ -30,5 +30,5 @@ Please read CHANGES.txt for a full list of new features and changes:
  * Neural network modelling via learning to rank
  * Solr runs with Java 10
 
-The Apache Solr Reference Guide for 7.3 is also available in [PDF form](https://www.apache.org/dyn/closer.cgi/lucene/solr/ref-guide/apache-solr-ref-guide-7.3.pdf) or  [online](https://lucene.apache.org/solr/guide/7_3).
+The Apache Solr Reference Guide for 7.3 is also available in [PDF form](https://www.apache.org/dyn/closer.cgi/lucene/solr/ref-guide/apache-solr-ref-guide-7.3.pdf) or  [online](https://solr.apache.org/guide/7_3).
 
diff --git a/content/solr/solr_news/2018-05-15-7-3-1-available.md b/content/solr/solr_news/2018-05-15-7-3-1-available.md
index 2a321cc..1fd00a5 100644
--- a/content/solr/solr_news/2018-05-15-7-3-1-available.md
+++ b/content/solr/solr_news/2018-05-15-7-3-1-available.md
@@ -29,5 +29,5 @@ The release is available for immediate download at:
 
 Please read CHANGES.txt for a detailed list of changes:
 
-  <https://lucene.apache.org/solr/7_3_1/changes/Changes.html>
+  <https://solr.apache.org/7_3_1/changes/Changes.html>
 
diff --git a/content/solr/solr_news/2018-05-18-6-6-4-available.md b/content/solr/solr_news/2018-05-18-6-6-4-available.md
index f7272e0..2d547fc 100644
--- a/content/solr/solr_news/2018-05-18-6-6-4-available.md
+++ b/content/solr/solr_news/2018-05-18-6-6-4-available.md
@@ -23,5 +23,5 @@ The release is available for immediate download at:
 
 Please read CHANGES.txt for a detailed list of changes:
 
-  <https://lucene.apache.org/solr/6_6_4/changes/Changes.html>
+  <https://solr.apache.org/6_6_4/changes/Changes.html>
 
diff --git a/content/solr/solr_news/2018-06-27-7-4-0-available.md b/content/solr/solr_news/2018-06-27-7-4-0-available.md
index f96cede..7c9b32e 100644
--- a/content/solr/solr_news/2018-06-27-7-4-0-available.md
+++ b/content/solr/solr_news/2018-06-27-7-4-0-available.md
@@ -15,11 +15,11 @@ features of many of the world's largest internet sites.
 
 Solr 7.4.0 is available for immediate download at:
 
-  <https://lucene.apache.org/solr/downloads.html>
+  <https://solr.apache.org/downloads.html>
 
 Please read CHANGES.txt for a full list of new features and changes:
 
-  <https://lucene.apache.org/solr/7_4_0/changes/Changes.html>
+  <https://solr.apache.org/7_4_0/changes/Changes.html>
 
 ### Solr 7.4.0 Release Highlights:
 
diff --git a/content/solr/solr_news/2018-07-03-6-6-5-available.md b/content/solr/solr_news/2018-07-03-6-6-5-available.md
index e510de7..87411aa 100644
--- a/content/solr/solr_news/2018-07-03-6-6-5-available.md
+++ b/content/solr/solr_news/2018-07-03-6-6-5-available.md
@@ -19,7 +19,7 @@ Solr 6.6.5 is available for immediate download at:
 
 Please read CHANGES.txt for a full list of new features and changes:
 
-  <https://lucene.apache.org/solr/6_6_5/changes/Changes.html>
+  <https://solr.apache.org/6_6_5/changes/Changes.html>
 
 ### Solr 6.6.5 Release Highlights:
 
diff --git a/content/solr/solr_news/2018-09-24-7-5-0-available.md b/content/solr/solr_news/2018-09-24-7-5-0-available.md
index a5f53bb..2142f45 100644
--- a/content/solr/solr_news/2018-09-24-7-5-0-available.md
+++ b/content/solr/solr_news/2018-09-24-7-5-0-available.md
@@ -13,11 +13,11 @@ tolerant distributed search and indexing, and powers the search and navigation f
 many of the world's largest internet sites.
 
 Solr 7.5.0 is available for immediate download at:
-  <https://lucene.apache.org/solr/downloads.html>
+  <https://solr.apache.org/downloads.html>
 
 Please read CHANGES.txt for a full list of new features and changes:
 
-  <https://lucene.apache.org/solr/7_5_0/changes/Changes.html>
+  <https://solr.apache.org/7_5_0/changes/Changes.html>
 
 ### Solr 7.5.0 Release Highlights:
 
diff --git a/content/solr/solr_news/2018-12-14-7-6-0-available.md b/content/solr/solr_news/2018-12-14-7-6-0-available.md
index 70675f1..0fc06f8 100644
--- a/content/solr/solr_news/2018-12-14-7-6-0-available.md
+++ b/content/solr/solr_news/2018-12-14-7-6-0-available.md
@@ -13,11 +13,11 @@ tolerant distributed search and indexing, and powers the search and navigation f
 many of the world's largest internet sites.
 
 Solr 7.6.0 is available for immediate download at:
-  <https://lucene.apache.org/solr/downloads.html>
+  <https://solr.apache.org/downloads.html>
 
 Please read CHANGES.txt for a full list of new features and changes:
 
-  <https://lucene.apache.org/solr/7_6_0/changes/Changes.html>
+  <https://solr.apache.org/7_6_0/changes/Changes.html>
 
 ### Solr 7.6.0 Release Highlights:
 
diff --git a/content/solr/solr_news/2019-02-11-7-7-0-available.md b/content/solr/solr_news/2019-02-11-7-7-0-available.md
index 4a8949f..68e4f38 100644
--- a/content/solr/solr_news/2019-02-11-7-7-0-available.md
+++ b/content/solr/solr_news/2019-02-11-7-7-0-available.md
@@ -13,11 +13,11 @@ tolerant distributed search and indexing, and powers the search and navigation f
 many of the world's largest internet sites.
 
 Solr 7.7.0 is available for immediate download at:
-  <https://lucene.apache.org/solr/downloads.html>
+  <https://solr.apache.org/downloads.html>
 
 Please read CHANGES.txt for a full list of new features and changes:
 
-  <https://lucene.apache.org/solr/7_7_0/changes/Changes.html>
+  <https://solr.apache.org/7_7_0/changes/Changes.html>
 
 ### Solr 7.7.0 Release Highlights:
 
diff --git a/content/solr/solr_news/2019-03-01-7-7-1-available.md b/content/solr/solr_news/2019-03-01-7-7-1-available.md
index 660d365..8063584 100644
--- a/content/solr/solr_news/2019-03-01-7-7-1-available.md
+++ b/content/solr/solr_news/2019-03-01-7-7-1-available.md
@@ -13,11 +13,11 @@ tolerant distributed search and indexing, and powers the search and navigation f
 many of the world's largest internet sites.
 
 Solr 7.7.1 is available for immediate download at:
-  <https://lucene.apache.org/solr/downloads.html>
+  <https://solr.apache.org/downloads.html>
 
 Please read CHANGES.txt for a full list of new features and changes:
 
-  <https://lucene.apache.org/solr/7_7_1/changes/Changes.html>
+  <https://solr.apache.org/7_7_1/changes/Changes.html>
 
 ### Solr 7.7.1 Release Highlights:
 
diff --git a/content/solr/solr_news/2019-03-11-7-7-ref-available.md b/content/solr/solr_news/2019-03-11-7-7-ref-available.md
index d22e6e7..1c92e28 100644
--- a/content/solr/solr_news/2019-03-11-7-7-ref-available.md
+++ b/content/solr/solr_news/2019-03-11-7-7-ref-available.md
@@ -5,5 +5,5 @@ save_as:
 
 The Lucene PMC is pleased to announce that the Solr Reference Guide for 7.7 is now available.  This 1,431-page PDF is the definitive guide to using Apache Solr, the search server built on Lucene.
 
-The PDF Guide can be downloaded from: <https://www.apache.org/dyn/closer.cgi/lucene/solr/ref-guide/apache-solr-ref-guide-7.7.pdf>.  It is also available online at <https://lucene.apache.org/solr/guide/7_7>.
+The PDF Guide can be downloaded from: <https://www.apache.org/dyn/closer.cgi/lucene/solr/ref-guide/apache-solr-ref-guide-7.7.pdf>.  It is also available online at <https://solr.apache.org/guide/7_7>.
 
diff --git a/content/solr/solr_news/2019-03-14-8-0-0-available.md b/content/solr/solr_news/2019-03-14-8-0-0-available.md
index b0e868f..fab0fb7 100644
--- a/content/solr/solr_news/2019-03-14-8-0-0-available.md
+++ b/content/solr/solr_news/2019-03-14-8-0-0-available.md
@@ -13,11 +13,11 @@ tolerant distributed search and indexing, and powers the search and navigation f
 many of the world's largest internet sites.
 
 Solr 8.0.0 is available for immediate download at:
-  <https://lucene.apache.org/solr/downloads.html>
+  <https://solr.apache.org/downloads.html>
 
 Please read CHANGES.txt for a full list of new features and changes:
 
-  <https://lucene.apache.org/solr/8_0_0/changes/Changes.html>
+  <https://solr.apache.org/8_0_0/changes/Changes.html>
 
 ### Solr 8.0.0 Release Highlights
 
@@ -37,7 +37,7 @@ Another key improvement is that nested documents can be deleted or replaced in a
 Being a major release, Solr 8 removes many deprecated APIs, changes various parameter defaults and behavior. Some changes may require a re-index of your content.
 You are thus encouraged to thoroughly read the "Upgrade Notes" at:
 
-  <https://lucene.apache.org/solr/8_0_0/changes/Changes.html>
+  <https://solr.apache.org/8_0_0/changes/Changes.html>
 
 Solr 8.0 also includes many other new features as well as numerous optimizations and bugfixes of the corresponding Apache Lucene release:
 
diff --git a/content/solr/solr_news/2019-04-05-6-6-6-available.md b/content/solr/solr_news/2019-04-05-6-6-6-available.md
index 9737054..7fae937 100644
--- a/content/solr/solr_news/2019-04-05-6-6-6-available.md
+++ b/content/solr/solr_news/2019-04-05-6-6-6-available.md
@@ -19,7 +19,7 @@ Solr 6.6.6 is available for immediate download at:
 
 Please read CHANGES.txt for a full list of new features and changes:
 
-  <https://lucene.apache.org/solr/6_6_6/changes/Changes.html>
+  <https://solr.apache.org/6_6_6/changes/Changes.html>
 
 ### Solr 6.6.6 Release Highlights:
 
diff --git a/content/solr/solr_news/2019-05-16-8-1-0-available.md b/content/solr/solr_news/2019-05-16-8-1-0-available.md
index 8eb6232..04ecfed 100644
--- a/content/solr/solr_news/2019-05-16-8-1-0-available.md
+++ b/content/solr/solr_news/2019-05-16-8-1-0-available.md
@@ -13,11 +13,11 @@ tolerant distributed search and indexing, and powers the search and navigation f
 many of the world's largest internet sites.
 
 Solr 8.1.0 is available for immediate download at:
-  <https://lucene.apache.org/solr/downloads.html>
+  <https://solr.apache.org/downloads.html>
 
 Please read CHANGES.txt for a full list of new features and changes:
 
-  <https://lucene.apache.org/solr/8_1_0/changes/Changes.html>
+  <https://solr.apache.org/8_1_0/changes/Changes.html>
 
 ### Solr 8.1.0 Release Highlights
 
diff --git a/content/solr/solr_news/2019-05-28-8-1-1-available.md b/content/solr/solr_news/2019-05-28-8-1-1-available.md
index 32b9d3e..16e7fbe 100644
--- a/content/solr/solr_news/2019-05-28-8-1-1-available.md
+++ b/content/solr/solr_news/2019-05-28-8-1-1-available.md
@@ -13,11 +13,11 @@ tolerant distributed search and indexing, and powers the search and navigation f
 many of the world's largest internet sites.
 
 Solr 8.1.1 is available for immediate download at:
-  <https://lucene.apache.org/solr/downloads.html>
+  <https://solr.apache.org/downloads.html>
 
 Please read CHANGES.txt for a full list of new features and changes:
 
-  <https://lucene.apache.org/solr/8_1_1/changes/Changes.html>
+  <https://solr.apache.org/8_1_1/changes/Changes.html>
 
 ### Solr 8.1.1 Release Highlights
 * Fix for a Null Pointer Exception when querying collection through collection alias.
diff --git a/content/solr/solr_news/2019-06-04-7-7-2-available.md b/content/solr/solr_news/2019-06-04-7-7-2-available.md
index 8e9cda2..6412896 100644
--- a/content/solr/solr_news/2019-06-04-7-7-2-available.md
+++ b/content/solr/solr_news/2019-06-04-7-7-2-available.md
@@ -9,7 +9,7 @@ Solr is the popular, blazing fast, open source NoSQL search platform from the Ap
 
 Solr 7.7.2 is available for immediate download at:
 
-  <https://lucene.apache.org/solr/downloads.html>
+  <https://solr.apache.org/downloads.html>
 
 ### Solr 7.7.2 Release Highlights:
 
@@ -22,7 +22,7 @@ Solr 7.7.2 is available for immediate download at:
 
 Please read CHANGES.txt for a full list of and changes:
 
-  <https://lucene.apache.org/solr/7_7_2/changes/Changes.html>
+  <https://solr.apache.org/7_7_2/changes/Changes.html>
 
 Solr 7.7.2 also includes bugfixes in the corresponding Apache Lucene release:
 
diff --git a/content/solr/solr_news/2019-07-26-8-2-0-available.md b/content/solr/solr_news/2019-07-26-8-2-0-available.md
index 7465435..cf6b946 100644
--- a/content/solr/solr_news/2019-07-26-8-2-0-available.md
+++ b/content/solr/solr_news/2019-07-26-8-2-0-available.md
@@ -8,11 +8,11 @@ The Lucene PMC is pleased to announce the release of Apache Solr 8.2.0
 Solr is the popular, blazing fast, open source NoSQL search platform from the Apache Lucene project. Its major features include powerful full-text search, hit highlighting, faceted search, dynamic clustering, database integration, rich document (e.g., Word, PDF) handling, and geospatial search. Solr is highly scalable, providing fault tolerant distributed search and indexing, and powers the search and navigation features of many of the world's largest internet sites.
 
 Solr 8.2.0 is available for immediate download at:
-  <https://lucene.apache.org/solr/downloads.html>
+  <https://solr.apache.org/downloads.html>
 
 Please read CHANGES.txt for a full list of new features and changes:
 
-  <https://lucene.apache.org/solr/8_2_0/changes/Changes.html>
+  <https://solr.apache.org/8_2_0/changes/Changes.html>
 
 ### Solr 8.2.0 Release Highlights
 
diff --git a/content/solr/solr_news/2019-11-02-8-3-0-available.md b/content/solr/solr_news/2019-11-02-8-3-0-available.md
index 25256a3..be79b21 100644
--- a/content/solr/solr_news/2019-11-02-8-3-0-available.md
+++ b/content/solr/solr_news/2019-11-02-8-3-0-available.md
@@ -9,7 +9,7 @@ Solr is the popular, blazing fast, open source NoSQL search platform from the Ap
 
 Solr 8.3.0 is available for immediate download at:
 
-  <https://lucene.apache.org/solr/downloads.html>
+  <https://solr.apache.org/downloads.html>
 
 ### Solr 8.3.0 Release Highlights:
 
@@ -49,7 +49,7 @@ Solr 8.3.0 is available for immediate download at:
 
 Please read CHANGES.txt for a full list of new features and changes:
 
-  <https://lucene.apache.org/solr/8_3_0/changes/Changes.html>
+  <https://solr.apache.org/8_3_0/changes/Changes.html>
 
 Solr 8.3.0 also includes features, optimizations  and bugfixes in the corresponding Apache Lucene release:
 
diff --git a/content/solr/solr_news/2019-12-03-8-3-1-available.md b/content/solr/solr_news/2019-12-03-8-3-1-available.md
index f961b7a..c8560ce 100644
--- a/content/solr/solr_news/2019-12-03-8-3-1-available.md
+++ b/content/solr/solr_news/2019-12-03-8-3-1-available.md
@@ -9,7 +9,7 @@ Solr is the popular, blazing fast, open source NoSQL search platform from the Ap
 
 Solr 8.3.1 is available for immediate download at:
 
-  <https://lucene.apache.org/solr/downloads.html>
+  <https://solr.apache.org/downloads.html>
 
 ### Solr 8.3.1 Release Highlights:
 
@@ -21,8 +21,8 @@ Solr 8.3.1 is available for immediate download at:
 
 Please read CHANGES.txt for a full list of changes:
 
-  <https://lucene.apache.org/solr/8_3_1/changes/Changes.html>
+  <https://solr.apache.org/8_3_1/changes/Changes.html>
 
 Solr 8.3.1 also includes  and bugfixes in the corresponding Apache Lucene release:
 
-  <https://lucene.apache.org/core/8_3_1/changes/Changes.html>
\ No newline at end of file
+  <https://lucene.apache.org/core/8_3_1/changes/Changes.html>
diff --git a/content/solr/solr_news/2019-12-29-8-4-0-available.md b/content/solr/solr_news/2019-12-29-8-4-0-available.md
index 6d4f1ca..1d93b83 100644
--- a/content/solr/solr_news/2019-12-29-8-4-0-available.md
+++ b/content/solr/solr_news/2019-12-29-8-4-0-available.md
@@ -8,18 +8,18 @@ Solr is the popular, blazing fast, open source NoSQL search platform from the Ap
 
 Solr 8.4.0 is available for immediate download at:
 
-  <https://lucene.apache.org/solr/downloads.html>
+  <https://solr.apache.org/downloads.html>
 
 ### Solr 8.4.0 Release Highlights:
 
   * A new package management system was introduced in order to ease deploying plugins.
   * Better security with the out-of-the-box configuration.
 
-A summary of important changes is published in the Solr Reference Guide at <https://lucene.apache.org/solr/guide/8_4/solr-upgrade-notes.html>.
+A summary of important changes is published in the Solr Reference Guide at <https://solr.apache.org/guide/8_4/solr-upgrade-notes.html>.
 
 Please read CHANGES.txt for a full list of new features and changes:
 
-  <https://lucene.apache.org/solr/8_4_0/changes/Changes.html>
+  <https://solr.apache.org/8_4_0/changes/Changes.html>
 
 Solr 8.4.0 also includes features, optimizations  and bugfixes in the corresponding Apache Lucene release:
 
diff --git a/content/solr/solr_news/2020-01-13-8-4-1-available.md b/content/solr/solr_news/2020-01-13-8-4-1-available.md
index f1cd0cc..034a77c 100644
--- a/content/solr/solr_news/2020-01-13-8-4-1-available.md
+++ b/content/solr/solr_news/2020-01-13-8-4-1-available.md
@@ -8,7 +8,7 @@ Solr is the popular, blazing fast, open source NoSQL search platform from the Ap
 
 Solr 8.4.1 is available for immediate download at:
 
-  <https://lucene.apache.org/solr/downloads.html>
+  <https://solr.apache.org/downloads.html>
 
 ### Solr 8.4.1 Release Highlights:
 
@@ -18,8 +18,8 @@ Solr 8.4.1 is available for immediate download at:
 
 Please read CHANGES.txt for a full list of changes:
 
-  <https://lucene.apache.org/solr/8_4_1/changes/Changes.html>
+  <https://solr.apache.org/8_4_1/changes/Changes.html>
 
 Solr 8.4.1 also includes  and bugfixes in the corresponding Apache Lucene release:
 
-  <https://lucene.apache.org/core/8_4_1/changes/Changes.html>
\ No newline at end of file
+  <https://lucene.apache.org/core/8_4_1/changes/Changes.html>
diff --git a/content/solr/solr_news/2020-03-24-8-5-0-available.md b/content/solr/solr_news/2020-03-24-8-5-0-available.md
index 07b985f..9547a3d 100644
--- a/content/solr/solr_news/2020-03-24-8-5-0-available.md
+++ b/content/solr/solr_news/2020-03-24-8-5-0-available.md
@@ -8,7 +8,7 @@ Solr is the popular, blazing fast, open source NoSQL search platform from the Ap
 
 Solr 8.5.0 is available for immediate download at:
 
-  <https://lucene.apache.org/solr/downloads.html>
+  <https://solr.apache.org/downloads.html>
 
 ### Solr 8.5.0 Release Highlights:
 
@@ -19,7 +19,7 @@ Solr 8.5.0 is available for immediate download at:
 
 Please read CHANGES.txt for a full list of changes:
 
-  <https://lucene.apache.org/solr/8_5_0/changes/Changes.html>
+  <https://solr.apache.org/8_5_0/changes/Changes.html>
 
 Solr 8.5.0 also includes improvements and bugfixes in the corresponding Apache Lucene release:
 
diff --git a/content/solr/solr_news/2020-04-16-8-5-1-available.md b/content/solr/solr_news/2020-04-16-8-5-1-available.md
index 16db62e..793b4b7 100644
--- a/content/solr/solr_news/2020-04-16-8-5-1-available.md
+++ b/content/solr/solr_news/2020-04-16-8-5-1-available.md
@@ -8,7 +8,7 @@ Solr is the popular, blazing fast, open source NoSQL search platform from the Ap
 
 This release contains no change over 8.5.0 for Solr. The release is available for immediate download at:
 
-  <https://lucene.apache.org/solr/downloads.html>
+  <https://solr.apache.org/downloads.html>
  
 Solr 8.5.1 also includes one bugfix in the corresponding Apache Lucene release:
 
diff --git a/content/solr/solr_news/2020-04-28-7-7-3-available.md b/content/solr/solr_news/2020-04-28-7-7-3-available.md
index 77e1517..721c8ae 100644
--- a/content/solr/solr_news/2020-04-28-7-7-3-available.md
+++ b/content/solr/solr_news/2020-04-28-7-7-3-available.md
@@ -9,7 +9,7 @@ Solr is the popular, blazing fast, open source NoSQL search platform from the Ap
 
 Solr 7.7.3 is available for immediate download at:
 
-  <https://lucene.apache.org/solr/downloads.html>
+  <https://solr.apache.org/downloads.html>
 
 ### Solr 7.7.3 Release Highlights:
 
@@ -31,7 +31,7 @@ Solr 7.7.3 is available for immediate download at:
 
 Please read CHANGES.txt for a full list of and changes:
 
-  <https://lucene.apache.org/solr/7_7_3/changes/Changes.html>
+  <https://solr.apache.org/7_7_3/changes/Changes.html>
 
 Solr 7.7.3 also includes bugfixes in the corresponding Apache Lucene release:
 
diff --git a/content/solr/solr_news/2020-05-26-8-5-2-available.md b/content/solr/solr_news/2020-05-26-8-5-2-available.md
index a805fb9..1f89465 100644
--- a/content/solr/solr_news/2020-05-26-8-5-2-available.md
+++ b/content/solr/solr_news/2020-05-26-8-5-2-available.md
@@ -8,7 +8,7 @@ Solr is the popular, blazing fast, open source NoSQL search platform from the Ap
 
 Solr 8.5.2 is available for immediate download at:
 
-  <https://lucene.apache.org/solr/downloads.html>
+  <https://solr.apache.org/downloads.html>
 
 ### Solr 8.5.2 Bug Fixes:
 
@@ -17,8 +17,8 @@ Solr 8.5.2 is available for immediate download at:
 
 Please read CHANGES.txt for a full list of changes:
 
-  <https://lucene.apache.org/solr/8_5_2/changes/Changes.html>
+  <https://solr.apache.org/8_5_2/changes/Changes.html>
 
 Solr 8.5.2 also includes 1 bugfix in the corresponding Apache Lucene release:
 
-  <https://lucene.apache.org/core/8_5_2/changes/Changes.html>
\ No newline at end of file
+  <https://lucene.apache.org/core/8_5_2/changes/Changes.html>
diff --git a/content/solr/solr_news/2020-07-15-8-6-0-available.md b/content/solr/solr_news/2020-07-15-8-6-0-available.md
index 040b29f..c8847ec 100644
--- a/content/solr/solr_news/2020-07-15-8-6-0-available.md
+++ b/content/solr/solr_news/2020-07-15-8-6-0-available.md
@@ -8,7 +8,7 @@ Solr is the popular, blazing fast, open source NoSQL search platform from the Ap
 
 Solr 8.6.0 is available for immediate download at:
 
-  <https://lucene.apache.org/solr/downloads.html>
+  <https://solr.apache.org/downloads.html>
 
 ### Solr 8.6.0 Release Highlights:
 
@@ -24,8 +24,8 @@ Solr 8.6.0 is available for immediate download at:
 
 Please read CHANGES.txt for a full list of new features and changes:
 
-  <https://lucene.apache.org/solr/8_6_0/changes/Changes.html>
+  <https://solr.apache.org/8_6_0/changes/Changes.html>
 
 Solr 8.6.0 also includes features, optimizations  and bugfixes in the corresponding Apache Lucene release:
 
-  <https://lucene.apache.org/core/8_6_0/changes/Changes.html>
\ No newline at end of file
+  <https://lucene.apache.org/core/8_6_0/changes/Changes.html>
diff --git a/content/solr/solr_news/2020-08-13-8-6-1-available.md b/content/solr/solr_news/2020-08-13-8-6-1-available.md
index faa7f93..34f4549 100644
--- a/content/solr/solr_news/2020-08-13-8-6-1-available.md
+++ b/content/solr/solr_news/2020-08-13-8-6-1-available.md
@@ -8,7 +8,7 @@ Solr is the popular, blazing fast, open source NoSQL search platform from the Ap
 
 Solr 8.6.1 is available for immediate download at:
 
-  <https://lucene.apache.org/solr/downloads.html>
+  <https://solr.apache.org/downloads.html>
 
 ### Solr 8.6.1 Release Highlights:
 
@@ -17,11 +17,11 @@ Solr 8.6.1 is available for immediate download at:
 
 Please refer to the Upgrade Notes in the Solr Ref Guide for information on upgrading from previous Solr versions:
 
-  <https://lucene.apache.org/solr/guide/8_6/solr-upgrade-notes.html>
+  <https://solr.apache.org/guide/8_6/solr-upgrade-notes.html>
 
 Please read CHANGES.txt for a full list of bugfixes:
 
-  <https://lucene.apache.org/solr/8_6_1/changes/Changes.html>
+  <https://solr.apache.org/8_6_1/changes/Changes.html>
 
 Solr 8.6.1 also includes bugfixes in the corresponding Apache Lucene release:
 
diff --git a/content/solr/solr_news/2020-09-01-8-6-2-available.md b/content/solr/solr_news/2020-09-01-8-6-2-available.md
index 3a4e1f2..42d1fdc 100644
--- a/content/solr/solr_news/2020-09-01-8-6-2-available.md
+++ b/content/solr/solr_news/2020-09-01-8-6-2-available.md
@@ -8,7 +8,7 @@ Solr is the popular, blazing fast, open source NoSQL search platform from the Ap
 
 Solr 8.6.2 is available for immediate download at:
 
-  <https://lucene.apache.org/solr/downloads.html>
+  <https://solr.apache.org/downloads.html>
 
 ### Solr 8.6.2 Bug Fixes:
 
@@ -16,12 +16,12 @@ Solr 8.6.2 is available for immediate download at:
 
 Please refer to the Upgrade Notes in the Solr Ref Guide for information on upgrading from previous Solr versions:
 
-  <https://lucene.apache.org/solr/guide/8_6/solr-upgrade-notes.html>
+  <https://solr.apache.org/guide/8_6/solr-upgrade-notes.html>
 
 Please read CHANGES.txt for a full list of bugfixes:
 
-  <https://lucene.apache.org/solr/8_6_2/changes/Changes.html>
+  <https://solr.apache.org/8_6_2/changes/Changes.html>
 
 Solr 8.6.2 also includes bugfixes in the corresponding Apache Lucene release:
 
-  <https://lucene.apache.org/core/8_6_2/changes/Changes.html>
\ No newline at end of file
+  <https://lucene.apache.org/core/8_6_2/changes/Changes.html>
diff --git a/content/solr/solr_news/2020-10-07-8-6-3-available.md b/content/solr/solr_news/2020-10-07-8-6-3-available.md
index 220ae01..3693c66 100644
--- a/content/solr/solr_news/2020-10-07-8-6-3-available.md
+++ b/content/solr/solr_news/2020-10-07-8-6-3-available.md
@@ -8,7 +8,7 @@ Solr is the popular, blazing fast, open source NoSQL search platform from the Ap
 
 Solr 8.6.3 is available for immediate download at:
 
-  <https://lucene.apache.org/solr/downloads.html>
+  <https://solr.apache.org/downloads.html>
 
 ### Solr 8.6.3 Release Highlights:
 
@@ -19,11 +19,11 @@ Solr 8.6.3 is available for immediate download at:
 
 Please refer to the Upgrade Notes in the Solr Ref Guide for information on upgrading from previous Solr versions:
 
-  <https://lucene.apache.org/solr/guide/8_6/solr-upgrade-notes.html>
+  <https://solr.apache.org/guide/8_6/solr-upgrade-notes.html>
 
 Please read CHANGES.txt for a full list of bugfixes:
 
-  <https://lucene.apache.org/solr/8_6_3/changes/Changes.html>
+  <https://solr.apache.org/8_6_3/changes/Changes.html>
 
 Solr 8.6.3 also includes bugfixes in the corresponding Apache Lucene release:
 
diff --git a/content/solr/solr_news/2020-11-03-8-7-0-available.md b/content/solr/solr_news/2020-11-03-8-7-0-available.md
index c25e518..077ccc1 100644
--- a/content/solr/solr_news/2020-11-03-8-7-0-available.md
+++ b/content/solr/solr_news/2020-11-03-8-7-0-available.md
@@ -9,11 +9,11 @@ Solr is the popular, blazing fast, open source NoSQL search platform from the Ap
 
 The release is available for immediate download at:
 
-<https://lucene.apache.org/solr/downloads.html>
+<https://solr.apache.org/downloads.html>
 
 Please read CHANGES.txt for a detailed list of changes:
 
-<https://lucene.apache.org/solr/8_7_0/changes/Changes.html>
+<https://solr.apache.org/8_7_0/changes/Changes.html>
 
 Solr 8.7.0 Release Highlights
 
@@ -27,4 +27,4 @@ SOLR-14651 -- The MetricsHistoryHandler Can Be Disabled
 
 
 
-A summary of important changes is published in the Solr Reference Guide at <https://lucene.apache.org/solr/guide/8_7/solr-upgrade-notes.html>. For the most exhaustive list, see the full release notes at <https://lucene.apache.org/solr/8_7_0/changes/Changes.html> or by viewing the CHANGES.txt file accompanying the distribution.  Solr's release notes usually don't include Lucene layer changes.  Lucene's release notes are at <https://lucene.apache.org/core/8_7_0/changes/Changes.html>
+A summary of important changes is published in the Solr Reference Guide at <https://solr.apache.org/guide/8_7/solr-upgrade-notes.html>. For the most exhaustive list, see the full release notes at <https://solr.apache.org/8_7_0/changes/Changes.html> or by viewing the CHANGES.txt file accompanying the distribution.  Solr's release notes usually don't include Lucene layer changes.  Lucene's release notes are at <https://lucene.apache.org/core/8_7_0/changes/Changes.html>
diff --git a/content/solr/solr_news/2021-01-29-8-8-0-available.md b/content/solr/solr_news/2021-01-29-8-8-0-available.md
index c92f505..068757f 100644
--- a/content/solr/solr_news/2021-01-29-8-8-0-available.md
+++ b/content/solr/solr_news/2021-01-29-8-8-0-available.md
@@ -9,11 +9,11 @@ Solr is the popular, blazing fast, open source NoSQL search platform from the Ap
 
 The release is available for immediate download at:
 
-<https://lucene.apache.org/solr/downloads.html>
+<https://solr.apache.org/downloads.html>
 
 Please read CHANGES.txt for a detailed list of changes:
 
-<https://lucene.apache.org/solr/8_8_0/changes/Changes.html>
+<https://solr.apache.org/8_8_0/changes/Changes.html>
 
 Solr 8.8.0 Release Highlights
 
@@ -23,4 +23,4 @@ Reducing overseer bottlenecks using per-replica states. More stability and lesse
 Interleaving support in Learning To Rank
 
 
-A summary of important changes is published in the Solr Reference Guide at <https://lucene.apache.org/solr/guide/8_8/solr-upgrade-notes.html>. For the most exhaustive list, see the full release notes at <https://lucene.apache.org/solr/8_8_0/changes/Changes.html> or by viewing the CHANGES.txt file accompanying the distribution.  Solr's release notes usually don't include Lucene layer changes.  Lucene's release notes are at <https://lucene.apache.org/core/8_8_0/changes/Changes.html>
+A summary of important changes is published in the Solr Reference Guide at <https://solr.apache.org/guide/8_8/solr-upgrade-notes.html>. For the most exhaustive list, see the full release notes at <https://solr.apache.org/8_8_0/changes/Changes.html> or by viewing the CHANGES.txt file accompanying the distribution.  Solr's release notes usually don't include Lucene layer changes.  Lucene's release notes are at <https://lucene.apache.org/core/8_8_0/changes/Changes.html>
diff --git a/content/solr/solr_news/2021-02-22-8-8-1-available.md b/content/solr/solr_news/2021-02-22-8-8-1-available.md
index 8dfedc9..d621206 100644
--- a/content/solr/solr_news/2021-02-22-8-8-1-available.md
+++ b/content/solr/solr_news/2021-02-22-8-8-1-available.md
@@ -8,7 +8,7 @@ Solr is the popular, blazing fast, open source NoSQL search platform from the Ap
 
 Solr 8.8.1 is available for immediate download at:
 
-  <https://lucene.apache.org/solr/downloads.html>
+  <https://solr.apache.org/downloads.html>
 
 ### Solr 8.8.1 Release Highlights:
 
@@ -16,11 +16,11 @@ Solr 8.8.1 is available for immediate download at:
 
 Please refer to the Upgrade Notes in the Solr Ref Guide for information on upgrading from previous Solr versions:
 
-  <https://lucene.apache.org/solr/guide/8_8/solr-upgrade-notes.html>
+  <https://solr.apache.org/guide/8_8/solr-upgrade-notes.html>
 
 Please read CHANGES.txt for a full list of bugfixes:
 
-  <https://lucene.apache.org/solr/8_8_1/changes/Changes.html>
+  <https://solr.apache.org/8_8_1/changes/Changes.html>
 
 Solr 8.8.1 also includes bugfixes in the corresponding Apache Lucene release:
 


[lucene-site] 03/05: Move Editing website from resources page to its own page, linked from footer. Add more video links

Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit fb9e507dc00e231edcbf94145cef95e9a95bbbcf
Author: Jan Høydahl <ja...@cominvent.com>
AuthorDate: Wed Feb 24 21:06:05 2021 +0100

    Move Editing website from resources page to its own page, linked from footer. Add more video links
---
 content/pages/editing-website.md     | 38 ++++++++++++++++++++++++++++++++++++
 content/pages/resources.md           | 22 ++++++++++-----------
 themes/solr/templates/_footer.html   |  1 +
 themes/solr/templates/resources.html |  1 -
 4 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/content/pages/editing-website.md b/content/pages/editing-website.md
new file mode 100644
index 0000000..ff896a5
--- /dev/null
+++ b/content/pages/editing-website.md
@@ -0,0 +1,38 @@
+Title: Editing this Website
+URL: editing-website.html
+save_as: editing-website.html
+template: page
+
+# Editing this Website
+
+This website is hosted in its own git repository `solr-site` (see [Github](https://github.com/apache/solr-site/) and [Gitbox](https://gitbox.apache.org/repos/asf/solr-site.git)).
+
+The content of the `main` branch will update the [staging site](https://solr.staged.apache.org) while the content of the `production` branch will be published to the main website. Read the [README.md](https://github.com/apache/solr-site/) file for further instructions.
+
+## Contributing content
+
+If you want to contribute some content or bugfix to this website, you may follow these steps:
+
+1. Fork this repository in [GitHub](https://github.com/apache/solr-site)
+2. Clone your fork to your computer
+
+        git clone https://github.com/<your-github-id>/lucene-site
+        cd lucene-site
+        git pull
+
+3. Create a new branch for your edits
+
+        git checkout -b my-typo-fix
+
+4. Edit the site following the instructions in [README](https://github.com/apache/solr-site/)
+5. When done, push your changes to your branch (in your fork)
+
+        git add .
+        git commit -m "Fixing a typo on the resources page"
+        git push origin
+
+6. Visit your fork again on GitHub, and you'll se a button to add your branch as a Pull Request
+
+For more detailed instructions, see [GitHub documentation](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request-from-a-fork).
+
+**TIP:** For very simple edits to one page only, you may find the page (markdown or html) in GitHub, then click the edit button and submit your PR directly from the UI.
diff --git a/content/pages/resources.md b/content/pages/resources.md
index 93cf710..8078b1d 100644
--- a/content/pages/resources.md
+++ b/content/pages/resources.md
@@ -43,7 +43,7 @@ Additional documentation can be found on the [Solr Community Wiki](https://cwiki
 
 ## Solr Books ##
 
-If you have a Solr book that you would like to see listed here, please submit a [patch](https://cwiki.apache.org/confluence/display/solr/HowToContribute) to this [website](https://svn.apache.org/viewvc/lucene/cms/trunk/) via a JIRA issue.
+If you have a Solr book that you would like to see listed here, please [edit this website add submit a Pull Request]("/editing-website.html").
 
 <h3 class="offset" id="book-relevant-search">Relevant Search</h3>
 Doug Turnbull, John Berryman and Manning Publications are proud to announce *Relevant Search*.
@@ -209,15 +209,21 @@ If you have a Solr presentation that you would like to see listed here, please s
 
 ## Videos ##
 
-If you have a Solr video that you would like to see listed here, please submit a [patch](https://cwiki.apache.org/confluence/display/solr/HowToContribute) via a JIRA with the appropriate content.
-
-<h3 class="offset" id="lucenesolr-revolution">Activate and Lucene/Solr Revolution</h3>
+If you have a Solr video that you would like to see listed here, please [edit this website add submit a Pull Request]("/editing-website.html").
 
 <!-- TODO: WOULD BE NICE TO HAVE A SLIDER OR RANDOMLY PICKED VIDEO HERE -->
 
+<h3 class="offset" id="youtube">Conferences with Solr talks</h3>
+
+[Videos from Past ApacheCon events](https://www.youtube.com/c/TheApacheFoundation/search?query=lucene%20solr)
+
 [Videos from Past Activate / Lucene/Solr revolution events](https://www.activate-conf.com/more-events)
 
-[Videos from Lucidwork's Eurocon](https://vimeo.com/search?q=lucene%20eurocon)
+[Videos from past Berlin Buzzwords events](https://www.youtube.com/c/PlainSchwarzUG/playlists?view=50&sort=dd&shelf_id=1)
+
+[Videos from past Haystack events (search relevance)](https://www.youtube.com/channel/UCiuXt-f2Faan4Es37nADUdQ/playlists)
+
+[Videos from Lucidwork's Lucene Eurocon](https://vimeo.com/search?q=lucene%20eurocon)
 
 <h3 class="offset" id="youtube">YouTube</h3>
 
@@ -227,9 +233,3 @@ If you have a Solr video that you would like to see listed here, please submit a
 
 [Search Vimeo for Solr](http://vimeo.com/search?q=solr)
 
-## Website ##
-
-This web site is hosted in its own git repository `solr-site` (see [Github](https://github.com/apache/solr-site/) and [Gitbox](https://gitbox.apache.org/repos/asf/solr-site.git)).
-
-Pushing to the `main` branch will update the [staging site](https://solr.staged.apache.org) while pushing to `production` branch will update the main web site. Read the [README.md](https://github.com/apache/solr-site/) file for further instructions.
-
diff --git a/themes/solr/templates/_footer.html b/themes/solr/templates/_footer.html
index 03c26db..aafd096 100644
--- a/themes/solr/templates/_footer.html
+++ b/themes/solr/templates/_footer.html
@@ -25,6 +25,7 @@
       <li><a href="/resources.html#presentations">Presentations</a></li>
       <li><a href="/resources.html#videos">Videos</a></li>
       <li><a href="/logos-and-assets.html">Solr Logos and Assets</a></li>
+      <li><a href="/editing-website.html">Editing this Website</a></li>
       <br/>
       <li><a href="https://www.apache.org/">Apache Software Foundation</a></li>
       <li><a href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
diff --git a/themes/solr/templates/resources.html b/themes/solr/templates/resources.html
index a07021d..61b9f65 100644
--- a/themes/solr/templates/resources.html
+++ b/themes/solr/templates/resources.html
@@ -8,5 +8,4 @@
 <dd><a data-scroll href="#solr-books">Books</a></dd>
 <dd><a data-scroll href="#presentations">Presentations</a></dd>
 <dd><a data-scroll href="#videos">Videos</a></dd>
-<dd><a data-scroll href="#website">Website</a></dd>
 {% endblock %}