2 files changed, 9 insertions, 22 deletions

diff --git a/docs/en/rst/administering/parameters.rst b/docs/en/rst/administering/parameters.rst
index 0d2d18029..5835d654f 100644
--- a/docs/en/rst/administering/parameters.rst
+++ b/docs/en/rst/administering/parameters.rst
@@ -169,12 +169,6 @@ requirelogin
     If this option is set, all access to the system beyond the front page will
     require a login. No anonymous users will be permitted.
 
-webservice_email_filter
-    Filter email addresses returned by the WebService API depending on if the
-    user is logged in or not. This works similarly to how the web UI currently
-    filters email addresses. If requirelogin is enabled, then this parameter
-    has no effect as users must be logged in to use Bugzilla anyway.
-
 emailregexp
     Defines the regular expression used to validate email addresses used for
     login names. The default attempts to match fully qualified email addresses
@@ -186,12 +180,6 @@ emailregexpdesc
     This description is shown to the user to explain which email addresses are
     allowed by the :param:`emailregexp` param.
 
-emailsuffix
-    This is a string to append to any email addresses when actually sending mail
-    to that address. It is useful if you have changed the :param:`emailregexp`
-    param to only allow local usernames, but you want the mail to be delivered
-    to username\@my.local.hostname.
-
 createemailregexp
     This defines the (case-insensitive) regexp to use for email addresses that
     are permitted to self-register. The default (:paramval:`.*`) permits any
@@ -499,9 +487,8 @@ address. The LDAP authentication builds on top of this scheme, rather
 than replacing it. The initial log-in is done with a username and
 password for the LDAP directory. Bugzilla tries to bind to LDAP using
 those credentials and, if successful, tries to map this account to a
-Bugzilla account. If an LDAP mail attribute is defined, the value of this
-attribute is used; otherwise, the :param:`emailsuffix` parameter is appended to
-the LDAP username to form a full email address. If an account for this address
+Bugzilla account. An LDAP mail attribute must be defined.
+If an account for this address
 already exists in the Bugzilla installation, it will log in to that account.
 If no account for that email address exists, one is created at the time
 of login. (In this case, Bugzilla will attempt to use the "displayName"
diff --git a/docs/en/rst/administering/users.rst b/docs/en/rst/administering/users.rst
index e32db2f05..7d5b33399 100644
--- a/docs/en/rst/administering/users.rst
+++ b/docs/en/rst/administering/users.rst
@@ -27,9 +27,7 @@ will appear in the Administration page.
 
 The first screen is a search form to search for existing user
 accounts. You can run searches based either on the user ID, real
-name or login name (i.e. the email address, or just the first part
-of the email address if the :param:`emailsuffix` parameter is set).
-The search can be conducted
+name, login name or email address. The search can be conducted
 in different ways using the listbox to the right of the text entry
 box. You can match by case-insensitive substring (the default),
 regular expression, a *reverse* regular expression
@@ -55,13 +53,15 @@ Modifying Users
 Once you have found your user, you can change the following
 fields:
 
-- *Login Name*:
-  This is generally the user's full email address. However, if you
-  have are using the :param:`emailsuffix` parameter, this may
-  just be the user's login name. Unless you turn off the
+- *Email Address*:
+  This is the user's full email address. Unless you turn off the
   :param:`allowemailchange` parameter, users can change their
   login names themselves (to any valid email address).
 
+- *Login Name*:
+  This is the user's login name, if it is (or can be) different from their email
+  address (i.e. if the "use_email_as_login" parameter is switched off).
+
 - *Real Name*: The user's real name. Note that
   Bugzilla does not require this to create an account.