diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index a895b7e95781..84fda5b2bd12 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-27  Brooks Moses  <brooks.moses@codesourcery.com>
+
+	* gfortran.texi (Option Index): Add @samp as needed.
+	* invoke.texi: Removed extraneous line.
+	(-fshort-enums): Fixed intexing.
+
 2007-04-27  Daniel Franke  <franke.daniel@gmail.com>
 
 	Backport from trunk:
diff --git a/gcc/fortran/gfortran.texi b/gcc/fortran/gfortran.texi
index f3f5afd26c2d..c6cf5b5d6786 100644
--- a/gcc/fortran/gfortran.texi
+++ b/gcc/fortran/gfortran.texi
@@ -1516,11 +1516,11 @@ Environment variable forcing standard output to be line buffered (unix).
 
 @node Option Index
 @unnumbered Index of command line options
-@command{gfortran}'s command line options are indexed here without any 
-initial `-' or `--'. Where an option has both positive and negative forms 
-(such as -foption and -fno-option), relevant entries in the manual are 
-indexed under the most appropriate form; it may sometimes be useful to 
-look up both forms.
+@command{gfortran}'s command line options are indexed here without any
+initial @samp{-} or @samp{--}. Where an option has both positive and
+negative forms (such as -foption and -fno-option), relevant entries in
+the manual are indexed under the most appropriate form; it may sometimes
+be useful to look up both forms.
 @printindex op
 
 @node Keyword Index
diff --git a/gcc/fortran/invoke.texi b/gcc/fortran/invoke.texi
index 11e7b3ba4751..7696f43b45c4 100644
--- a/gcc/fortran/invoke.texi
+++ b/gcc/fortran/invoke.texi
@@ -490,7 +490,6 @@ to be issued if a tab is encountered. Note, @option{-Wno-tabs} is active
 for @option{-pedantic}, @option{-std=f95}, @option{-std=f2003}, and
 @option{-Wall}.
 
-
 @item -Wunderflow
 @opindex @code{Wunderflow}
 @cindex warnings, underflow
@@ -839,8 +838,7 @@ significant overhead to the function call, especially  when the passed data
 is noncontiguous.
 
 @item -fshort-enums
-@cindex @code{-fshort-enums} option
-@cindex option, @code{-fshort-enums}
+@opindex @code{fshort-enums}
 This option is provided for interoperability with C code that was
 compiled with the @option{-fshort-enums} option.  It will make
 GNU Fortran choose the smallest @code{INTEGER} kind a given