Merge commit '8206fbf', due to my screwup of committing it on a detached

[nmh] / man / mh-folders.man

diff --git a/man/mh-folders.man b/man/mh-folders.man
index e6b1d442b3804a9e46e197f45292c76e238bc1a4..0fbdddd067ab471088483ed46211750f0658b958 100644 (file)
--- a/man/mh-folders.man
+++ b/man/mh-folders.man
@@ -1,4 +1,4 @@
-.TH MH-MAIL %manext5% "March 7, 2013" "%nmhversion%"
+.TH MH-FOLDERS %manext5% "July 22, 2014" "%nmhversion%"
 .\"
 .\" %nmhwarning%
 .\"
@@ -99,7 +99,7 @@ numbers in each sequence.  The
 sequence has at most just a single message number, not a range.
 .PP
 Sequence names have a maximum size of 998 characters.  Each line is also
-limited to a maximum of 998 characters, but RFC\-822 continuation rules
+limited to a maximum of 998 characters, but RFC 822 continuation rules
 apply; sequences can be continued across multiple lines by prefixing
 continuation lines with a whitespace character.
 .PP
@@ -128,10 +128,26 @@ outside of
 that accesses these files must be sure to lock them using the same
 locking method as
 .BR nmh .
-The locking method is selected when
+The default data locking method is selected when
 .B nmh
 is configured and can be accessed as a string using
-.BR "mhparam lockmethod" .
+.BR "mhparam datalocking" .
+By default, fcntl locking is used, but this may be overridden with
+the
+.B datalocking
+profile entry.
+.PP
+A second, possibly different, locking method is used by
+.BR inc (1)
+when accessing the user's mail spool file or by
+.B nmh
+programs that open any mbox file.  This locking method can be overridden
+when
+.B nmh
+is configured, or in the
+.B nmh
+mts configuration file, and can be accessed as a string using
+.BR "mhparam spoollocking" .
 By default, kernel-level locking is used if appropriate for the
 platform, and it is for popular platforms.  That default should also
 be the same as used by the
@@ -151,9 +167,10 @@ program, if provided on the platform.
 .IR folder (1),
 .IR mail (1),
 .IR mark (1),
-.IR mh\-param (1),
-.IR mh\-path (1),
+.IR mhparam (1),
+.IR mhpath (1),
 .IR mh\-profile (5),
 .IR mh\-sequence (5),
+.IR mh\-tailor (5),
 .IR pick (1),
 .IR rcvstore (1)