Release 2.1.4.

[u/mdw/catacomb] / pixie.1

diff --git a/pixie.1 b/pixie.1
index bdffd05..ced4b48 100644 (file)
--- a/pixie.1
+++ b/pixie.1
@@ -78,7 +78,7 @@ Print the result on standard output, followed by a newline.
 .TP
 .B "\-PP, \-\-verify-passphrase"
 Connect to a running pixie and request verification of the passphrase
 .TP
 .B "\-PP, \-\-verify-passphrase"
 Connect to a running pixie and request verification of the passphrase

-with tag 
+with tag

 .IR tag .
 If no pixie is running, request the passphrase from the terminal.  Print
 the result on standard output, followed by a newline.
 .IR tag .
 If no pixie is running, request the passphrase from the terminal.  Print
 the result on standard output, followed by a newline.


@@ -125,10 +125,13 @@ Send log messages to the syslog rather than stderr.
 .\"
 .SS "Memory management"
 During initialization, the pixie attempts to allocate a block of memory
 .\"
 .SS "Memory management"
 During initialization, the pixie attempts to allocate a block of memory

-from the kernel and protect it against being swapped to disk.  On most
-systems, this requires that the pixie start with root privileges,
-although it will drop them as soon as it can (before parsing
-command-line options).
+from the kernel and protect it against being swapped to disk.  On Linux
+and other systems with
+.B RLIMIT_MEMLOCK
+or similar, this should just work assuming that the limit is set
+sensibly.  On other systems, this requires that the pixie start with
+root privileges, although it will drop them as soon as it can (before
+parsing command-line options, for example).

 .PP
 The locked memory is used for all of the passphrases which the pixie
 stores, and for the buffers used to hold requests from clients.
 .PP
 The locked memory is used for all of the passphrases which the pixie
 stores, and for the buffers used to hold requests from clients.


@@ -327,4 +330,4 @@ noted in the
 .B auto-pgp
 documentation.
 .SH "AUTHOR"
 .B auto-pgp
 documentation.
 .SH "AUTHOR"

-Mark Wooding, <mdw@nsict.org>
+Mark Wooding, <mdw@distorted.org.uk>