3 files changed, 12 insertions, 12 deletions
diff --git a/lisp/net/mailcap.el b/lisp/net/mailcap.el
index ae49972f5bf..f80b300084b 100644
--- a/lisp/net/mailcap.el
+++ b/lisp/net/mailcap.el
@@ -337,7 +337,7 @@ to return a true or false shell value for the validity.")
 (put 'mailcap-mime-data 'risky-local-variable t)
 
 (defcustom mailcap-download-directory nil
-  "*Directory to which `mailcap-save-binary-file' downloads files by default.
+  "Directory to which `mailcap-save-binary-file' downloads files by default.
 nil means your home directory."
   :type '(choice (const :tag "Home directory" nil)
 		 directory)
diff --git a/lisp/net/pop3.el b/lisp/net/pop3.el
index 1695bbd3a40..589eeb3ab32 100644
--- a/lisp/net/pop3.el
+++ b/lisp/net/pop3.el
@@ -45,26 +45,26 @@
 (defcustom pop3-maildrop (or (user-login-name)
 			     (getenv "LOGNAME")
 			     (getenv "USER"))
-  "*POP3 maildrop."
+  "POP3 maildrop."
   :version "22.1" ;; Oort Gnus
   :type 'string
   :group 'pop3)
 
 (defcustom pop3-mailhost (or (getenv "MAILHOST") ;; nil -> mismatch
 			     "pop3")
-  "*POP3 mailhost."
+  "POP3 mailhost."
   :version "22.1" ;; Oort Gnus
   :type 'string
   :group 'pop3)
 
 (defcustom pop3-port 110
-  "*POP3 port."
+  "POP3 port."
   :version "22.1" ;; Oort Gnus
   :type 'number
   :group 'pop3)
 
 (defcustom pop3-password-required t
-  "*Non-nil if a password is required when connecting to POP server."
+  "Non-nil if a password is required when connecting to POP server."
   :version "22.1" ;; Oort Gnus
   :type 'boolean
   :group 'pop3)
@@ -74,7 +74,7 @@
   "*Password to use when connecting to POP server.")
 
 (defcustom pop3-authentication-scheme 'pass
-  "*POP3 authentication scheme.
+  "POP3 authentication scheme.
 Defaults to `pass', for the standard USER/PASS authentication.  The other
 valid value is `apop'."
   :type '(choice (const :tag "Normal user/password" pass)
@@ -515,7 +515,7 @@ Return non-nil if it is necessary to update the local UIDL file."
       (insert "X-UIDL: " (nth (1- msgno) pop3-uidl) "\n"))))
 
 (defcustom pop3-stream-type nil
-  "*Transport security type for POP3 connections.
+  "Transport security type for POP3 connections.
 This may be either nil (plain connection), `ssl' (use an
 SSL/TSL-secured stream) or `starttls' (use the starttls mechanism
 to turn on TLS security after opening the stream).  However, if
diff --git a/lisp/net/starttls.el b/lisp/net/starttls.el
index 096ed2adc0d..1ab7dc01645 100644
--- a/lisp/net/starttls.el
+++ b/lisp/net/starttls.el
@@ -136,7 +136,7 @@ i.e. when `starttls-use-gnutls' is nil."
   :group 'starttls)
 
 (defcustom starttls-use-gnutls (not (executable-find starttls-program))
-  "*Whether to use GnuTLS instead of the `starttls' command."
+  "Whether to use GnuTLS instead of the `starttls' command."
   :version "22.1"
   :type 'boolean
   :group 'starttls)
@@ -160,13 +160,13 @@ find out which parameters are available."
   :group 'starttls)
 
 (defcustom starttls-process-connection-type nil
-  "*Value for `process-connection-type' to use when starting STARTTLS process."
+  "Value for `process-connection-type' to use when starting STARTTLS process."
   :version "22.1"
   :type 'boolean
   :group 'starttls)
 
 (defcustom starttls-connect "- Simple Client Mode:\n\n"
-  "*Regular expression indicating successful connection.
+  "Regular expression indicating successful connection.
 The default is what GnuTLS's \"gnutls-cli\" outputs."
   ;; GnuTLS cli.c:main() prints this string when it is starting to run
   ;; in the application read/write phase.  If the logic, or the string
@@ -176,7 +176,7 @@ The default is what GnuTLS's \"gnutls-cli\" outputs."
   :group 'starttls)
 
 (defcustom starttls-failure "\\*\\*\\* Handshake has failed"
-  "*Regular expression indicating failed TLS handshake.
+  "Regular expression indicating failed TLS handshake.
 The default is what GnuTLS's \"gnutls-cli\" outputs."
   ;; GnuTLS cli.c:do_handshake() prints this string on failure.  If the
   ;; logic, or the string itself, is modified, this must be updated.
@@ -185,7 +185,7 @@ The default is what GnuTLS's \"gnutls-cli\" outputs."
   :group 'starttls)
 
 (defcustom starttls-success "- Compression: "
-  "*Regular expression indicating completed TLS handshakes.
+  "Regular expression indicating completed TLS handshakes.
 The default is what GnuTLS's \"gnutls-cli\" outputs."
   ;; GnuTLS cli.c:do_handshake() calls, on success,
   ;; common.c:print_info(), that unconditionally print this string