(Authentication): Changed the list of supported

[bpt/emacs.git] / man / emacs.texi

diff --git a/man/emacs.texi b/man/emacs.texi
index 280cc0c..d932dd0 100644 (file)
--- a/man/emacs.texi
+++ b/man/emacs.texi
@@ -174,7 +174,7 @@ Major Structures of Emacs
 * Buffers::            Multiple buffers; editing several files at once.
 * Windows::            Viewing two pieces of text at once.
 * Frames::             Running the same Emacs session in multiple X windows.
-* International::       Using non-ASCII character sets (the MULE features).
+* International::       Using non-@acronym{ASCII} character sets (the MULE features).
 
 Advanced Features
 * Major Modes::                Text mode vs. Lisp mode vs. C mode ...
@@ -711,7 +711,7 @@ The Diary
 * Adding to Diary::       Commands to create diary entries.
 * Special Diary Entries::  Anniversaries, blocks of dates, cyclic entries, etc.
 
-@sc{Gnus}
+Gnus
 
 * Buffers of Gnus::    The group, summary, and article buffers.
 * Gnus Startup::       What you should know about starting Gnus.
@@ -928,9 +928,9 @@ redistribute the GNU Emacs received from them under the usual terms of the
 General Public License.  In other words, the program must be free for you
 when you get it, not just free for the manufacturer.
 
-You can also order copies of GNU Emacs from the Free Software Foundation
-on CD-ROM@.  This is a convenient and reliable way to get a copy; it is
-also a good way to help fund our work.  (The Foundation has always
+You can also order copies of GNU Emacs from the Free Software
+Foundation.  This is a convenient and reliable way to get a copy; it
+is also a good way to help fund our work.  (The Foundation has always
 received most of its funds in this way.)  An order form is included in
 the file @file{etc/ORDERS} in the Emacs distribution, and on our web
 site in @url{http://www.gnu.org/order/order.html}.  For further
@@ -955,7 +955,10 @@ company policy is unsympathetic to the idea of donating to charity, you
 might instead suggest ordering a CD-ROM from the Foundation
 occasionally, or subscribing to periodic updates.
 
-@iftex
+@ifnotinfo
+@node Acknowledgments, Copying, Distrib, Top
+@section Acknowledgments
+
 Contributors to GNU Emacs include Per Abrahamsen, Jay K. Adams, Joe
 Arceneaux, Boaz Ben-Zvi, Jim Blandy, Terrence Brannon, Frank Bresz,
 Peter Breton, Kevin Broadey, Vincent Broman, David M. Brown, Bill
@@ -973,7 +976,7 @@ Heuer, Manabu Higashida, Anders Holst, Kurt Hornik, Tom Houlder, Lars
 Ingebrigtsen, Andrew Innes, Michael K. Johnson, Kyle Jones, Tomoji
 Kagatani, Brewster Kahle, David Kaufman, Henry Kautz, Howard Kaye,
 Michael Kifer, Richard King, Larry K. Kolodney, Robert Krawitz,
-Sebastian Kremer, Geoff Kuenning, David K@aa gedal, Daniel LaLiberte,
+Sebastian Kremer, Geoff Kuenning, David K@aa{}gedal, Daniel LaLiberte,
 Aaron Larson, James R. Larus, Frederic Lepied, Lars Lindberg, Eric
 Ludlam, Neil M. Mager, Ken Manheimer, Bill Mann, Brian Marick, Simon
 Marshall, Bengt Martensson, Charlie Martin, Thomas May, Roland McGrath,
@@ -997,7 +1000,7 @@ Warsaw, Morten Welinder, Joseph Brian Wells, Rodney Whitby, Ed
 Wilkinson, Mike Williams, Steven A. Wood, Dale R. Worley, Felix
 S. T. Wu, Tom Wurgler, Eli Zaretskii, Jamie Zawinski, Ian T. Zimmermann,
 Reto Zimmermann, and Neal Ziring.
-@end iftex
+@end ifnotinfo
 
 @node Copying, GNU Free Documentation License, Distrib, Top
 @unnumbered GNU GENERAL PUBLIC LICENSE
@@ -1547,3 +1550,6 @@ edit files while running shell commands.
 @contents
 @bye
 
+@ignore
+   arch-tag: ed48740a-410b-46ea-9387-c9a9252a3392
+@end ignore