From 66032767184316c47b5d48f342d5f10cf14d0015 Mon Sep 17 00:00:00 2001
From: Werner LEMBERG <wl@gnu.org>
Date: Sat, 15 Sep 2007 08:10:46 +0000
Subject: [PATCH] * man/groff.man: Document `\_'. * doc/groff.texinfo: Ditto.
 Remove references to `\@' which isn't a valid escape sequence in groff.

---
 ChangeLog         |  7 +++++++
 doc/groff.texinfo | 16 +++++++++-------
 man/groff.man     | 12 +++++++++---
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 742517f6..998720ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-15  Werner LEMBERG  <wl@nu.org>
+
+	* man/groff.man: Document `\_'.
+	* doc/groff.texinfo: Ditto.
+	Remove references to `\@' which isn't a valid escape sequence in
+	groff.
+
 2007-09-14  Werner LEMBERG  <wl@gnu.org>
 
 	* tmac/unicode.tmac: Make `-' a pure input character by mapping it
diff --git a/doc/groff.texinfo b/doc/groff.texinfo
index 29b4febb..06b43c42 100644
--- a/doc/groff.texinfo
+++ b/doc/groff.texinfo
@@ -5715,7 +5715,6 @@ possible, but it is better not to use this feature to avoid confusion.
 @cindex @code{\_}, used as delimiter
 @cindex @code{\!}, used as delimiter
 @cindex @code{\?}, used as delimiter
-@cindex @code{\@@}, used as delimiter
 @cindex @code{\)}, used as delimiter
 @cindex @code{\/}, used as delimiter
 @cindex @code{\,}, used as delimiter
@@ -5741,9 +5740,9 @@ The following escapes sequences (which are handled similarly to
 characters since they don't take a parameter) are also allowed as
 delimiters: @code{\%}, @w{@samp{\ }}, @code{\|}, @code{\^}, @code{\@{},
 @code{\@}}, @code{\'}, @code{\`}, @code{\-}, @code{\_}, @code{\!},
-@code{\?}, @code{\@@}, @code{\)}, @code{\/}, @code{\,}, @code{\&},
-@code{\:}, @code{\~}, @code{\0}, @code{\a}, @code{\c}, @code{\d},
-@code{\e}, @code{\E}, @code{\p}, @code{\r}, @code{\t}, and @code{\u}.
+@code{\?}, @code{\)}, @code{\/}, @code{\,}, @code{\&}, @code{\:},
+@code{\~}, @code{\0}, @code{\a}, @code{\c}, @code{\d}, @code{\e},
+@code{\E}, @code{\p}, @code{\r}, @code{\t}, and @code{\u}.
 Again, don't use these if possible.
 
 @cindex @code{\A}, allowed delimiters
@@ -5821,14 +5820,13 @@ The space, tab, and newline characters.
 @cindex @code{\-}, used as delimiter
 @cindex @code{\_}, used as delimiter
 @cindex @code{\!}, used as delimiter
-@cindex @code{\@@}, used as delimiter
 @cindex @code{\/}, used as delimiter
 @cindex @code{\c}, used as delimiter
 @cindex @code{\e}, used as delimiter
 @cindex @code{\p}, used as delimiter
 All escape sequences except @code{\%}, @code{\:}, @code{\@{}, @code{\@}},
-@code{\'}, @code{\`}, @code{\-}, @code{\_}, @code{\!}, @code{\@@},
-@code{\/}, @code{\c}, @code{\e}, and @code{\p}.
+@code{\'}, @code{\`}, @code{\-}, @code{\_}, @code{\!}, @code{\/},
+@code{\c}, @code{\e}, and @code{\p}.
 @end itemize
 
 @cindex printing backslash (@code{\\}, @code{\e}, @code{\E}, @code{\[rs]})
@@ -9391,6 +9389,10 @@ This is a backslash followed by @acronym{ASCII} character @code{0x60}
 This is the same as @code{\[-]}, the minus sign in the current font.
 @endDefesc
 
+@Defesc {\\_, , , }
+This is the same as @code{\[ul]}, the underline character.
+@endDefesc
+
 @Defreq {cflags, n c1 c2 @dots{}}
 @cindex glyph properties (@code{cflags})
 @cindex character properties (@code{cflags})
diff --git a/man/groff.man b/man/groff.man
index 3b906930..3ab37ea3 100644
--- a/man/groff.man
+++ b/man/groff.man
@@ -2,11 +2,11 @@
 .ig
 groff.man
 
-Last update: 26 Oct 2006
+Last update: 15 Sep 2007
 
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006
+Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
   Free Software Foundation, Inc.
 written by Bernd Warken <bwarken@mayn.de>
 maintained by Werner Lemberg <wl@gnu.org>
@@ -2712,7 +2712,13 @@ Unescaped: left quote, backquote (ASCII 0x60).
 .
 .TP
 .ESC \-
-The \- sign in the current font.
+The \- (minus) sign in the current font.
+.
+.TP
+.ESC \_
+The same as
+.esc (ul ,
+the underline character.
 .
 .TP
 .ESC .
-- 
2.11.4.GIT