4 files changed, 4 insertions, 16 deletions
diff --git a/src/mailman/config/__init__.py b/src/mailman/config/__init__.py
index 391dcf453..b13d475ee 100644
--- a/src/mailman/config/__init__.py
+++ b/src/mailman/config/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2011 by the Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 by the Free Software Foundation, Inc.
 #
 # This file is part of GNU Mailman.
 #
diff --git a/src/mailman/config/config.py b/src/mailman/config/config.py
index 7d54643c7..89d9e39ad 100644
--- a/src/mailman/config/config.py
+++ b/src/mailman/config/config.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2011 by the Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 by the Free Software Foundation, Inc.
 #
 # This file is part of GNU Mailman.
 #
diff --git a/src/mailman/config/mailman.cfg b/src/mailman/config/mailman.cfg
index 8f64365e8..22c3a129b 100644
--- a/src/mailman/config/mailman.cfg
+++ b/src/mailman/config/mailman.cfg
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2011 by the Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 by the Free Software Foundation, Inc.
 #
 # This file is part of GNU Mailman.
 #
diff --git a/src/mailman/config/schema.cfg b/src/mailman/config/schema.cfg
index 8f0c863fc..c94a3828b 100644
--- a/src/mailman/config/schema.cfg
+++ b/src/mailman/config/schema.cfg
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2011 by the Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 by the Free Software Foundation, Inc.
 #
 # This file is part of GNU Mailman.
 #
@@ -149,18 +149,6 @@ password_scheme: ssha
 # When Mailman generates them, this is the default length of passwords.
 password_length: 8
 
-# Specify the type of passwords to use, when Mailman generates the passwords
-# itself, as would be the case for membership requests where the user did not
-# fill in a password, or during list creation, when auto-generation of admin
-# passwords was selected.
-#
-# Set this value to 'yes' for classic Mailman user-friendly(er) passwords.
-# These generate semi-pronounceable passwords which are easier to remember.
-# Set this value to 'no' to use more cryptographically secure, but harder to
-# remember, passwords -- if your operating system and Python version support
-# the necessary feature (specifically that /dev/urandom be available).
-user_friendly_passwords: yes
-
 
 [runner.master]
 # Define which runners, and how many of them, to start.