about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRaymond Nicholson <rain1@airmail.cc>2018-04-30 10:41:44 -0400
committerZack Weinberg <zackw@panix.com>2018-04-30 10:41:44 -0400
commit340d9652b9d0e1d4136588f18b726662d195777c (patch)
tree9a90e3ddbb1f83fa3218506ca9d92c18c77cbd4d
parentc57bf7c15ba179168d01f7c6acde7ecbf5dd9cd8 (diff)
downloadglibc-340d9652b9d0e1d4136588f18b726662d195777c.tar.gz
glibc-340d9652b9d0e1d4136588f18b726662d195777c.tar.xz
glibc-340d9652b9d0e1d4136588f18b726662d195777c.zip
manual/startup.texi (Aborting a Program): Remove inappropriate joke.
-rw-r--r--ChangeLog4
-rw-r--r--manual/startup.texi8
2 files changed, 4 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 3ec5164008..881cd27eaf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-04-30  Raymond Nicholson <rain1@airmail.cc>
+
+	* manual/startup.texi (Aborting a Program): Remove inappropriate joke.
+
 2018-04-27  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 
 	* sysdeps/unix/sysv/linux/arm/readahead.c: Remove file.
diff --git a/manual/startup.texi b/manual/startup.texi
index 7395d32dd0..21c48cd037 100644
--- a/manual/startup.texi
+++ b/manual/startup.texi
@@ -1005,14 +1005,6 @@ 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