Merge from emacs-23; up to 2010-06-01T01:49:15Z!monnier@iro.umontreal.ca

[gnu-emacs] / doc / misc / woman.texi

diff --git a/doc/misc/woman.texi b/doc/misc/woman.texi
index 975a9c408fc796fcc15fd1db31b651b6ac321363..c869d1a46c7027f5ff5cc183cc49329a08ff5020 100644 (file)
--- a/doc/misc/woman.texi
+++ b/doc/misc/woman.texi
@@ -18,8 +18,7 @@
 This file documents WoMan: A program to browse Unix manual pages `W.O.
 (without) man'.
 
-Copyright @copyright{} 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-2009, 2010, 2011 Free Software Foundation, Inc.
+Copyright @copyright{} 2001-2011 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -1121,8 +1120,8 @@ A regular match expression used to match compressed man file extensions
 for which decompressors are available and handled by auto-compression
 mode.  It should begin with @code{\\.} and end with @code{\\'} and
 @emph{must not} be optional.  The default value is
-@code{"\\.\\(g?z\\|bz2\\)\\'"}, which matches the @code{gzip} and
-@code{bzip2} compression extensions.
+@code{"\\.\\(g?z\\|bz2\\|xz\\)\\'"}, which matches the @code{gzip},
+@code{bzip2}, and @code{xz} compression extensions.
 
 @emph{Do not change this unless you are sure you know what you are doing!}
 
@@ -1430,7 +1429,3 @@ Eli Zaretskii, @email{eliz@@is.elta.co.il}
 @printindex cp
 
 @bye
-
-@ignore
-   arch-tag: a1a6b715-396f-4378-9b94-0b2ca0aa5028
-@end ignore