From: Jeremy Reed <jreed@isc.org>
Date: Tue, 20 Jan 2009 19:59:25 +0000 (+0000)
Subject: Document @ (asperand) for bugs ticket 17144.
X-Git-Tag: v9.3.6-P2~4^2~105
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=5567f54834089be35d0df6afe2ccfaa039ab2233;p=thirdparty%2Fbind9.git

Document @ (asperand) for bugs ticket 17144.

While here also add missing period at end of sentence and describe
dot to fix problem as noted by SUN Guonian off-list (because Chinese
end of sentence dot is different than dot).
---

diff --git a/CHANGES b/CHANGES
index b7481a466ad..69760e02384 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2533.	[doc]		ARM: document @ (at-sign). [RT #17144]
+
 2532.	[bug]		dig: check the question section of the response to
 			see if it matches the asked question. [RT #18495]
 
diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index cd1db7ac820..b79d759c4e6 100644
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- File: $Id: Bv9ARM-book.xml,v 1.386 2009/01/09 22:24:36 jinmei Exp $ -->
+<!-- File: $Id: Bv9ARM-book.xml,v 1.387 2009/01/20 19:59:25 jreed Exp $ -->
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <title>BIND 9 Administrator Reference Manual</title>
 
@@ -11269,6 +11269,16 @@ zone <replaceable>zone_name</replaceable> <optional><replaceable>class</replacea
             Master File Directives include <command>$ORIGIN</command>, <command>$INCLUDE</command>,
             and <command>$TTL.</command>
           </para>
+          <sect3>
+            <title>The <command>@</command> (at-sign)</title>
+            <para>
+              When used in the label (or name) field, the asperand or
+              at-sign (@) symbol represents the current origin.
+              At the start of the zone file, it is the 
+              &lt;<varname>zone_name</varname>&gt; (followed by
+              trailing dot).
+            </para>
+          </sect3>
           <sect3>
             <title>The <command>$ORIGIN</command> Directive</title>
             <para>
@@ -11280,7 +11290,8 @@ zone <replaceable>zone_name</replaceable> <optional><replaceable>class</replacea
 	      sets the domain name that will be appended to any
               unqualified records. When a zone is first read in there
               is an implicit <command>$ORIGIN</command>
-              &lt;<varname>zone-name</varname>&gt;<command>.</command>
+              &lt;<varname>zone_name</varname>&gt;<command>.</command>
+              (followed by trailing dot).
               The current <command>$ORIGIN</command> is appended to
               the domain specified in the <command>$ORIGIN</command>
               argument if it is not absolute.