Remove the documentation of the maint branch.

paraslash-0.6.5 was the last maintenance release. As of today,
the "maint" branch no longer exists in the git repo, so adjust the
documentation at two places: the user manual and the download page.
Streamline the text a bit, while at it.

diff --git a/NEWS.md b/NEWS.md
index afe08a3c319673220c2e7ea4ad06ab8d4297c992..a73c1b3a49c3b614f65d47eccbb3ecd64c5d86d9 100644 (file)
--- a/NEWS.md
+++ b/NEWS.md
@@ -16,6 +16,8 @@ NEWS
   have been deprecated. They still work, but a warning is issued to
   inform the user about the deprecated option.
 - The alsa writer also supports 32 bit float sample formats.
+- The project no longer releases maintenance versions. The "maint"
+  integration branch has been removed from the git repository.
 
 Downloads:
 [tarball](./releases/paraslash-git.tar.xz)

diff --git a/web/download.in.html b/web/download.in.html
index 1287597e20cdb4bc3c002e9e28447626819e8401..56d32e5ee8dd9709aeea619ab5806f3d8ca30d11 100644 (file)
--- a/web/download.in.html
+++ b/web/download.in.html
@@ -14,19 +14,17 @@ source: </p>
                        git clone https://git.tuebingen.mpg.de/paraslash.git
                </kbd> </pre>
 
-               <p> The repository contains the full history of the
-               project since 2006, all work in progress and the source
-               code for the web pages. Choosing this option allows the
-               checkout of any of the four integration branches maint,
-               master, next, pu (see the
+               <p> The repository contains the full history of the project since 2006,
+               all work in progress and the source code for the web pages. Choosing
+               this option allows you to check out the three integration branches
+               "master", "next" and "pu", see the
 
                <a href="manual.html#Git-branches">Git branches</a>
 
-               section of the manual). All previous releases
-               correspond to tagged commits and may be checked out
-               as well. Since development takes place in separate
-               topic branches the master branch is expected to be
-               more stable than any of the released versions. </p>
+               section of the manual. All previous releases correspond to tagged
+               commits and may be checked out as well. Since development takes place
+               in separate topic branches, the master branch is expected to be more
+               stable than any of the released versions. </p>
 
                <p> Compiling from git requires additional tools,
                notably the autoconf package must be installed. </p>

diff --git a/web/manual.md b/web/manual.md
index 88ac0ea0459d8d6b3935f762a37ac518dcdfbeed..b33fd20a2d5b228c9dcc6efedc80db1b1973ca94 100644 (file)
--- a/web/manual.md
+++ b/web/manual.md
@@ -1980,8 +1980,8 @@ as the git development itself, as described below.
 The following text passage is based on "A note from the maintainer",
 written by Junio C Hamano, the maintainer of git.
 
-There are four branches in the paraslash repository that track the
-source tree: "master", "maint", "next", and "pu".
+There are three branches in the paraslash repository that track the
+source tree: "master", "next", and "pu".
 
 The "master" branch is meant to contain what is well tested and
 ready to be used in a production setting. There could occasionally be
@@ -1990,13 +1990,6 @@ be anything major, and more importantly quickly and easily fixable.
 Every now and then, a "feature release" is cut from the tip of this
 branch, named with three dotted decimal digits, like 0.4.2.
 
-Whenever changes are about to be included that will eventually lead to
-a new major release (e.g. 0.5.0), a "maint" branch is forked off from
-"master" at that point. Obvious, safe and urgent fixes after the major
-release are applied to this branch and maintenance releases are cut
-from it. New features never go to this branch. This branch is also
-merged into "master" to propagate the fixes forward.
-
 A trivial and safe enhancement goes directly on top of "master".
 New development does not usually happen on "master", however.
 Instead, a separate topic branch is forked from the tip of "master",
@@ -2018,11 +2011,11 @@ the "next" version of paraslash for his own pleasure, so it cannot
 be _that_ broken. The "next" branch is where new and exciting things
 take place.
 
-The two branches "master" and "maint" are never rewound, and "next"
-usually will not be either (this automatically means the topics that
-have been merged into "next" are usually not rebased, and you can find
-the tip of topic branches you are interested in from the output of
-"git log next"). You should be able to safely build on top of them.
+The "master" branch is never rewound, and "next" usually will not be
+either (this automatically means the topics that have been merged
+into "next" are usually not rebased, and you can find the tip of
+topic branches you are interested in from the output of "git log
+next"). You should be able to safely build on top of them.
 
 However, at times "next" will be rebuilt from the tip of "master" to
 get rid of merge commits that will never be in "master". The commit