diff --git a/doc/html/quickstart_admin.html b/doc/html/quickstart_admin.html
index 62f224a67f79c163e43c8cf4de269bb230818e1c..b3e5bd9dc42fa287020cac967abdf506dbc71409 100644
--- a/doc/html/quickstart_admin.html
+++ b/doc/html/quickstart_admin.html
@@ -74,7 +74,10 @@ per the SLURM configuration.</p>
 <h3>Infrastructure</h3>
 <p>All communications between SLURM components are authenticated. The authentication 
 infrastructure used is specified in the SLURM configuration file and options include: 
-<a href="http://www.theether.org/authd/">authd</a>, munged and none.</p>
+<a href="http://www.theether.org/authd/">authd</a>, munged and none.
+The default authentication infrastructure is "none". This permits any user to execute 
+any job as another user. This may be fine for testing purposes, but certainly not for production 
+use. <b>Configure some AuthType value other than "none" if you want any security.</b></p>
 <p>Quadrics MPI works directly with SLURM on systems having Quadrics interconnects. 
 For non-Quadrics interconnect systems, <a href="http://www.lam-mpi.org/">LAM/MPI</a> 
 is the preferred MPI infrastructure. LAM/MPI uses the command <i>lamboot</i> to 
@@ -338,7 +341,7 @@ adev0: scontrol shutdown
 <td colspan="3"><hr> <p>For information about this page, contact <a href="mailto:slurm-dev@lists.llnl.gov">slurm-dev@lists.llnl.gov</a>.</p>
 <p><a href="http://www.llnl.gov/"><img align=middle src="lll.gif" width="32" height="32" border="0"></a></p>
 <p class="footer">UCRL-WEB-201790<br>
-Last modified January 15, 2004</p></td>
+Last modified February 12, 2004</p></td>
 </tr>
 </table>
 </td>
diff --git a/doc/man/man5/slurm.conf.5 b/doc/man/man5/slurm.conf.5
index 32bda044d9c3e7b712b8b87f9225de3aae8cec11..9c6b21297ff461b276fb2b711c3a52c9247bb608 100644
--- a/doc/man/man5/slurm.conf.5
+++ b/doc/man/man5/slurm.conf.5
@@ -1,4 +1,4 @@
-.TH "slurm.conf" "5" "January 2004" "Morris Jette" "Slurm configuration file"
+.TH "slurm.conf" "5" "February 2004" "Morris Jette" "Slurm configuration file"
 .SH "NAME"
 slurm.conf \- Slurm configuration file 
 .SH "DESCRIPTION"
@@ -22,6 +22,8 @@ components.
 Acceptable values at present include "auth/none" and "auth/authd".
 The default value is "auth/none", which means the UID included in 
 communication messages is not verified. 
+This may be fine for testing purposes, but 
+\fBdo not use "auth/none" if you desire any security\fR.
 "auth/authd" indicates that Brett Chun's authd is to be used (see
 "http://www.theether.org/authd/" for more information).
 All SLURM daemons and commands must be restarted for a change in 
diff --git a/etc/slurm.conf.example b/etc/slurm.conf.example
index fb4916fb562020e4173d8577d5132dcad107e44c..982c78b379e403836853f58ff15d15de612bc412 100644
--- a/etc/slurm.conf.example
+++ b/etc/slurm.conf.example
@@ -131,8 +131,12 @@
 # o Define the authentication method for communicating between SLURM
 #   components
 #
-# "auth/none"  : no authentication, the default
-# "auth/authd" : Brent Chun's authd
+# "auth/none"   : no authentication, the default
+# "auth/authd"  : Brent Chun's authd
+# "auth/munge": LLNL's munge
+#
+# WARNING: The use of "auth/none" permits any user to execute jobs as any 
+# other user. This may be fine for testing purposes, but do not use it in production.
 #
 # AuthType=auth/none