aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Oliva <oliva@gnu.org>2018-05-07 01:37:37 -0300
committerAlexandre Oliva <aoliva@redhat.com>2018-05-07 01:40:30 -0300
commitffa81c22a3ac0fb75ad9bf2b1c3cdbf9eafa0bc9 (patch)
treea98ba8136c9d5b6ba3c3dfc99e8548ea09c89afe
parent0065aaaaae51cd60210ec3a7e13dddd8e01ffe2c (diff)
downloadglibc-ffa81c22a3ac0fb75ad9bf2b1c3cdbf9eafa0bc9.zip
glibc-ffa81c22a3ac0fb75ad9bf2b1c3cdbf9eafa0bc9.tar.gz
glibc-ffa81c22a3ac0fb75ad9bf2b1c3cdbf9eafa0bc9.tar.bz2
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.
-rw-r--r--ChangeLog6
-rw-r--r--manual/startup.texi8
2 files changed, 14 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 63531c5..7397335 100644
--- 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 21c48cd..7395d32 100644
--- 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