lkopen_dot() would block forever if another process held a lock

[nmh] / man / mh-folders.man

diff --git a/man/mh-folders.man b/man/mh-folders.man
index cc6b3462279cdf96d5f0ea9772088ad626c9e632..52cde2777e794f090956804d46e19d6e0df62059 100644 (file)
--- a/man/mh-folders.man
+++ b/man/mh-folders.man
@@ -1,4 +1,4 @@
-.TH MH-FOLDERS %manext5% "February 23, 2014" "%nmhversion%"
+.TH MH-FOLDERS %manext5% "February 26, 2014" "%nmhversion%"
 .\"
 .\" %nmhwarning%
 .\"
@@ -128,10 +128,24 @@ 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 is selected
+when
+.B nmh
+is configured 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