summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2010-04-16 00:43:29 -0700
committerGlenn Morris <rgm@gnu.org>2010-04-16 00:43:29 -0700
commitd52dbd3d45804baa4645ee14cfe2176e2b6acee3 (patch)
treeb27eddd64adf57b1a374193c42e017a5ecc910e2
parentb1519d856183d8e96bf4623422d8fa70466756a6 (diff)
downloademacs-d52dbd3d45804baa4645ee14cfe2176e2b6acee3.tar.gz
* emacs.texi (Acknowledgments): Remove duplicate.
-rw-r--r--doc/emacs/ChangeLog2
-rw-r--r--doc/emacs/emacs.texi6
2 files changed, 5 insertions, 3 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 0665133fae2..8b26fdfb7e5 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,5 +1,7 @@
2010-04-16 Glenn Morris <rgm@gnu.org>
+ * emacs.texi (Acknowledgments): Remove duplicate.
+
* maintaining.texi (VC Directory Commands): Mention stashes and shelves.
2010-04-15 Glenn Morris <rgm@gnu.org>
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 383c8f82d90..0e5463828e7 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -1403,9 +1403,9 @@ Schnoebelen, Jan Schormann, Alex Schroeder, Stephen Schoef, Raymond
Scholz, Eric Schulte, Andreas Schwab, Randal Schwartz, Oliver Seidel,
Manuel Serrano, Hovav Shacham, Stanislav 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 Stevens, Andy Stewart, Jonathan
+Smith, David Smith, Paul D.@: Smith, William Sommerfeld, Andre Spiegel,
+Michael Staats, Reiner Steib, Sam Steingold, Ake Stenhoff,
+Peter Stephenson, Ken Stevens, Andy Stewart, Jonathan
Stigelman, Martin Stjernholm, Kim F.@: Storm, Steve Strassman, Olaf
Sylvester, Naoto Takahashi, Steven Tamm, Jean-Philippe Theberge, Jens
T.@: Berger Thielemann, Spencer Thomas, Jim Thompson, Luc Teirlinck,