manual/startup.texi (Aborting a Program): Remove inappropriate joke.

diff --git a/ChangeLog b/ChangeLog
index 3ec5164008d9c6f54f742ce4c1c4edfd23f72055..881cd27eaf3999a9c71c3b08e16298881b408563 100644 (file)
--- 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 7395d32dd0c877487938857fd432650e87fe7bb2..21c48cd0374dcc906c33165267412081fc7de2dc 100644 (file)
--- 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