Index: subversion/libsvn_subr/config_file.c
===================================================================
--- subversion/libsvn_subr/config_file.c	(revision 27105)
+++ subversion/libsvn_subr/config_file.c	(working copy)
@@ -898,12 +898,15 @@
         ""                                                                   NL
         "### Section for authentication and authorization customizations."   NL
         "[auth]"                                                             NL
-        "### Set store-passwords to 'no' to avoid storing passwords in the"  NL
-        "### auth/ area of your config directory.  It defaults to 'yes'."    NL
-        "### Note that this option only prevents saving of *new* passwords;" NL
-        "### it doesn't invalidate existing passwords.  (To do that, remove" NL
-        "### the cache files by hand as described in the Subversion book.)"  NL
-        "# store-passwords = no"                                             NL
+        "### Set store-passwords to 'yes' to allow passwords to be stored"   NL
+        "### in the auth/ area of your config directory.  Since passwords"   NL
+        "### are stored in plain text, enabling this option presents a"      NL
+        "### certain security risk.  This option defaults to 'no'."          NL
+        "### Note that this option only affects the saving of *new*"         NL
+        "### passwords; it doesn't invalidate existing passwords.  (To do"   NL
+        "### that, remove the cache files by hand as described in the"       NL
+        "### Subversion book.)"                                              NL
+        "# store-passwords = yes"                                            NL
         "### Set store-auth-creds to 'no' to avoid storing any subversion"   NL
         "### credentials in the auth/ area of your config directory."        NL
         "### It defaults to 'yes'.  Note that this option only prevents"     NL
Index: subversion/libsvn_subr/cmdline.c
===================================================================
--- subversion/libsvn_subr/cmdline.c	(revision 27105)
+++ subversion/libsvn_subr/cmdline.c	(working copy)
@@ -459,7 +459,7 @@
   SVN_ERR(svn_config_get_bool(cfg, &store_password_val,
                               SVN_CONFIG_SECTION_AUTH,
                               SVN_CONFIG_OPTION_STORE_PASSWORDS,
-                              TRUE));
+                              FALSE));
 
   if (! store_password_val)
     svn_auth_set_parameter(*ab, SVN_AUTH_PARAM_DONT_STORE_PASSWORDS, "");