Document that while the --backup option takes an

optional argument, the -b option accepts none.
(main): Use `backup type' in call to xget_version, not the
now-deprecated `--version-control'.

3 files changed, 10 insertions, 7 deletions

diff --git a/src/cp.c b/src/cp.c
index 556d6e6c1..4c214b5c0 100644
--- a/src/cp.c
+++ b/src/cp.c
@@ -1,5 +1,5 @@
 /* cp.c  -- file copying (main routines)
-   Copyright (C) 89, 90, 91, 1995-1999 Free Software Foundation.
+   Copyright (C) 89, 90, 91, 1995-2000 Free Software Foundation.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -137,7 +137,8 @@ Usage: %s [OPTION]... SOURCE DEST\n\
 Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n\
 \n\
   -a, --archive                same as -dpR\n\
-  -b, --backup[=CONTROL]       make a backup of each existing destination file\n\
+      --backup[=CONTROL]       make a backup of each existing destination file\n\
+  -b                           like --backup but does not accept an argument\n\
   -d, --no-dereference         preserve links\n\
   -f, --force                  remove existing destinations, never prompt\n\
   -i, --interactive            prompt before overwrite\n\
@@ -793,7 +794,7 @@ main (int argc, char **argv)
     simple_backup_suffix = xstrdup (backup_suffix_string);
 
   x.backup_type = (make_backups
-		   ? xget_version (_("--version-control"),
+		   ? xget_version (_("backup type"),
 				   version_control_string)
 		   : none);
 
diff --git a/src/ln.c b/src/ln.c
index 005c949c6..741fe277f 100644
--- a/src/ln.c
+++ b/src/ln.c
@@ -345,7 +345,8 @@ than one TARGET, the last argument must be a directory;  create links\n\
 in DIRECTORY to each TARGET.  Create hard links by default, symbolic\n\
 links with --symbolic.  When creating hard links, each TARGET must exist.\n\
 \n\
-  -b, --backup[=CONTROL]      make a backup of each existing destination file\n\
+      --backup[=CONTROL]      make a backup of each existing destination file\n\
+  -b                          like --backup but does not accept an argument\n\
   -d, -F, --directory         hard link directories (super-user only)\n\
   -f, --force                 remove existing destination files\n\
   -n, --no-dereference        treat destination that is a symlink to a\n\
@@ -515,7 +516,7 @@ main (int argc, char **argv)
     }
 
   backup_type = (make_backups
-		 ? xget_version (_("--version-control"), version_control_string)
+		 ? xget_version (_("backup type"), version_control_string)
 		 : none);
 
   if (target_directory_specified || n_files > 2)
diff --git a/src/mv.c b/src/mv.c
index 71b4de856..7816f8c6c 100644
--- a/src/mv.c
+++ b/src/mv.c
@@ -353,7 +353,8 @@ Usage: %s [OPTION]... SOURCE DEST\n\
       printf (_("\
 Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n\
 \n\
-  -b, --backup[=CONTROL]       make backup before removal\n\
+      --backup[=CONTROL]       make a backup of each existing destination file\n\
+  -b                           like --backup but does not accept an argument\n\
   -f, --force                  remove existing destinations, never prompt\n\
   -i, --interactive            prompt before overwrite\n\
       --strip-trailing-slashes  remove any trailing slashes from each SOURCE\n\
@@ -506,7 +507,7 @@ main (int argc, char **argv)
     simple_backup_suffix = xstrdup (backup_suffix_string);
 
   x.backup_type = (make_backups
-		   ? xget_version (_("--version-control"),
+		   ? xget_version (_("backup type"),
 				   version_control_string)
 		   : none);