[SCM] The rsync repository. - branch master updated
Rsync CVS commit messages
rsync-cvs at lists.samba.org
Mon Jun 20 00:38:24 UTC 2022
The branch, master has been updated
via d1e42ffa A few minor fixes.
via 36f489c2 Link to rsyncd.conf page server-setup details.
from defe2287 Improve the filter intro.
https://git.samba.org/?p=rsync.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit d1e42ffa1680b65bc878ab5a6cbfd12bf6345b9b
Author: Wayne Davison <wayne at opencoder.net>
Date: Sun Jun 19 17:21:03 2022 -0700
A few minor fixes.
commit 36f489c2117217a277e3307565699289929b9121
Author: Wayne Davison <wayne at opencoder.net>
Date: Sun Jun 19 16:55:18 2022 -0700
Link to rsyncd.conf page server-setup details.
-----------------------------------------------------------------------
Summary of changes:
rsync-ssl.1.md | 5 +++++
rsync.1.md | 10 +++++-----
2 files changed, 10 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/rsync-ssl.1.md b/rsync-ssl.1.md
index f3f93718..a6f1e3d3 100644
--- a/rsync-ssl.1.md
+++ b/rsync-ssl.1.md
@@ -94,6 +94,11 @@ The ssl helper scripts are affected by the following environment variables:
> rsync-ssl -aiv rsync://example.com:9874/mod/ dest
+## THE SERVER SIDE
+
+For help setting up an SSL/TLS supporting rsync, see the [instructions in
+rsyncd.conf](rsyncd.conf.5#SSL_TLS_Daemon_Setup).
+
## SEE ALSO
[**rsync**(1)](rsync.1), [**rsyncd.conf**(5)](rsyncd.conf.5)
diff --git a/rsync.1.md b/rsync.1.md
index 9c149b31..1ab014f1 100644
--- a/rsync.1.md
+++ b/rsync.1.md
@@ -3822,7 +3822,7 @@ existing on the remote host:
Aside: this copy could also have been accomplished using the [`-R`](#opt)
option (though the 2 commands behave differently if deletions are enabled):
-> rsync -aR x/y/file.txt host:/tmp/
+> rsync -aiR x/y/file.txt host:/tmp/
The following command does not need an include of the "x" directory because it
is not a part of the transfer (note the traililng slash). Running this command
@@ -3833,7 +3833,7 @@ would copy just "`/tmp/x/file.txt`" because the "y" and "z" dirs get excluded:
This command would omit the zzz.txt file while copying "x" and everything else
it contains:
-> rsync -aiv -f'- zzz.txt' x host:/tmp/
+> rsync -ai -f'- zzz.txt' x host:/tmp/
### FILTER RULES WHEN DELETING
@@ -3872,8 +3872,8 @@ Rsync supports old-style include/exclude rules and new-style filter rules. The
older rules are specified using [`--include`](#opt) and [`--exclude`](#opt) as
well as the [`--include-from`](#opt) and [`--exclude-from`](#opt). These are
limited in behavior but they don't require a "-" or "+" prefix. An old-style
-exclude rule is turned into a `+ name` filter rule (with no modifiers) and an
-old-style include rule is turned into a `- name` filter rule (with no
+exclude rule is turned into a "`- name`" filter rule (with no modifiers) and an
+old-style include rule is turned into a "`+ name`" filter rule (with no
modifiers).
Rsync builds an ordered list of filter rules as specified on the command-line
@@ -3905,7 +3905,7 @@ Here are the available rule prefixes:
Equivalent to a receiver-only exclude, so `-f'P foo'` could also be
specified as `-f'-r foo'`.
0. `risk, 'R'` files that match the pattern are not protected. Equivalent to a
- receiver-only include, so `-f'P foo'` could also be specified as `-f'+r
+ receiver-only include, so `-f'R foo'` could also be specified as `-f'+r
foo'`.
0. `clear, '!'` clears the current include/exclude list (takes no arg)
--
The rsync repository.
More information about the rsync-cvs
mailing list