Merge from trunk.

[gnu-emacs] / doc / misc / ada-mode.texi

diff --git a/doc/misc/ada-mode.texi b/doc/misc/ada-mode.texi
index af5dc310a58c49c95c77c16420e620c94cf53d61..66cdb2001117773f05e28a16e39aac26dc3f46c7 100644 (file)
--- a/doc/misc/ada-mode.texi
+++ b/doc/misc/ada-mode.texi
@@ -3,8 +3,7 @@
 @settitle Ada Mode
 
 @copying
-Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004,
-2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+Copyright @copyright{} 1999-2011  Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -20,9 +19,9 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs editing modes
 @direntry
-* Ada mode: (ada-mode). Emacs mode for editing and compiling Ada code.
+* Ada mode: (ada-mode).         Emacs mode for editing and compiling Ada code.
 @end direntry
 
 @titlepage
@@ -40,6 +39,7 @@ developing GNU and promoting software freedom.''
 @contents
 
 @node Top, Overview, (dir), (dir)
+@top Ada Mode
 
 @ifnottex
 @insertcopying
@@ -396,7 +396,7 @@ src_dir=/Projects/my_project/src_1
 src_dir=/Projects/my_project/src_2
 @end example
 
-Some variables (like @code{src_dir}) are lists; multiple occurances
+Some variables (like @code{src_dir}) are lists; multiple occurrences
 are concatenated.
 
 There must be no space between the variable name and ``='', and no
@@ -1524,7 +1524,3 @@ autofill the current comment.
 @printindex fn
 
 @bye
-
-@ignore
-   arch-tag: 68cf0d8a-55cc-4190-a28d-4984fa56ed1e
-@end ignore