[SCM] The rsync repository. - branch master updated
Rsync CVS commit messages
rsync-cvs at lists.samba.org
Tue Jun 16 14:51:02 UTC 2020
The branch, master has been updated
via 6efaa74d More spelling fixes from Fossies
from 5496eda5 Turn help-from-md into an awk script.
https://git.samba.org/?p=rsync.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 6efaa74dd3c87850ba9573ec841873d40dd5ea52
Author: Wayne Davison <wayne at opencoder.net>
Date: Tue Jun 16 07:46:25 2020 -0700
More spelling fixes from Fossies
https://fossies.org/linux/test/rsync-master.tar.gz/codespell.html
-----------------------------------------------------------------------
Summary of changes:
NEWS.md | 2 +-
batch.c | 2 +-
compat.c | 2 +-
configure.ac | 2 +-
rsync.1.md | 14 +++++++-------
5 files changed, 11 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/NEWS.md b/NEWS.md
index efccab91..b55519d3 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -149,7 +149,7 @@ Protocol: 31 (unchanged)
- Add installed man page: /usr/man/man1/rsync-ssl.1
- - Tweak auxilliary doc file names, such as: README.md, INSTALL.md, NEWS.md, &
+ - Tweak auxiliary doc file names, such as: README.md, INSTALL.md, NEWS.md, &
OLDNEWS.md.
- The rsync-ssl script wants to run openssl or stunnel4, so consider adding a
diff --git a/batch.c b/batch.c
index 83bc8341..805acc6f 100644
--- a/batch.c
+++ b/batch.c
@@ -271,7 +271,7 @@ void write_batch_shell_file(void)
/* We need to make sure that any protocol-based or negotiated choices get accurately
* reflected in the options we save AND that we avoid any need for --read-batch to
- * do a string-based negotation (since we don't write them into the file). */
+ * do a string-based negotiation (since we don't write them into the file). */
if (do_compression)
err |= write_opt("--compress-choice", compress_choice);
if (strchr(checksum_choice, ',') || xfersum_type != parse_csum_name(NULL, -1))
diff --git a/compat.c b/compat.c
index 855eae98..9ec39ea0 100644
--- a/compat.c
+++ b/compat.c
@@ -394,7 +394,7 @@ static void send_negotiate_str(int f_out, struct name_num_obj *nno, const char *
if (!do_negotiated_strings) {
if (!am_server && fail_if_empty) {
- rprintf(FERROR, "Remote rsync is too old for %s negotation\n", nno->type);
+ rprintf(FERROR, "Remote rsync is too old for %s negotiation\n", nno->type);
exit_cleanup(RERR_UNSUPPORTED);
}
return;
diff --git a/configure.ac b/configure.ac
index 54ff2c46..bd43c3f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -763,7 +763,7 @@ AC_ARG_ENABLE(iconv,
AS_HELP_STRING([--disable-iconv],[disable rsync's --iconv option]),
[], [enable_iconv=$enable_iconv_open])
AH_TEMPLATE([ICONV_OPTION],
-[Define if you want the --iconv option. Specifing a value will set the
+[Define if you want the --iconv option. Specifying a value will set the
default iconv setting (a NULL means no --iconv processing by default).])
if test x"$enable_iconv" != x"no"; then
if test x"$enable_iconv" = x"yes"; then
diff --git a/rsync.1.md b/rsync.1.md
index 7257a7dc..01277e4d 100644
--- a/rsync.1.md
+++ b/rsync.1.md
@@ -595,9 +595,9 @@ your home directory (remove the '=' for that).
but it can delay messages behind a slew of data.
One case where this is helpful is when sending really large files, since
- errors that happen on a remote receiver tend to get delayed until afer the
- file's data is fully sent. It is also helpful for debugging, since it helps
- to avoid overpopulating the protocol data with extra message data.
+ errors that happen on a remote receiver tend to get delayed until after the
+ file's data is fully sent. It is also helpful for debugging, since it
+ helps to avoid overpopulating the protocol data with extra message data.
The option does not affect the remote side of a transfer without using
`--remote-option` -- e.g. `-M--msgs2stderr` or `{-M,}--msgs2stderr`.
@@ -1482,13 +1482,13 @@ your home directory (remove the '=' for that).
the `--checksum` option cannot be used.
The "auto" option is the default, where rsync bases its algorithm choice on
- a negotation between the client and the server as follows:
+ a negotiation between the client and the server as follows:
If both the client and the server are at least version 3.2.0, they will
exchange a list of checksum names and choose the first one in the list that
they have in common. This typically means that they will choose xxh64 if
they both support it and fall back to MD5. If one side of the transfer is
- not new enough to support this checksum negotation, then a value is chosen
+ not new enough to support this checksum negotiation, then a value is chosen
based on the protocol version (which chooses between MD5 and various
flavors of MD4 based on protocol age).
@@ -2294,7 +2294,7 @@ your home directory (remove the '=' for that).
This option implies `--compress` unless "none" was specified.
- You can also override the compression negotation using the
+ You can also override the compression negotiation using the
RSYNC_COMPRESS_LIST environment variable by setting it to a space-separated
list of compression names that you consider acceptable. If no common
compress choice is found, the client exits with an error. It ignores
@@ -3070,7 +3070,7 @@ your home directory (remove the '=' for that).
Tells rsync to prefer IPv4/IPv6 when creating sockets or running ssh. This
affects sockets that rsync has direct control over, such as the outgoing
- socket when directly contacting an rsync daemon, as well as the forwaring
+ socket when directly contacting an rsync daemon, as well as the forwarding
of the `-4` or `-6` option to ssh when rsync can deduce that ssh is being
used as the remote shell. For other remote shells you'll need to specify
the "`--rsh SHELL -4`" option directly (or whatever ipv4/ipv6 hint options
--
The rsync repository.
More information about the rsync-cvs
mailing list