Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1121

3 files changed, 7 insertions, 2 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 0fd90ba5a63..2fddf83b400 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -13,6 +13,11 @@
         * building.texi (GDB-UI Layout, Breakpoints Buffer)
         (Other GDB-UI Buffers): Update for recent thread related changes.
 
+2008-04-11  Mirko Vukovic  <mirko.vukovic@gmail.com>  (tiny change)
+
+        * maintaining.texi (Maintaining):
+        * emacs.texi (Top): Typo.
+
 2008-04-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * display.texi (Font Lock): Prefer add-hook to using a non-nil `mode'
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index aca77108e3b..28b72eb5c13 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -713,7 +713,7 @@ Maintaining Large Programs
 
 * Change Log::          Maintaining a change history for your program.
 * Format of ChangeLog:: What the change log file looks like.
-* Tags::                Go direct to any function in your program in one
+* Tags::                Go directly to any function in your program in one
                           command.  Tags remembers which file it is in.
 * Emerge::              A convenient way of merging two versions of a program.
 
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index d4774379555..424f26b584a 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -12,7 +12,7 @@ also particularly useful for this purpose.
 @menu
 * Change Log::          Maintaining a change history for your program.
 * Format of ChangeLog:: What the change log file looks like.
-* Tags::                Go direct to any function in your program in one
+* Tags::                Go directly to any function in your program in one
                           command.  Tags remembers which file it is in.
 @ifnottex
 * Emerge::              A convenient way of merging two versions of a program.