Use 'options' instead of 'switches' to describe command line choices.

[Nick Clifton]

Hi Guys,

  I am applying the patch below to make objcopy() and strip() use the
  word "options" instead of "switches" to refer to the command line
  parameters.  This makes their behaviour the same as gcc and the
  other binary utilities.

Cheers
        Nick


2002-01-15  Nick Clifton  <address@hidden>

        * 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".

Index: binutils/objcopy.c
===================================================================
RCS file: /cvs/src/src/binutils/objcopy.c,v
retrieving revision 1.33
diff -p -r1.33 objcopy.c
*** objcopy.c   2001/12/19 05:18:34     1.33
--- objcopy.c   2002/01/15 17:07:29
*************** copy_usage (stream, exit_status)
*** 360,367 ****
       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, _("\
    -I --input-target <bfdname>      Assume input file is in format <bfdname>\n\
    -O --output-target <bfdname>     Create an output file in format 
<bfdname>\n\
--- 360,367 ----
       FILE *stream;
       int exit_status;
  {
!   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\
*************** strip_usage (stream, exit_status)
*** 429,436 ****
       FILE *stream;
       int exit_status;
  {
!   fprintf (stream, _("Usage: %s <switches> in-file(s)\n"), program_name);
!   fprintf (stream, _(" The switches 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,436 ----
       FILE *stream;
       int exit_status;
  {
!   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\
Index: binutils/doc/binutils.texi
===================================================================
RCS file: /cvs/src/src/binutils/doc/binutils.texi,v
retrieving revision 1.13
diff -p -r1.13 binutils.texi
*** binutils.texi       2001/12/20 11:20:17     1.13
--- binutils.texi       2002/01/15 17:07:31
*************** when @option{--export-all-symbols} is us
*** 2732,2745 ****
  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
  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
  double quotes.
  
  @item -D @var{name}
--- 2732,2745 ----
  Specifies the path, including the filename, of the assembler to be used
  to create the exports file.
  
! @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 options to the assembler they should be enclosed in
  double quotes.
  
  @item -D @var{name}