From owner-p4-projects@FreeBSD.ORG Fri Apr 8 16:39:43 2011
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 7A0421065674; Fri, 8 Apr 2011 16:39:43 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 3C46B1065672
for ; Fri, 8 Apr 2011 16:39:43 +0000 (UTC)
(envelope-from rene@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:4f8:fff6::2d])
by mx1.freebsd.org (Postfix) with ESMTP id 29BB98FC08
for ; Fri, 8 Apr 2011 16:39:43 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p38Gdhvr024344
for ; Fri, 8 Apr 2011 16:39:43 GMT
(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p38Gdg99024341
for perforce@freebsd.org; Fri, 8 Apr 2011 16:39:42 GMT
(envelope-from rene@FreeBSD.org)
Date: Fri, 8 Apr 2011 16:39:42 GMT
Message-Id: <201104081639.p38Gdg99024341@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
rene@FreeBSD.org using -f
From: Rene Ladan
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 191201 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Fri, 08 Apr 2011 16:39:43 -0000
http://p4web.freebsd.org/@@191201?ac=10
Change 191201 by rene@rene_acer on 2011/04/08 16:39:25
IFC
Affected files ...
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/install/chapter.sgml#19 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#25 integrate
.. //depot/projects/docproj_nl/www/en/platforms/ia64/todo.xsl#3 integrate
.. //depot/projects/docproj_nl/www/en/projects/summerofcode.xsl#8 integrate
Differences ...
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/install/chapter.sgml#19 (text+ko) ====
@@ -1,7 +1,7 @@
@@ -4606,7 +4606,7 @@
You must download one of either
- the bootonly ISO image (if available),
+ the bootonly ISO image,
or the image of disc1. Do not download
both of them, since the disc1 image
contains everything that the bootonly
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#25 (text+ko) ====
@@ -1,7 +1,7 @@
@@ -3126,7 +3126,8 @@
Reasons to Run a Name Server
Name servers generally come in two forms: authoritative
- name servers, and caching name servers.
+ name servers, and caching (also known as resolving)
+ name servers.
An authoritative name server is needed when:
@@ -3290,8 +3291,9 @@
// or cause huge amounts of useless Internet traffic.
options {
- // Relative to the chroot directory, if any
- directory "/etc/namedb";
+ // All file and path names are relative to the chroot directory,
+ // if any, and should be fully qualified.
+ directory "/etc/namedb/working";
pid-file "/var/run/named/pid";
dump-file "/var/dump/named_dump.db";
statistics-file "/var/stats/named.stats";
@@ -3372,7 +3374,7 @@
// Also, make sure to enable it in /etc/rc.conf.
// The traditional root hints mechanism. Use this, OR the slave zones below.
-zone "." { type hint; file "named.root"; };
+zone "." { type hint; file "/etc/namedb/named.root"; };
/* Slaving the following zones from the root name servers has some
significant advantages:
@@ -3388,11 +3390,16 @@
To use this mechanism, uncomment the entries below, and comment
the hint zone above.
+
+ As documented at http://dns.icann.org/services/axfr/ these zones:
+ "." (the root), ARPA, IN-ADDR.ARPA, IP6.ARPA, and ROOT-SERVERS.NET
+ are availble for AXFR from these servers on IPv4 and IPv6:
+ xfr.lax.dns.icann.org, xfr.cjr.dns.icann.org
*/
/*
zone "." {
type slave;
- file "slave/root.slave";
+ file "/etc/namedb/slave/root.slave";
masters {
192.5.5.241; // F.ROOT-SERVERS.NET.
};
@@ -3400,20 +3407,12 @@
};
zone "arpa" {
type slave;
- file "slave/arpa.slave";
+ file "/etc/namedb/slave/arpa.slave";
masters {
192.5.5.241; // F.ROOT-SERVERS.NET.
};
notify no;
};
-zone "in-addr.arpa" {
- type slave;
- file "slave/in-addr.arpa.slave";
- masters {
- 192.5.5.241; // F.ROOT-SERVERS.NET.
- };
- notify no;
-};
*/
/* Serving the following zones locally will prevent any queries
@@ -3422,117 +3421,133 @@
1. Faster local resolution for your users
2. No spurious traffic will be sent from your network to the roots
*/
-// RFC 1912
-zone "localhost" { type master; file "master/localhost-forward.db"; };
-zone "127.in-addr.arpa" { type master; file "master/localhost-reverse.db"; };
-zone "255.in-addr.arpa" { type master; file "master/empty.db"; };
+// RFCs 1912 and 5735 (and BCP 32 for localhost)
+zone "localhost" { type master; file "/etc/namedb/master/localhost-forward.db"; };
+zone "127.in-addr.arpa" { type master; file "/etc/namedb/master/localhost-reverse.db"; };
+zone "255.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
// RFC 1912-style zone for IPv6 localhost address
-zone "0.ip6.arpa" { type master; file "master/localhost-reverse.db"; };
+zone "0.ip6.arpa" { type master; file "/etc/namedb/master/localhost-reverse.db"; };
+
+// "This" Network (RFCs 1912 and 5735)
+zone "0.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+
+// Private Use Networks (RFCs 1918 and 5735)
+zone "10.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "16.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "17.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "18.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "19.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "20.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "21.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "22.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "23.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "24.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "25.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "26.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "27.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "28.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "29.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "30.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "31.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "168.192.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+
+// Link-local/APIPA (RFCs 3927 and 5735)
+zone "254.169.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-// "This" Network (RFCs 1912 and 3330)
-zone "0.in-addr.arpa" { type master; file "master/empty.db"; };
+// IETF protocol assignments (RFCs 5735 and 5736)
+zone "0.0.192.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-// Private Use Networks (RFC 1918)
-zone "10.in-addr.arpa" { type master; file "master/empty.db"; };
-zone "16.172.in-addr.arpa" { type master; file "master/empty.db"; };
-zone "17.172.in-addr.arpa" { type master; file "master/empty.db"; };
-zone "18.172.in-addr.arpa" { type master; file "master/empty.db"; };
-zone "19.172.in-addr.arpa" { type master; file "master/empty.db"; };
-zone "20.172.in-addr.arpa" { type master; file "master/empty.db"; };
-zone "21.172.in-addr.arpa" { type master; file "master/empty.db"; };
-zone "22.172.in-addr.arpa" { type master; file "master/empty.db"; };
-zone "23.172.in-addr.arpa" { type master; file "master/empty.db"; };
-zone "24.172.in-addr.arpa" { type master; file "master/empty.db"; };
-zone "25.172.in-addr.arpa" { type master; file "master/empty.db"; };
-zone "26.172.in-addr.arpa" { type master; file "master/empty.db"; };
-zone "27.172.in-addr.arpa" { type master; file "master/empty.db"; };
-zone "28.172.in-addr.arpa" { type master; file "master/empty.db"; };
-zone "29.172.in-addr.arpa" { type master; file "master/empty.db"; };
-zone "30.172.in-addr.arpa" { type master; file "master/empty.db"; };
-zone "31.172.in-addr.arpa" { type master; file "master/empty.db"; };
-zone "168.192.in-addr.arpa" { type master; file "master/empty.db"; };
+// TEST-NET-[1-3] for Documentation (RFCs 5735 and 5737)
+zone "2.0.192.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "100.51.198.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "113.0.203.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-// Link-local/APIPA (RFCs 3330 and 3927)
-zone "254.169.in-addr.arpa" { type master; file "master/empty.db"; };
+// IPv6 Range for Documentation (RFC 3849)
+zone "8.b.d.0.1.0.0.2.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-// TEST-NET for Documentation (RFC 3330)
-zone "2.0.192.in-addr.arpa" { type master; file "master/empty.db"; };
+// Domain Names for Documentation and Testing (BCP 32)
+zone "test" { type master; file "/etc/namedb/master/empty.db"; };
+zone "example" { type master; file "/etc/namedb/master/empty.db"; };
+zone "invalid" { type master; file "/etc/namedb/master/empty.db"; };
+zone "example.com" { type master; file "/etc/namedb/master/empty.db"; };
+zone "example.net" { type master; file "/etc/namedb/master/empty.db"; };
+zone "example.org" { type master; file "/etc/namedb/master/empty.db"; };
-// Router Benchmark Testing (RFC 3330)
-zone "18.198.in-addr.arpa" { type master; file "master/empty.db"; };
-zone "19.198.in-addr.arpa" { type master; file "master/empty.db"; };
+// Router Benchmark Testing (RFCs 2544 and 5735)
+zone "18.198.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "19.198.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-// IANA Reserved - Old Class E Space
-zone "240.in-addr.arpa" { type master; file "master/empty.db"; };
-zone "241.in-addr.arpa" { type master; file "master/empty.db"; };
-zone "242.in-addr.arpa" { type master; file "master/empty.db"; };
-zone "243.in-addr.arpa" { type master; file "master/empty.db"; };
-zone "244.in-addr.arpa" { type master; file "master/empty.db"; };
-zone "245.in-addr.arpa" { type master; file "master/empty.db"; };
-zone "246.in-addr.arpa" { type master; file "master/empty.db"; };
-zone "247.in-addr.arpa" { type master; file "master/empty.db"; };
-zone "248.in-addr.arpa" { type master; file "master/empty.db"; };
-zone "249.in-addr.arpa" { type master; file "master/empty.db"; };
-zone "250.in-addr.arpa" { type master; file "master/empty.db"; };
-zone "251.in-addr.arpa" { type master; file "master/empty.db"; };
-zone "252.in-addr.arpa" { type master; file "master/empty.db"; };
-zone "253.in-addr.arpa" { type master; file "master/empty.db"; };
-zone "254.in-addr.arpa" { type master; file "master/empty.db"; };
+// IANA Reserved - Old Class E Space (RFC 5735)
+zone "240.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "241.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "242.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "243.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "244.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "245.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "246.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "247.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "248.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "249.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "250.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "251.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "252.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "253.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "254.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
// IPv6 Unassigned Addresses (RFC 4291)
-zone "1.ip6.arpa" { type master; file "master/empty.db"; };
-zone "3.ip6.arpa" { type master; file "master/empty.db"; };
-zone "4.ip6.arpa" { type master; file "master/empty.db"; };
-zone "5.ip6.arpa" { type master; file "master/empty.db"; };
-zone "6.ip6.arpa" { type master; file "master/empty.db"; };
-zone "7.ip6.arpa" { type master; file "master/empty.db"; };
-zone "8.ip6.arpa" { type master; file "master/empty.db"; };
-zone "9.ip6.arpa" { type master; file "master/empty.db"; };
-zone "a.ip6.arpa" { type master; file "master/empty.db"; };
-zone "b.ip6.arpa" { type master; file "master/empty.db"; };
-zone "c.ip6.arpa" { type master; file "master/empty.db"; };
-zone "d.ip6.arpa" { type master; file "master/empty.db"; };
-zone "e.ip6.arpa" { type master; file "master/empty.db"; };
-zone "0.f.ip6.arpa" { type master; file "master/empty.db"; };
-zone "1.f.ip6.arpa" { type master; file "master/empty.db"; };
-zone "2.f.ip6.arpa" { type master; file "master/empty.db"; };
-zone "3.f.ip6.arpa" { type master; file "master/empty.db"; };
-zone "4.f.ip6.arpa" { type master; file "master/empty.db"; };
-zone "5.f.ip6.arpa" { type master; file "master/empty.db"; };
-zone "6.f.ip6.arpa" { type master; file "master/empty.db"; };
-zone "7.f.ip6.arpa" { type master; file "master/empty.db"; };
-zone "8.f.ip6.arpa" { type master; file "master/empty.db"; };
-zone "9.f.ip6.arpa" { type master; file "master/empty.db"; };
-zone "a.f.ip6.arpa" { type master; file "master/empty.db"; };
-zone "b.f.ip6.arpa" { type master; file "master/empty.db"; };
-zone "0.e.f.ip6.arpa" { type master; file "master/empty.db"; };
-zone "1.e.f.ip6.arpa" { type master; file "master/empty.db"; };
-zone "2.e.f.ip6.arpa" { type master; file "master/empty.db"; };
-zone "3.e.f.ip6.arpa" { type master; file "master/empty.db"; };
-zone "4.e.f.ip6.arpa" { type master; file "master/empty.db"; };
-zone "5.e.f.ip6.arpa" { type master; file "master/empty.db"; };
-zone "6.e.f.ip6.arpa" { type master; file "master/empty.db"; };
-zone "7.e.f.ip6.arpa" { type master; file "master/empty.db"; };
+zone "1.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "3.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "4.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "5.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "6.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "7.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "8.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "9.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "a.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "b.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "c.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "d.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "e.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "0.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "1.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "2.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "3.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "4.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "5.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "6.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "7.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "8.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "9.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "a.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "b.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "0.e.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "1.e.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "2.e.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "3.e.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "4.e.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "5.e.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "6.e.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "7.e.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
// IPv6 ULA (RFC 4193)
-zone "c.f.ip6.arpa" { type master; file "master/empty.db"; };
-zone "d.f.ip6.arpa" { type master; file "master/empty.db"; };
+zone "c.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "d.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
// IPv6 Link Local (RFC 4291)
-zone "8.e.f.ip6.arpa" { type master; file "master/empty.db"; };
-zone "9.e.f.ip6.arpa" { type master; file "master/empty.db"; };
-zone "a.e.f.ip6.arpa" { type master; file "master/empty.db"; };
-zone "b.e.f.ip6.arpa" { type master; file "master/empty.db"; };
+zone "8.e.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "9.e.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "a.e.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "b.e.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
// IPv6 Deprecated Site-Local Addresses (RFC 3879)
-zone "c.e.f.ip6.arpa" { type master; file "master/empty.db"; };
-zone "d.e.f.ip6.arpa" { type master; file "master/empty.db"; };
-zone "e.e.f.ip6.arpa" { type master; file "master/empty.db"; };
-zone "f.e.f.ip6.arpa" { type master; file "master/empty.db"; };
+zone "c.e.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "d.e.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "e.e.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "f.e.f.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
// IP6.INT is Deprecated (RFC 4159)
-zone "ip6.int" { type master; file "master/empty.db"; };
+zone "ip6.int" { type master; file "/etc/namedb/master/empty.db"; };
// NB: Do not use the IP addresses below, they are faked, and only
// serve demonstration/documentation purposes!
@@ -3563,14 +3578,14 @@
allow-update {
key "exampleorgkey";
};
- file "dynamic/example.org";
+ file "/etc/namedb/dynamic/example.org";
};
*/
/* Example of a slave reverse zone
zone "1.168.192.in-addr.arpa" {
type slave;
- file "slave/1.168.192.in-addr.arpa";
+ file "/etc/namedb/slave/1.168.192.in-addr.arpa";
masters {
192.168.1.1;
};
@@ -3908,13 +3923,13 @@
RFC1034
+ url="http://tools.ietf.org/html/rfc1034">RFC1034
- Domain Names - Concepts and Facilities
RFC1035
+ url="http://tools.ietf.org/html/rfc1035">RFC1035
- Domain Names - Implementation and Specification
==== //depot/projects/docproj_nl/www/en/platforms/ia64/todo.xsl#3 (text+ko) ====
@@ -9,7 +9,7 @@
-
+
==== //depot/projects/docproj_nl/www/en/projects/summerofcode.xsl#8 (text+ko) ====
@@ -7,7 +7,7 @@
%developers;
]>
-
+
@@ -273,7 +273,7 @@
28 March - Student application period opens.