Update documentation for new URLs etc

4 files changed, 14 insertions, 22 deletions

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
deleted file mode 100644
index 6a9937d..0000000
--- a/.github/FUNDING.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-patreon: Adelie
-ko_fi: adelie
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a6de797..6c44ff3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -69,4 +69,4 @@ pages:
     paths:
     - public
   only:
-  - master
+  - current
diff --git a/README.rst b/README.rst
index 8765da8..9fcb00c 100644
--- a/README.rst
+++ b/README.rst
@@ -11,12 +11,12 @@
 :Status:
  Development
 :Copyright:
- © 2015-2020 Adélie Linux.
+ © 2015-2022 Adélie Linux and contributors.
  Code: AGPL-3.0 license.
  Documentation: CC BY-NC-SA open source license.
 
 
-.. image:: https://code.foxkit.us/adelie/horizon/raw/master/assets/horizon-256.png
+.. image:: https://git.adelielinux.org/adelie/horizon/raw/master/assets/horizon-256.png
    :target: https://horizon.adelielinux.org/
    :align: center
    :alt: Project Horizon
@@ -34,18 +34,14 @@ auditable, secure, and fast.
    :target: LICENSE-code
    :alt: Licensed under AGPLv3
 
-.. image:: https://img.shields.io/gitlab/pipeline/adelie/horizon?gitlab_url=https%3A%2F%2Fcode.foxkit.us%2F
-   :target: https://code.foxkit.us/adelie/horizon/pipelines
+.. image:: https://img.shields.io/gitlab/pipeline/adelie/horizon?gitlab_url=https%3A%2F%2Fgit.adelielinux.org%2F
+   :target: https://git.adelielinux.org/adelie/horizon/pipelines
    :alt: Click for build status
 
-.. image:: https://code.foxkit.us/adelie/horizon/badges/master/coverage.svg
+.. image:: https://git.adelielinux.org/adelie/horizon/badges/master/coverage.svg
    :target: https://horizon.adelielinux.org/coverage/
    :alt: Click for code coverage report
 
-.. image:: https://img.shields.io/codacy/grade/fcca720981ee4646aa7e5b4f2f124aa4.svg
-   :target: https://app.codacy.com/project/awilfox/horizon/dashboard
-   :alt: Codacy code grade: A
-
 
 
 Introduction
@@ -69,7 +65,7 @@ Code is licensed under the Affero GPL (AGPL) 3 license.
 Changes
 ```````
 Any changes to this repository must be reviewed before being pushed to the
-master branch.
+current branch.
 
 
 
@@ -329,9 +325,8 @@ If you have an issue using Project Horizon, you may view our BTS_.  You may
 also `submit an issue`_ directly.
 
 For general discussion, questions, or to submit a patch, please use the
-`Horizon mailing list`_.
+Horizon mailing list (currently inaccessible).
 
-.. _BTS: https://bts.adelielinux.org/buglist.cgi?product=Horizon&resolution=---
-.. _`submit an issue`: https://bts.adelielinux.org/enter_bug.cgi?product=Horizon
-.. _`Horizon mailing list`: https://lists.adelielinux.org/postorius/lists/horizon.lists.adelielinux.org/
+.. _BTS: https://git.adelielinux.org/adelie/horizon/-/issues
+.. _`submit an issue`: https://git.adelielinux.org/adelie/horizon/-/issues/new
 
diff --git a/devel/index.html b/devel/index.html
index 29676b1..cae27df 100644
--- a/devel/index.html
+++ b/devel/index.html
@@ -18,14 +18,13 @@
             <div class="ym-wrapper">
                 <nav class="ym-hlist adelie-red">
                     <ul>
-                        <li class="nopad"><img src="https://oldwww.adelielinux.org/img/header.png" alt="[Penguin]"></li>
+                        <li class="nopad"><img src="https://www.adelielinux.org/assets/images/gen_polylogo_white_color_x54.png" alt="[Penguin]"></li>
                         <li><a href="//www.adelielinux.org/">Adélie Home</a></li>
-                        <li><a href="https://www.adelielinux.org/community/contribute.html">Contribute</a></li>
                         <li><a href="https://git.adelielinux.org/adelie/horizon/">Horizon Git</a></li>
                         <li><a href="script/">Script Reference</a></li>
                         <li><a href="requirements/">Functional Req's</a></li>
                         <li><a href="coverage/">Coverage Report</a></li>
-                        <li><a href="https://bts.adelielinux.org/buglist.cgi?product=Horizon&resolution=---">Issues</a></li>
+                        <li><a href="https://git.adelielinux.org/adelie/horizon/-/issues">Issues</a></li>
                     </ul>
                 </nav>
             </div>
@@ -38,7 +37,7 @@
                     Install Adélie on your desktop or portable computer using the friendly UI wizard,
                     or deploy Adélie to your server cluster with HorizonScript.</p>
                     <p class="center">
-                        <a href="https://distfiles.adelielinux.org/adelie/1.0-beta4/iso/" class="ym-button ym-xlarge ym-danger">Download Adélie CD/USB</a>
+                        <a href="https://distfiles.adelielinux.org/adelie/1.0/iso/rc2/" class="ym-button ym-xlarge ym-danger">Download Adélie CD/USB</a>
                         <a href="script/" class="ym-button ym-xlarge">HorizonScript Reference</a>
                         <a href="https://help.adelielinux.org/html/install/" class="ym-button ym-xlarge">Handbook</a>
                     </p>
@@ -71,7 +70,7 @@
         <footer>
             <div class="ym-wrapper center">
                 <div class="ym-wbox">
-                    Copyright &copy; 2015-2019 Adélie Linux Team.  <a href="https://git.adelielinux.org/adelie/horizon/tree/master/devel/">Site</a> licensed under CC BY-NC-SA 4.0 and others.
+                    Copyright &copy; 2015-2022 Adélie Linux Team.  <a href="https://git.adelielinux.org/adelie/horizon/tree/master/devel/">Site</a> licensed under CC BY-NC-SA 4.0 and others.
                 </div>
             </div>
         </footer>