Use www.gnu.org as example hostname in manual (bug 10014).

diff --git a/ChangeLog b/ChangeLog
index ff693a829395fe80dc8d819ac54d6680f1f6bd4e..fd08a168f609d9127d4cd9c37acdec59a9b4aa7b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-09-06  Joseph Myers  <joseph@codesourcery.com>
 
+       [BZ #10014]
+       * manual/socket.texi (Host Addresses): Use www.gnu.org as example
+       host name.
+
        [BZ #10038]
        * manual/memory.texi (Memory): Make order of menu items match
        order of sections.

diff --git a/NEWS b/NEWS
index eb9e55da920dadb0f3d1aac2f1dba655e133c6ed..a2f1b8e71109714ed19666dea1e3f4174cf43c97 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,11 +9,11 @@ Version 2.17
 
 * The following bugs are resolved with this release:
 
-  1349, 3479, 5400, 6778, 6808, 9685, 9914, 10038, 11607, 13412, 13717,
-  13696, 13939, 13966, 14042, 14090, 14166, 14150, 14151, 14154, 14157,
-  14166, 14173, 14195, 14237, 14252, 14283, 14298, 14303, 14307, 14328,
-  14331, 14336, 14337, 14347, 14349, 14459, 14476, 14505, 14510, 14516,
-  14519, 14532, 14538, 14544, 14545.
+  1349, 3479, 5400, 6778, 6808, 9685, 9914, 10014, 10038, 11607, 13412,
+  13717, 13696, 13939, 13966, 14042, 14090, 14166, 14150, 14151, 14154,
+  14157, 14166, 14173, 14195, 14237, 14252, 14283, 14298, 14303, 14307,
+  14328, 14331, 14336, 14337, 14347, 14349, 14459, 14476, 14505, 14510,
+  14516, 14519, 14532, 14538, 14544, 14545.
 
 * Support for STT_GNU_IFUNC symbols added for s390 and s390x.
   Optimized versions of memcpy, memset, and memcmp added for System z10 and

diff --git a/manual/socket.texi b/manual/socket.texi
index a08ac4c675c50d87194d82fc08f79a6e25703576..b12c59131151f35360c361e74e607037a72f0d21 100644 (file)
--- a/manual/socket.texi
+++ b/manual/socket.texi
@@ -809,7 +809,7 @@ numeric host addresses as sequences of up to eight numbers separated by
 colons, as in @samp{5f03:1200:836f:c100::1}.
 
 Each computer also has one or more @dfn{host names}, which are strings
-of words separated by periods, as in @samp{mescaline.gnu.org}.
+of words separated by periods, as in @samp{www.gnu.org}.
 
 Programs that let the user specify a host typically accept both numeric
 addresses and host names.  To open a connection a program needs a