--- a/MoinMoin/action/subscribe.py	Wed Mar 19 12:41:35 2008 +0100
+++ b/MoinMoin/action/subscribe.py	Wed Mar 19 12:45:14 2008 +0100
@@ -26,8 +26,8 @@
 
     # Suggest users without email to add their email address
     elif not request.user.email and not request.user.jid:
-        request.theme.add_msg(_("Add your email address or Jabber ID in your UserPreferences to use subscriptions.",
-                                wiki=True), "error")
+        request.theme.add_msg(_("Add your email address or Jabber ID in your user settings to use subscriptions."),
+                              "error")
 
     elif request.user.isSubscribedTo([pagename]):
         request.theme.add_msg(_('You are already subscribed to this page.'))

--- a/MoinMoin/action/unsubscribe.py	Wed Mar 19 12:41:35 2008 +0100
+++ b/MoinMoin/action/unsubscribe.py	Wed Mar 19 12:45:14 2008 +0100
@@ -19,8 +19,7 @@
             msg = _('Your subscription to this page has been removed.')
         else:
             msg = _("Can't remove regular expression subscription!") + u' ' + \
-                  _("Edit the subscription regular expressions in your "
-                    "UserPreferences.", wiki=True)
+                  _("Edit the subscription regular expressions in your settings.")
     else:
         # The user is not subscribed
         msg = _('You need to be subscribed to unsubscribe.')

--- a/MoinMoin/action/userprefs.py	Wed Mar 19 12:41:35 2008 +0100
+++ b/MoinMoin/action/userprefs.py	Wed Mar 19 12:45:14 2008 +0100
@@ -1,11 +1,9 @@
 # -*- coding: iso-8859-1 -*-
 """
-    MoinMoin - UserPreferences action
-
-    This is a simple plugin, that adds a "UserPreferences" action.
+    MoinMoin - user settings action
 
     @copyright: 2006 Radomir Dopieralski
-                2007 MoinMoin:JohannesBerg
+                2007, 2008 MoinMoin:JohannesBerg
     @license: GNU GPL, see COPYING for details.
 """
 

--- a/MoinMoin/auth/__init__.py	Wed Mar 19 12:41:35 2008 +0100
+++ b/MoinMoin/auth/__init__.py	Wed Mar 19 12:45:14 2008 +0100
@@ -115,7 +115,7 @@
     When creating a new MoinMoin.user.User object, you can give a keyword
     argument "auth_attribs" to User.__init__ containing a list of user
     attributes that are determined and fixed by this auth method and may
-    not be changed by the user in UserPreferences.
+    not be changed by the user in their preferences.
     You also have to give the keyword argument "auth_method" containing the
     name of the authentication method.
 

--- a/MoinMoin/i18n/dummy.py	Wed Mar 19 12:41:35 2008 +0100
+++ b/MoinMoin/i18n/dummy.py	Wed Mar 19 12:45:14 2008 +0100
@@ -16,7 +16,6 @@
 _('SiteNavigation')
 _('HelpContents')
 _('HelpOnFormatting')
-_('UserPreferences')
 _('SendMyPassword')
 _('WikiLicense')
 _('MissingPage')

--- a/MoinMoin/user.py	Wed Mar 19 12:41:35 2008 +0100
+++ b/MoinMoin/user.py	Wed Mar 19 12:45:14 2008 +0100
@@ -6,7 +6,7 @@
     some specific user). User instances are used to access the user profile of
     some specific user (name, password, email, bookmark, trail, settings, ...).
 
-    The UserPreferences form support stuff is in module userform.
+    Some related code is in the userform and userprefs modules.
 
     TODO:
     * code is a mixture of highlevel user stuff and lowlevel storage functions,
@@ -289,7 +289,7 @@
                               default: 'internal'
         @keyword auth_attribs: tuple of user object attribute names that are
                                determined by auth method and should not be
-                               changed by UserPreferences form, default: ().
+                               changeable by preferences, default: ().
                                First tuple element was used for authentication.
         """
         self._cfg = request.cfg
@@ -1044,9 +1044,9 @@
 
 Login Password: %s
 
-Login URL: %s/%s?action=login
+Login URL: %s/?action=login
 """) % (
-                        self.name, self.enc_password, self._request.getBaseURL(), getLocalizedPage(self._request, 'UserPreferences').page_name)
+                        self.name, self.enc_password, self._request.getBaseURL(), )
 
         text = _("""\
 Somebody has requested to submit your account data to this email address.

--- a/MoinMoin/userform/__init__.py	Wed Mar 19 12:41:35 2008 +0100
+++ b/MoinMoin/userform/__init__.py	Wed Mar 19 12:45:14 2008 +0100
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 """
-    MoinMoin - UserPreferences Form and User Browser
+    MoinMoin - Login form and user browser
 
     @copyright: 2001-2004 Juergen Hermann <jh@web.de>,
                 2003-2007 MoinMoin:ThomasWaldmann

--- a/MoinMoin/userprefs/prefs.py	Wed Mar 19 12:41:35 2008 +0100
+++ b/MoinMoin/userprefs/prefs.py	Wed Mar 19 12:45:14 2008 +0100
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 """
-    MoinMoin - UserPreferences Form and User Browser
+    MoinMoin - Preferences Form
 
     @copyright: 2001-2004 Juergen Hermann <jh@web.de>,
                 2003-2007 MoinMoin:ThomasWaldmann
@@ -14,7 +14,7 @@
 
 
 #################################################################
-# This is a mess.
+# This is still a mess.
 #
 # The plan for refactoring would be:
 # split the plugin into multiple preferences pages:

--- a/docs/CHANGES	Wed Mar 19 12:41:35 2008 +0100
+++ b/docs/CHANGES	Wed Mar 19 12:45:14 2008 +0100
@@ -103,6 +103,8 @@
   Other changes:
     * cfg.show_login is gone, see code in theme/__init__.py, this affects
       many themes!
+    * The themedict no longer contains 'page_user_prefs' and 'user_prefs',
+      this may affect custom themes.
     * needs a new userprefs/ plugin directory
     * removed attachments direct serving (cfg.attachments)
     * the rst-parser's admonition's class names are no longer prepended with