X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/44d98d6166ee27290dc4b9fd3c355d4176aa2979..4ccfd96cfee813f3855be5a902acc3d5cd0545a4:/rsync.yo

diff --git a/rsync.yo b/rsync.yo
index 4f7b1b9f..fc33aca0 100644
--- a/rsync.yo
+++ b/rsync.yo
@@ -290,8 +290,8 @@ quote(      get:nl()
       sync: get put)
 
 this allows me to sync with a CVS directory at the other end of the
-connection. I then do cvs operations on the remote machine, which saves a
-lot of time as the remote cvs protocol isn't very efficient.
+connection. I then do CVS operations on the remote machine, which saves a
+lot of time as the remote CVS protocol isn't very efficient.
 
 I mirror a directory between my "old" and "new" ftp sites with the
 command
@@ -404,6 +404,7 @@ verb(
      --config=FILE           specify alternate rsyncd.conf file
      --no-detach             do not detach from the parent
      --port=PORT             listen on alternate port number
+ -v, --verbose               increase verbosity
  -4  --ipv4                  prefer IPv4
  -6  --ipv6                  prefer IPv6
  -h, --help                  show this help screen
@@ -721,7 +722,7 @@ specified).
 
 dit(bf(--delete-during, --del)) Request that the file-deletions on the
 receiving side be done incrementally as the transfer happens.  This is
-a faster method than chosing the before- or after-transfer algorithm,
+a faster method than choosing the before- or after-transfer algorithm,
 but it is only supported beginning with rsync version 2.6.4.
 See --delete (which is implied) for more details on file-deletion.
 
@@ -1196,6 +1197,11 @@ dit(bf(--port=PORT)) This specifies an alternate TCP port number for the
 daemon to listen on rather than the default of 873.  See also the "port"
 global option in the rsyncd.conf manpage.
 
+dit(bf(-v, --verbose)) This option increases the amount of information the
+daemon logs during its startup phase.  After the client connects, the
+daemon's verbosity level will be controlled by the options that the client
+used and the "max verbosity" setting in the module's config section.
+
 dit(bf(-4, --ipv4) or bf(-6, --ipv6)) Tells rsync to prefer IPv4/IPv6
 when creating the incoming sockets that the rsync daemon will use to
 listen for connections.  One of these options may be required in older
@@ -1232,9 +1238,8 @@ itemize(
 )
 
 The 'x' is a single-letter that specifies the kind of rule to create.  It
-can have trailing modifiers, and is separated from the RULE by one of the
-following characters: a single space, an equal-sign (=), or an underscore
-(_).  Here are the available rule prefixes:
+can have trailing modifiers, and is separated from the RULE by either a
+single space or an underscore (_).  Here are the available rule prefixes:
 
 verb(
   -  specifies an exclude pattern.
@@ -1263,7 +1268,7 @@ comment lines that start with a "#".
 
 manpagesection(INCLUDE/EXCLUDE PATTERN RULES)
 
-You can include and exclude files by specifing patterns using the "+" and
+You can include and exclude files by specifying patterns using the "+" and
 "-" filter rules (as introduced in the FILTER RULES section above).  These
 rules specify a pattern that is matched against the names of the files
 that are going to be transferred.  These patterns can take several forms:
@@ -1302,7 +1307,7 @@ itemize(
   directories. If the pattern doesn't contain a / or a "**", then it is
   matched only against the final component of the filename.
   (Remember that the algorithm is applied recursively so "full filename"
-  can actually be any portion of a path fomr the starting directory on
+  can actually be any portion of a path from the starting directory on
   down.)
 
 )
@@ -1384,7 +1389,7 @@ verb(
     :n- .non-inherited-per-dir-excludes
 )
 
-The following modifiers are accepted after the "." or ":":
+The following modifiers are accepted after a "." or ":":
 
 itemize(
   it() A "-" specifies that the file should consist of only exclude
@@ -1411,6 +1416,15 @@ itemize(
   specified to turn off the parsing of prefixes).
 )
 
+The following modifier is accepted after a "+" or "-":
+
+itemize(
+  it() A "/" specifies that the include/exclude should be treated as an
+  absolute path, relative to the root of the filesystem.  For example,
+  "-/ /etc/passwd" would exclude the passwd file any time the transfer
+  was sending files from the "/etc" directory.
+)
+
 Per-directory rules are inherited in all subdirectories of the directory
 where the merge-file was found unless the 'n' modifier was used.  Each
 subdirectory's rules are prefixed to the inherited per-directory rules
@@ -1463,7 +1477,7 @@ Some examples of this pre-scanning for per-directory files:
 verb(
   rsync -avF /src/path/ /dest/dir
   rsync -av --filter=': ../../.rsync-filter' /src/path/ /dest/dir
-  rsync -av --fitler=': .rsync-filter' /src/path/ /dest/dir
+  rsync -av --filter=': .rsync-filter' /src/path/ /dest/dir
 )
 
 The first two commands above will look for ".rsync-filter" in "/" and
@@ -1479,7 +1493,7 @@ interpreted according to the same parsing rules that CVS uses.  You can
 use this to affect where the --cvs-exclude (-C) option's inclusion of the
 per-directory .cvsignore file gets placed into your rules by putting a
 ":C" wherever you like in your filter rules.  Without this, rsync would
-add the per-dir rule for the .cvignore file at the end of all your other
+add the per-dir rule for the .cvsignore file at the end of all your other
 rules (giving it a lower priority than your command-line rules).  For
 example: