From e917389fe1dea413957cc2c791d66061e27f2174 Mon Sep 17 00:00:00 2001
From: Martin Heinen <mheinen@FreeBSD.org>
Date: Tue, 8 Oct 2002 07:41:22 +0000
Subject: [PATCH] Add <hostid> tags for hostnames and domainnames

Approved by:	alex (mentor)
---
 .../books/handbook/advanced-networking/chapter.sgml       | 8 ++++----
 en_US.ISO8859-1/books/handbook/basics/chapter.sgml        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
index 79d1adad6e..cba418af00 100644
--- a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
@@ -4162,7 +4162,7 @@ zone "0.168.192.in-addr.arpa" {
         <para>For each new zone served, a new zone entry must be added to
 	  <filename>named.conf</filename></para>
 
-        <para>For example, the simplest zone entry for example.org can
+        <para>For example, the simplest zone entry for <hostid role="domainname">example.org</hostid> can
 	  look like:</para>
 
         <programlisting>zone "example.org" {
@@ -4342,7 +4342,7 @@ example.org. IN SOA ns1.example.org. admin.example.org. (
           This is an <varname>NS</varname> entry.  Every name server that is going to reply
           authoritatively for the zone must have one of these entries.
 	  The <literal>@</literal> as seen here could have been
-	  <literal>example.org.</literal>
+	  <hostid role="domainname">example.org.</hostid>
 	  The <literal>@</literal> translates to the origin.
         </para>
 
@@ -4380,13 +4380,13 @@ www             IN CNAME        @</programlisting>
         <para>
           The <varname>MX</varname> record indicates which mail servers are responsible
           for handling incoming mail for the zone.
-          mail.example.org is the hostname of the mail server,
+          <hostid role="fqdn">mail.example.org</hostid> is the hostname of the mail server,
           and 10 being the priority of that mail server.
         </para>
 
         <para>
           One can have several mail servers, with priorities of 3, 2,
-          1.  A mail server attempting to deliver to example.org
+          1.  A mail server attempting to deliver to <hostid role="domainname">example.org</hostid>
           would first try the highest priority MX, then the second
           highest, etc, until the mail can be properly delivered.
         </para>
diff --git a/en_US.ISO8859-1/books/handbook/basics/chapter.sgml b/en_US.ISO8859-1/books/handbook/basics/chapter.sgml
index 22c71ac9c0..5ab7683d3c 100644
--- a/en_US.ISO8859-1/books/handbook/basics/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/basics/chapter.sgml
@@ -1390,7 +1390,7 @@ login:</screen>
 	    but the processor <quote>architecture</quote> that is shown
 	    here.</para>
 	</footnote>.  The name of this machine (every &unix; machine has a
-	name) is <literal>pc3.example.org</literal>, and you are now looking
+	name) is <hostid>pc3.example.org</hostid>, and you are now looking
 	at its system console&mdash;the <literal>ttyv0</literal>
 	terminal.</para>