Don't auto-foward debug options to the server side anymore.

diff --git a/options.c b/options.c
index ff8c390e4d0468f797213bb3510400f1aa3dab04..1a0d2c2244b9ec57bdc7cd030afd1db504e2d786 100644 (file)
--- a/options.c
+++ b/options.c
@@ -2908,10 +2908,6 @@ void server_options(char **args, int *argc_p)
        if (arg)
                args[ac++] = arg;
 
-       arg = make_output_option(debug_words, debug_levels, where);
-       if (arg)
-               args[ac++] = arg;
-
        if (append_mode) {
                if (append_mode > 1)
                        args[ac++] = "--append";

diff --git a/rsync.yo b/rsync.yo
index 0b6c8d650057feea3a8591332a3ff7376c3e80af..5f6152680a71e67acd889326a11421bbd44918a9 100644 (file)
--- a/rsync.yo
+++ b/rsync.yo
@@ -573,10 +573,14 @@ verb(    rsync -avvv --debug=none src/ dest/
 Note that some debug messages will only be output when bf(--msgs2stderr) is
 specified, especially those pertaining to I/O and buffer debugging.
 
-This option was added to 3.1.0, so an older rsync on the server side might
-reject your attempts at fine-grained control (if one or more flags needed
-to be send to the server and the server was too old to understand them).
-See also the "max verbosity" caveat above when dealing with a daemon.
+Beginning in 3.2.0, this option is no longer auto-forwared to the server side
+in order to allow you to specify different debug values for each side of the
+transfer, as well as to specify a new debug option that is only present in one
+of the rsync versions.  If you want to duplicate the same option on both sides,
+using brace expansion is an easy way to save you some typing. This works in
+zsh and bash:
+
+verb(    rsync -aiv {-M,}--debug=del2 src/ dest/ )
 
 dit(bf(--msgs2stderr)) This option changes rsync to send all its output
 directly to stderr rather than to send messages to the client side via the