Update from erc--emacs--22

[gnu-emacs] / man / emacs.texi

diff --git a/man/emacs.texi b/man/emacs.texi
index 838e0c4d5122c1ee1ab68eb7cb0fb14269c04d05..76b77f38f8b03706fc11d942da19119d40ddabb9 100644 (file)
--- a/man/emacs.texi
+++ b/man/emacs.texi
@@ -5,7 +5,7 @@
 
 @c The edition number appears in several places in this file
 @set EDITION   Sixteenth
-@set EMACSVER  22.0.90
+@set EMACSVER  22.0.91
 
 @copying
 This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},
@@ -714,7 +714,7 @@ The Calendar and the Diary
 * Scroll Calendar::     Bringing earlier or later months onto the screen.
 * Counting Days::       How many days are there between two dates?
 * General Calendar::    Exiting or recomputing the calendar.
-* LaTeX Calendar::      Print a calendar using LaTeX.
+* Writing Calendar Files:: Writing calendars to files of various formats.
 * Holidays::            Displaying dates of holidays.
 * Sunrise/Sunset::      Displaying local times of sunrise and sunset.
 * Lunar Phases::        Displaying phases of the moon.
@@ -1027,7 +1027,7 @@ Contributors to GNU Emacs include Jari Aalto, Per Abrahamsen, Tomas
 Abrahamsson, Jay K.@: Adams, Michael Albinus, Nagy Andras, Ralf
 Angeli, Joe Arceneaux, Miles Bader, David Bakhash, Juanma Barranquero,
 Eli Barzilay, Steven L.@: Baur, Jay Belanger, Alexander L.@: Belikoff,
-Boaz Ben-Zvi, Karl Berry, Ray Blaak, Jim Blandy, Johan Bockg@aa{}rd,
+Boaz Ben-Zvi, Karl Berry, Anna M.@: Bigatti, Ray Blaak, Jim Blandy, Johan Bockg@aa{}rd,
 Per Bothner, Terrence Brannon, Frank Bresz, Peter Breton, Emmanuel
 Briot, Kevin Broadey, Vincent Broman, David M.@: Brown, Georges
 Brun-Cottan, Joe Buehler, W@l{}odek Bzyl, Bill Carpenter, Per
@@ -1050,7 +1050,7 @@ Jesper Harder, Markus Heritsch, Karl Heuer, Manabu Higashida, Anders
 Holst, Jeffrey C.@: Honig, Kurt Hornik, Tom Houlder, Joakim Hove,
 Denis Howe, Lars Ingebrigtsen, Andrew Innes, Seiichiro Inoue, Pavel
 Janik, Paul Jarc, Ulf Jasper, Michael K. Johnson, Kyle Jones, Terry
-Jones, Simon Josefsson, Arne J@/orgensen, Tomoji Kagatani, Brewster
+Jones, Simon Josefsson, Arne J@o{}rgensen, Tomoji Kagatani, Brewster
 Kahle, Lute Kamstra, David Kastrup, David Kaufman, Henry Kautz, Taichi
 Kawabata, Howard Kaye, Michael Kifer, Richard King, Peter Kleiweg,
 Shuhei Kobayashi, Pavel Kobiakov, Larry K.@: Kolodney, David M.@:
@@ -1082,7 +1082,7 @@ Schaefer, Holger Schauer, William Schelter, Ralph Schleicher, Gregor
 Schmid, Michael Schmidt, Ronald S. Schnell, Philippe Schnoebelen, Jan
 Schormann, Alex Schroeder, Stephen Schoef, Raymond Scholz, Randal
 Schwartz, Oliver Seidel, Manuel Serrano, Hovav Shacham, Stanislav
-Shalunov, Mark Shapiro, Richard Sharman, Olin Shivers, Espen Skoglund,
+Shalunov, Marc Shapiro, Richard Sharman, Olin Shivers, Espen Skoglund,
 Rick Sladkey, Lynn Slater, Chris Smith, David Smith, Paul D.@: Smith,
 Andre Spiegel, Michael Staats, William Sommerfeld, Michael Staats,
 Reiner Steib, Sam Steingold, Ake Stenhoff, Peter Stephenson, Ken
@@ -1586,12 +1586,7 @@ Public License instead of this License.
 
 @include doclicense.texi
 @include cmdargs.texi
-@iftex
-@include xresmini.texi
-@end iftex
-@ifnottex
 @include xresources.texi
-@end ifnottex
 
 @include anti.texi
 @include macos.texi