Merge branch 'advertise-gitlab' into 'main'

Advertise gitlab

See merge request yarrg/ypp-sc-tools!2

diff --git a/yarrg/web/devel b/yarrg/web/devel
index fa40d1bc066f0c06b207ccfdfcd98b1640cb41aa..6c51887633e93366b14b36912b02bd37a32c1c30 100755 (executable)
--- a/yarrg/web/devel
+++ b/yarrg/web/devel
@@ -52,15 +52,8 @@ Note that there is <strong>NO WARRANTY</strong> !
 
 <h3>Source code</h3>
 
-<kbd>git clone git://git.yarrg.chiark.net/ypp-sc-tools.main.git</kbd><br>
-clones the master tree through which we push most changes.
-<p>
-
-<kbd>git clone http://www.chiark.greenend.org.uk/~ijackson/ypp-sc-tools/master/.git/</kbd><br>
-obtains the source code of the latest version released for use as a
-screenscraper client, which you can also find
-<a href="http://www.chiark.greenend.org.uk/~ijackson/ypp-sc-tools/master/">as
-an unpacked tree</a>
+The website and upload client are maintained at
+<a href="https://gitlab.com/yarrg"><kbd>https://gitlab.com/yarrg</kbd></a>.
 
 <p><a href="source.tar.gz">Live website source code</a> can
 be downloaded:  In case we have made changes but not yet pushed them
@@ -70,10 +63,6 @@ the source for their version, the website code itself lets you download
 an up-to-date of its actually-running source code.  So this link
 gives you the source code for the pages you are now looking at.
 
-<p>All of the above trees are available via the
-<a href="http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git">gitweb
-source code and history browser</a>.
-
 <h4>Uploader</h4>
 
 The uploader is also Free Software, but under a slightly different
@@ -142,6 +131,12 @@ has the specification of the mechanism and format for uploading to YARRG.
 
 <h2>Support from the YARRG team</h2>
 
+If there are problems, considering filing a ticket
+<a href="https://gitlab.com/yarrg/ypp-sc-tools/-/issues">on gitlab</a>
+Merge requests are very welcome.
+
+<p>
+
 If you would like to run a (perhaps modified) copy of the YARRG
 website it would be very easy for us to make our system send you
 copies of updates submitted by users of the YARRG clients including

diff --git a/yarrg/web/upload b/yarrg/web/upload
index a0c40fe2360e3c23b49472c5489060ef4ef9b2f4..56372d0ca5e8097c7b4b4a6e0efd0e313a83590c 100755 (executable)
--- a/yarrg/web/upload
+++ b/yarrg/web/upload
@@ -204,7 +204,14 @@ The download directory also sometimes contains other versions
 
 <p>
 
-We maintain JARRG in git, and you can get
+We maintain JARRG in git
+<a href="https://gitlab.com/yarrg/jarrg">on gitlab</a>.
+In case of problems,
+please make an Issue there.
+
+<p>
+
+You can maybe get
 source code for recent and perhaps unreleased versions from one of:
 <pre>
 git://git.yarrg.chiark.net/jarrg-ian.git</code> <a href="http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=jarrg-ian.git;a=summary">(gitweb)</a>