Revert:

2018-04-30  Raymond Nicholson <rain1@airmail.cc>
* manual/startup.texi (Aborting a Program): Remove inappropriate joke.

This complies with the decision of the project leader and primary and
ultimate maintainer, who partially delegated maintainership to myself
and others under certain constraints.

This is also in line with the community-agreed procedures.

It is obvious that we didn't have consensus on a decision to install
that patch, since both sides are still arguing over it.

As for the decision to reverse the deletion, if we even need one to
counter a move that did not have consensus, although nobody else offered
to install the reversal and restore the status prior to the fait
accompli, and some explicitly refused to do so themselves, nobody
objected when I offered to do so.  Therefore, by the same reasoning that
led to the mistaken installation of the patch, and after a much longer
wait for objections, I understand there is consensus on my reverting it.

diff --git a/ChangeLog b/ChangeLog
index 63531c5943aee2b8d462b3eac21d826e6b9c4a31..7397335533b4779dc9da1fff58a15b0e0cd97619 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-05-07  Alexandre Oliva <oliva@gnu.org>
+
+       Revert:
+       2018-04-30  Raymond Nicholson <rain1@airmail.cc>
+       * manual/startup.texi (Aborting a Program): Remove inappropriate joke.
+
 2018-05-05  Paul Pluzhnikov  <ppluzhnikov@google.com>
 
        [BZ #20419]

diff --git a/manual/startup.texi b/manual/startup.texi
index 21c48cd0374dcc906c33165267412081fc7de2dc..7395d32dd0c877487938857fd432650e87fe7bb2 100644 (file)
--- a/manual/startup.texi
+++ b/manual/startup.texi
@@ -1005,6 +1005,14 @@ This function actually terminates the process by raising a
 intercept this signal; see @ref{Signal Handling}.
 @end deftypefun
 
+@c Put in by rms.  Don't remove.
+@cartouche
+@strong{Future Change Warning:} Proposed Federal censorship regulations
+may prohibit us from giving you information about the possibility of
+calling this function.  We would be required to say that this is not an
+acceptable way of terminating a program.
+@end cartouche
+
 @node Termination Internals
 @subsection Termination Internals