(Network Security): Mention more NSM variables.

2 files changed, 19 insertions, 0 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 3df6bfce1ea..57c5c65a96a 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -2,6 +2,7 @@
 
         * processes.texi (Network Security): Made into its own section and
         fleshed out.
+        (Network Security): Mention more NSM variables.
 
 2014-11-23  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi
index fcf5e8dc84a..c93288f2028 100644
--- a/doc/lispref/processes.texi
+++ b/doc/lispref/processes.texi
@@ -2157,6 +2157,24 @@ also be notified the first time the @acronym{NSM} sees any new
 certificate.  This will allow you to inspect all the certificates from
 all the connections that Emacs makes.
 
+The following additional variables can be used to control
+@acronym{NSM} details.
+
+@table @code
+@item nsm-settings-file
+@vindex nsm-settings-file
+The @acronym{NSM} stores details on the connections in this file.  It
+defaults to @file{~/.emacs.d/network-security.data}.
+
+@item nsm-save-host-names
+@vindex nsm-save-host-names
+By default, host names will not be saved per non-@code{STARTTLS}
+connection.  Instead a host/port hash is used to identify connections.
+This means that one can't casually read the settings file to see what
+servers the user has connected to.  If this variable is @code{t}, host
+names will be saved in the file, too.
+@end table
+
 
 @node Network Servers
 @section Network Servers