Refer to "options" not "switches"

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index d3a0265..6308809 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,10 @@
+2002-01-15  Nick Clifton  <nickc@cambridge.redhat.com>
+
+       * objcopy.c (copy_usage): Use "switches" instead of "options".
+        (strip_usage): Use "switches" instead of "options".
+       * doc/binutils.texi (dlltool):  Refer to "switches" instead of
+        "options".
+
 2002-01-14  Richard Earnshaw  <rearnsha@arm.com>
 
        * MAINTAINERS: Add self as co-maintainer for the ARM code.

diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi
index fdf6e2d..82280bd 100644 (file)
--- a/binutils/doc/binutils.texi
+++ b/binutils/doc/binutils.texi
@@ -2732,14 +2732,14 @@ when @option{--export-all-symbols} is used.
 Specifies the path, including the filename, of the assembler to be used
 to create the exports file.
 
-@item -f @var{switches}
-@itemx --as-flags @var{switches}
-Specifies any specific command line switches to be passed to the
+@item -f @var{options}
+@itemx --as-flags @var{options}
+Specifies any specific command line options to be passed to the
 assembler when building the exports file.  This option will work even if
 the @option{-S} option is not used.  This option only takes one argument,
 and if it occurs more than once on the command line, then later
 occurrences will override earlier occurrences.  So if it is necessary to
-pass multiple switches to the assembler they should be enclosed in
+pass multiple options to the assembler they should be enclosed in
 double quotes.
 
 @item -D @var{name}

diff --git a/binutils/objcopy.c b/binutils/objcopy.c
index ddd0197..a56b7ec 100644 (file)
--- a/binutils/objcopy.c
+++ b/binutils/objcopy.c
@@ -360,8 +360,8 @@ copy_usage (stream, exit_status)
      FILE *stream;
      int exit_status;
 {
-  fprintf (stream, _("Usage: %s <switches> in-file [out-file]\n"), program_name);
-  fprintf (stream, _(" The switches are:\n"));
+  fprintf (stream, _("Usage: %s <options> in-file [out-file]\n"), program_name);
+  fprintf (stream, _(" The options are:\n"));
   fprintf (stream, _("\
   -I --input-target <bfdname>      Assume input file is in format <bfdname>\n\
   -O --output-target <bfdname>     Create an output file in format <bfdname>\n\
@@ -429,8 +429,8 @@ strip_usage (stream, exit_status)
      FILE *stream;
      int exit_status;
 {
-  fprintf (stream, _("Usage: %s <switches> in-file(s)\n"), program_name);
-  fprintf (stream, _(" The switches are:\n"));
+  fprintf (stream, _("Usage: %s <options> in-file(s)\n"), program_name);
+  fprintf (stream, _(" The options are:\n"));
   fprintf (stream, _("\
   -I --input-target <bfdname>      Assume input file is in format <bfdname>\n\
   -O --output-target <bfdname>     Create an output file in format <bfdname>\n\