Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 638-652)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 202)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-177

1 files changed, 1 insertions, 1 deletions

diff --git a/src/doc.c b/src/doc.c
index df3ca94af1e..74690ebba6b 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -745,7 +745,7 @@ as the keymap for future \\=\\[COMMAND] substrings.
 \\=\\= quotes the following character and is discarded;
 thus, \\=\\=\\=\\= puts \\=\\= into the output, and \\=\\=\\=\\[ puts \\=\\[ into the output.
 
-Returns original STRING if no substitutions were made.  Othwerwise,
+Returns original STRING if no substitutions were made.  Otherwise,
 a new string, without any text properties, is returned.  */)
      (string)
      Lisp_Object string;