Changed --8-bit to --8-bit-output.

diff --git a/NEWS b/NEWS
index 0e022ab6e853b622d680150d8b3597ac16cc71e1..c6f2eb01e4bb2aabd03d6abee4f36378f1f103f1 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -17,7 +17,7 @@ Changes since 2.6.6:
       (e.g. it used to output "foo\\bar" when copying "foo\bar") -- now it only
       escapes a backslash that is followed by a hash-sign and 3 digits (0-9)
       (e.g. it will output "foo\#134#789" when copying "foo\#789").  See also
-      the --8-bit (-8) option, mentioned below.
+      the --8-bit-output (-8) option, mentioned below.
 
       Script writers: the local rsync is the one that outputs escaped names,
       so if you need to support unescaping of filenames for older rsyncs, I'd
@@ -105,8 +105,8 @@ Changes since 2.6.6:
       allow easy entry of multiples of 1000 (instead of just multiples of 1024)
       and off-by-one values too (e.g. --max-size=8mb-1).
 
-    - Added the --8-bit (-8) option, which tells rsync to avoid escaping high-
-      bit characters that it thinks are unreadable in the current locale.
+    - Added the --8-bit-output (-8) option, which tells rsync to avoid escaping
+      high-bit characters that it thinks are unreadable in the current locale.
 
     - The new options --human-readable (-h) and --si change the output of the
       --stats and the end-of-run summary to be easier to read.

diff --git a/options.c b/options.c
index 55395cb581a4737d9e8a7822af8f2a140c2a367f..30af80df0770ec2d3a8777a3c2028673e1c4089a 100644 (file)
--- a/options.c
+++ b/options.c
@@ -355,7 +355,7 @@ void usage(enum logcode F)
   rprintf(F,"     --sockopts=OPTIONS      specify custom TCP options\n");
   rprintf(F,"     --blocking-io           use blocking I/O for the remote shell\n");
   rprintf(F,"     --stats                 give some file-transfer stats\n");
-  rprintf(F," -8, --8-bit                 leave high-bit chars unescaped in output\n");
+  rprintf(F," -8, --8-bit-output          leave high-bit chars unescaped in output\n");
   rprintf(F," -h, --human-readable        output numbers in a human-readable format\n");
   rprintf(F,"     --si                    like human-readable, but use powers of 1000\n");
   rprintf(F,"     --progress              show progress during transfer\n");
@@ -512,7 +512,7 @@ static struct poptOption long_options[] = {
   {"ipv4",            '4', POPT_ARG_VAL,    &default_af_hint, AF_INET, 0, 0 },
   {"ipv6",            '6', POPT_ARG_VAL,    &default_af_hint, AF_INET6, 0, 0 },
 #endif
-  {"8-bit",           '8', POPT_ARG_NONE,   &allow_8bit_chars, 0, 0, 0 },
+  {"8-bit-output",    '8', POPT_ARG_NONE,   &allow_8bit_chars, 0, 0, 0 },
   {"address",          0,  POPT_ARG_STRING, &bind_address, 0, 0, 0 },
   {"port",             0,  POPT_ARG_INT,    &rsync_port, 0, 0, 0 },
   {"sockopts",         0,  POPT_ARG_STRING, &sockopts, 0, 0, 0 },

diff --git a/rsync.yo b/rsync.yo
index af56596ec78b9c02499eca3863e556e891e97116..3cc6869d410bf827c4dbd3fa1f7a3dca932fc097 100644 (file)
--- a/rsync.yo
+++ b/rsync.yo
@@ -378,7 +378,7 @@ to the detailed description below for a complete description.  verb(
      --sockopts=OPTIONS      specify custom TCP options
      --blocking-io           use blocking I/O for the remote shell
      --stats                 give some file-transfer stats
- -8, --8-bit                 leave high-bit chars unescaped in output
+ -8, --8-bit-output          leave high-bit chars unescaped in output
  -h, --human-readable        output numbers in a human-readable format
      --si                    like human-readable, but use powers of 1000
      --progress              show progress during transfer
@@ -1395,7 +1395,7 @@ dit(bf(--stats)) This tells rsync to print a verbose set of statistics
 on the file transfer, allowing you to tell how effective the rsync
 algorithm is for your data.
 
-dit(bf(-8, --8-bit)) This tells rsync to leave all high-bit characters
+dit(bf(-8, --8-bit-output)) This tells rsync to leave all high-bit characters
 unescaped in the output instead of trying to test them to see if they're
 valid in the current locale and escaping the invalid ones.  All control
 characters (but never tabs) are always escaped, regardless of this option's