master 2a2e7e5: Adjust the fully qualified host name when nothing is set

[Lars Ingebrigtsen]

branch: master
commit 2a2e7e5466ed229feb2b4cc062c2519cd51f731f
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Adjust the fully qualified host name when nothing is set
    
    * doc/misc/message.texi (News Headers): Adjust index.
    * lisp/gnus/message.el (message-check-news-header-syntax): Adjust check.
    (message-make-fqdn): Be less hilarious.
---
 doc/misc/message.texi | 2 +-
 lisp/gnus/message.el  | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index d2353e6..c0e3dfa 100644
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -2084,7 +2084,7 @@ This optional header will be computed by Message.
 @vindex user-mail-address
 @findex system-name
 @cindex Sun
-@cindex i-did-not-set--mail-host-address--so-tickle-me
+@cindex mail-host-address-is-not-set
 This required header will be generated by Message.  A unique ID will be
 created based on the date, time, user name (for the local part) and the
 domain part.  For the domain part, message will look (in this order) at
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 9baf09b..bcbf747 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -5357,7 +5357,7 @@ Otherwise, generate and save a value for 
`canlock-password' first."
    ;; Check "Shoot me".
    (message-check 'shoot
      (if (re-search-forward
-         "Message-ID.*.i-did-not-set--mail-host-address--so-tickle-me" nil t)
+         "Message-ID.*.mail-host-address-is-not-set" nil t)
         (y-or-n-p "You appear to have a misconfigured system.  Really post? ")
        t))
    ;; Check for Approved.
@@ -6068,8 +6068,7 @@ give as trustworthy answer as possible."
       user-domain)
      ;; Default to this bogus thing.
      (t
-      (concat sysname
-             ".i-did-not-set--mail-host-address--so-tickle-me")))))
+      (concat sysname ".mail-host-address-is-not-set")))))
 
 (defun message-make-domain ()
   "Return the domain name."