diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi
index 39eb1d2..5842a91 100644
--- a/binutils/doc/binutils.texi
+++ b/binutils/doc/binutils.texi
@@ -1858,7 +1858,10 @@ objdump address@hidden|@option{--archive-headers}]
         address@hidden|@option{--dynamic-reloc}]
         address@hidden|@option{--full-contents}]
         address@hidden|
-         @option{--dwarf}[=rawline,=decodedline,=info,=abbrev,=pubnames,=aranges,=macro,=frames,=frames-interp,=str,=loc,=Ranges,=pubtypes,=trace_info,=trace_abbrev,=trace_aranges,=gdb_index]]
+         @option{--dwarf}[=rawline,=decodedline,=info,=abbrev,=pubnames]
+                 [=aranges,=macro,=frames,=frames-interp,=str,=loc]
+                 [=Ranges,=pubtypes,=trace_info,=trace_abbrev]
+                 [=trace_aranges,=gdb_index]
         address@hidden|@option{--stabs}]
         address@hidden|@option{--syms}]
         address@hidden|@option{--dynamic-syms}]
@@ -2095,19 +2098,35 @@ compilers.
 For the x86, some of the options duplicate functions of the @option{-m}
 switch, but allow finer grained control.  Multiple selections from the
 following may be specified as a comma separated string.
address@hidden, @option{i386} and @option{i8086} select disassembly for
-the given architecture.  @option{intel} and @option{att} select between
-intel syntax mode and AT&T syntax mode.
address@hidden and @option{att-mnemonic} select between
-intel mnemonic mode and AT&T mnemonic mode. @option{intel-mnemonic}
-implies @option{intel} and @option{att-mnemonic} implies @option{att}.
address@hidden, @option{addr32},
address@hidden, @option{data32} and @option{data16} specify the default
-address size and operand size.  These four options will be overridden if
address@hidden, @option{i386} or @option{i8086} appear later in the
-option string.  Lastly, @option{suffix}, when in AT&T mode,
-instructs the disassembler to print a mnemonic suffix even when the
-suffix could be inferred by the operands.
address@hidden @code
address@hidden x86-64
address@hidden i386
address@hidden i8086
+Select disassembly for the given architecture.
+
address@hidden intel
address@hidden att
+Select between intel syntax mode and AT&T syntax mode.
+
address@hidden intel-mnemonic
address@hidden att-mnemonic
+Select between intel mnemonic mode and AT&T mnemonic mode.
+Note: @code{intel-mnemonic} implies @code{intel} and
address@hidden implies @code{att}.
+
address@hidden addr64
address@hidden addr32
address@hidden addr16
address@hidden data32
address@hidden data16
+Specify the default address size and operand size.  These four options
+will be overridden if @code{x86-64}, @code{i386} or @code{i8086}
+appear later in the option string.
+
address@hidden suffix
+When in AT&T mode, instructs the disassembler to print a mnemonic
+suffix even when the suffix could be inferred by the operands.
address@hidden table
 
 For PowerPC, @option{booke} controls the disassembly of BookE
 instructions.  @option{32} and @option{64} select PowerPC and
@@ -2191,10 +2210,24 @@ Print information that is specific to the object file format.  The
 argument @var{options} is a comma separated list that depends on the
 format (the lists of options is displayed with the help).
 
-For XCOFF, the available options are: @option{header}, @option{aout},
address@hidden, @option{syms}, @option{relocs}, @option{lineno},
address@hidden, @option{except}, @option{typchk}, @option{traceback},
address@hidden and @option{ldinfo}.
+For XCOFF, the available options are:
address@hidden @code
address@hidden header
address@hidden aout
address@hidden sections
address@hidden syms
address@hidden relocs
address@hidden lineno,
address@hidden loader
address@hidden except
address@hidden typchk
address@hidden traceback
address@hidden toc
address@hidden ldinfo
address@hidden table
+
+Not all object formats support this option.  In particular the ELF
+format does not use it.
 
 @item -r
 @itemx --reloc
@@ -2251,7 +2284,10 @@ Display @var{width} bytes on a single line when disassembling
 instructions.
 
 @item -W[lLiaprmfFsoRt]
address@hidden --dwarf[=rawline,=decodedline,=info,=abbrev,=pubnames,=aranges,=macro,=frames,=frames-interp,=str,=loc,=Ranges,=pubtypes,=trace_info,=trace_abbrev,=trace_aranges,=gdb_index]
address@hidden --dwarf[=rawline,=decodedline,=info,=abbrev,=pubnames]
address@hidden --dwarf[=aranges,=macro,=frames,=frames-interp,=str,=loc]
address@hidden --dwarf[=Ranges,=pubtypes,=trace_info,=trace_abbrev]
address@hidden --dwarf[=trace_aranges,=gdb_index]
 @cindex DWARF
 @cindex debug symbols
 Displays the contents of the debug sections in the file, if any are