From 984917a62e512d9c96b5a9d37816d7d011d0cf75 Mon Sep 17 00:00:00 2001
From: Matthias Andree <matthias.andree@gmx.de>
Date: Sun, 21 Jun 2020 13:13:47 +0200
Subject: Document names of branches.

---
 README.git         | 4 +++-
 fetchmail-FAQ.html | 9 +++++++++
 website/index.html | 4 ++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/README.git b/README.git
index 2ffb6799..7f69dde8 100644
--- a/README.git
+++ b/README.git
@@ -1,6 +1,8 @@
 In order to be able to build from the git repository (working directory), some
 files need to be (re-)generated.
 
+The names of the branches are listed in the FAQ, section G2.
+
 Note that these generated files will be shipped with "make dist",
 so the end user will not need these packages.
 
@@ -28,4 +30,4 @@ $ make
 (become root)
 # make install-strip
 
--- Matthias Andree, 2020-03-30
+-- Matthias Andree, 2020-06-21
diff --git a/fetchmail-FAQ.html b/fetchmail-FAQ.html
index 429eb1fe..4e75156e 100644
--- a/fetchmail-FAQ.html
+++ b/fetchmail-FAQ.html
@@ -344,6 +344,15 @@ may not be completely current.</p>
 
 <p>The fetchmail sources are also available in the Git repositories at <a href="https://gitlab.com/fetchmail/fetchmail">https://gitlab.com/fetchmail/fetchmail</a> and <a href="https://sourceforge.net/p/fetchmail/git/">https://sourceforge.net/p/fetchmail/git/</a>.</p>
 
+<p>Note the Git branches:</p>
+<ul>
+	<li>legacy_63 (discontinued, unsupported old branch for 6.3.x releases)</li>
+	<li>legacy_64 (stable 6.4.x releases),</li>
+	<li>legacy_6x (near-future 6.5.x development),</li>
+	<li>next (mid-term future 7.x.x development)</li>
+</ul>
+<p>As of 2020-06-21, there no longer is a <em>master</em> branch. next was renamed to old-next, and <em>master</em> was renamed to <strong>next</strong>.</p>
+
 <h2><a id="G3" name="G3">G3. Something does not work/I think I've found a bug. Will you fix it?</a></h2>
 
 <p>The first thing you should to is to upgrade to the newest version of
diff --git a/website/index.html b/website/index.html
index 271c2850..467c8151 100644
--- a/website/index.html
+++ b/website/index.html
@@ -15,7 +15,7 @@
 <table width="100%" cellpadding="0" summary="Canned page header">
 <tr>
 <td>Fetchmail</td>
-<td align="right"><!-- update date -->2020-06-14</td>
+<td align="right"><!-- update date -->2020-06-21</td>
 </tr>
 </table>
 </div>
@@ -128,7 +128,7 @@ of known problems and requested features.</p>
 <p>The developers use <a href="https://git-scm.com/">Git</a> for revision
 control.  To browse the repository or to get the latest development version,
 find the instructions at <a
-    href="https://gitlab.com/fetchmail/fetchmail">https://gitlab.com/fetchmail/fetchmail</a>.</p>
+				 href="https://gitlab.com/fetchmail/fetchmail">https://gitlab.com/fetchmail/fetchmail</a>. The <a href="fetchmail-FAQ.html#G2">fetchmail FAQ in section G2 lists the widely-known and active branches.</a></p>
 
 <p>See the <a href="https://sourceforge.net/projects/fetchmail/">project
 page</a> for more, including <a
-- 
cgit v1.2.3