From owner-doc-jp-work@jp.FreeBSD.org Sat Jul  2 16:42:36 2005
Received: (from daemon@localhost)
	by castle.jp.FreeBSD.org (8.11.6p2+3.4W/8.11.3) id j627gaJ63841;
	Sat, 2 Jul 2005 16:42:36 +0900 (JST)
	(envelope-from owner-doc-jp-work@jp.FreeBSD.org)
Received: from wasley.bl.mmtr.or.jp (wasley.bl.mmtr.or.jp [210.228.173.142])
	by castle.jp.FreeBSD.org (8.11.6p2+3.4W/8.11.3) with SMTP/inet id j627gYh63836
	for <doc-jp-work@jp.FreeBSD.org>; Sat, 2 Jul 2005 16:42:34 +0900 (JST)
	(envelope-from rushani@bl.mmtr.or.jp)
Received: (qmail 12417 invoked from network); 2 Jul 2005 16:42:34 +0900
Received: from unknown (HELO localhost) (210.153.209.47)
  by wasley.bl.mmtr.or.jp with SMTP; 2 Jul 2005 16:42:34 +0900
Message-Id: <20050702.164226.71173280.rushani@bl.mmtr.or.jp>
To: doc-jp-work@jp.FreeBSD.org
From: Hideyuki KURASHINA <rushani@bl.mmtr.or.jp>
In-Reply-To: <86r7ejg7dp.wl%hiroo@oikumene.gcd.org>
References: <20050701.000858.112566285.rushani@bl.mmtr.or.jp>
	<86r7ejg7dp.wl%hiroo@oikumene.gcd.org>
X-URL: http://www.rushani.jp/
X-PGP-Public-Key: http://www.rushani.jp/rushani.asc
X-PGP-Fingerprint: A052 6F98 6146 6FE3 91E2  DA6B F2FA 2088 439A DC57
X-RC5-72-Stats: http://stats.distributed.net/participant/psummary.php?project_id=8&id=432320
X-Mailer: Mew version 4.2.53 on Emacs 21.3 / Mule 5.0 (SAKAKI)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Reply-To: doc-jp-work@jp.FreeBSD.org
Precedence: list
Date: Sat, 02 Jul 2005 16:42:26 +0900
X-Sequence: doc-jp-work 1166
Subject: [doc-jp-work 1166] Re: relnotes for 6.0R
Sender: owner-doc-jp-work@jp.FreeBSD.org
X-Originator: rushani@bl.mmtr.or.jp
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+050320

$BARIJ$G$9!#(B

>>> On Fri, 01 Jul 2005 01:02:42 +0900, Hiroo Ono <hiroo@oikumene.gcd.org> said:

> $B>.Ln42@8$G$9!#(B
[...]
> $B$^$?!">e$+$iE,Ev$K(B diff $B$rEj$2$F2<$5$C$F$b9=$$$^$;$s!#(B

$B$H$$$&$3$H$G!">e$+$i$d$C$F$_$^$7$?!#(B

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Index: new.sgml
===================================================================
RCS file: /home/ncvs/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v
retrieving revision 1.663.2.5
retrieving revision 1.879
diff -u -r1.663.2.5 -r1.879
--- new.sgml	9 Jan 2004 17:08:32 -0000	1.663.2.5
+++ new.sgml	30 Jun 2005 04:55:46 -0000	1.879
@@ -1,9 +1,9 @@
 <articleinfo>
   <title>&os;/&arch; &release.current; Release Notes</title>
 
-  <corpauthor>The FreeBSD Project</corpauthor>
+  <corpauthor>The &os; Project</corpauthor>
 
-  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.663.2.5 2004/01/09 17:08:32 bmah Exp $</pubdate>
+  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.879 2005/06/30 04:55:46 bmah Exp $</pubdate>
 
   <copyright>
     <year>2000</year>
@@ -11,19 +11,23 @@
     <year>2002</year>
     <year>2003</year>
     <year>2004</year>
-    <holder role="mailto:doc@FreeBSD.org">The FreeBSD Documentation Project</holder>
+    <year>2005</year>
+    <holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder>
   </copyright>
 
+  <legalnotice id="trademarks" role="trademarks">
+    &tm-attrib.freebsd;
+    &tm-attrib.ibm;
+    &tm-attrib.ieee;
+    &tm-attrib.intel;
+    &tm-attrib.sparc;
+    &tm-attrib.general;
+  </legalnotice>
+
   <abstract>
     <para>The release notes for &os; &release.current; contain a summary
-      of
-<![ %include.historic; [
-      the changes made to the &os; base system since &release.prev;.
-]]>
-<![ %no.include.historic; [
-      recent changes made to the &os; base system on the &release.branch;
-      development branch.
-]]>
+      of the changes made to the &os; base system on the
+      &release.branch; development line.
       This document lists applicable security advisories that were issued since
       the last release, as well as significant changes to the &os;
       kernel and userland.
@@ -40,11 +44,22 @@
     It also provides some notes on upgrading
     from previous versions of &os;.</para>
 
+<![ %release.type.current [
+
+  <para>The &release.type; distribution to which these release notes
+    apply represents the latest point along the &release.branch; development
+    branch since &release.branch; was created.  Information regarding pre-built, binary
+    &release.type; distributions along this branch
+    can be found at <ulink url="&release.url;"></ulink>.</para>
+
+]]>
+
 <![ %release.type.snapshot [
 
   <para>The &release.type; distribution to which these release notes
     apply represents a point along the &release.branch; development
-    branch between &release.prev; and the future &release.next;.  Some
+    branch between &release.prev; and the future &release.next;.
+    Information regarding
     pre-built, binary &release.type; distributions along this branch
     can be found at <ulink url="&release.url;"></ulink>.</para>
 
@@ -57,22 +72,13 @@
     url="&release.url;"></ulink> or any of its mirrors.  More
     information on obtaining this (or other) &release.type;
     distributions of &os; can be found in the <ulink
-    url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/mirrors.html"><quote>Obtaining
-    FreeBSD</quote> appendix</ulink> to the <ulink
-    url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/">FreeBSD
+    url="&url.books.handbook;/mirrors.html"><quote>Obtaining
+    &os;</quote> appendix</ulink> to the <ulink
+    url="&url.books.handbook;/">&os;
     Handbook</ulink>.</para>
 
 ]]>
 
-  <para>Users who are new to the &release.branch; series of &os;
-    &release.type;s should also read the <quote>Early Adopters Guide
-    to &os; &release.current;</quote>.  This document can generally be
-    found in the same location as the release notes (either as a part of a
-    &os; distribution or on the &os; Web site).  It contains important
-    information regarding the advantages and disadvantages of using
-    &os; &release.current;, as opposed to releases based on the &os;
-    4-STABLE development branch.</para>
-
   <para>All users are encouraged to consult the release errata before
     installing &os;.  The errata document is updated with
     <quote>late-breaking</quote> information discovered late in the
@@ -87,20 +93,10 @@
   <title>What's New</title>
 
   <para>This section describes
-<![ %include.historic; [
-      the most user-visible new or changed features in &os;
-      since &release.prev;.
-      In general, changes described here are unique to the &release.branch;
-      branch unless specifically marked as &merged; features.
-]]>
-<![ %no.include.historic; [
-      many of the user-visible new or changed features in &os;
-      since &release.prev;.  It includes items that are unique to the
-      &release.branch; branch, as well as some features that may have been
-      recently merged to
-      other branches (after &os; &release.prev.historic;).  The latter
-      items are marked as &merged;.
-]]>
+    the most user-visible new or changed features in &os;
+    since &release.prev;.
+    In general, changes described here are unique to the &release.branch;
+    branch unless specifically marked as &merged; features.
   </para>
 
   <para>Typical release note items
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

$B$KBP1~$9$kItJ,$O(B

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- new.sgml.orig	Sat Jul  2 15:34:03 2005
+++ new.sgml	Sat Jul  2 16:39:21 2005
@@ -3,13 +3,13 @@
 
     $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/new.sgml,v 1.97 2004/01/12 15:39:46 hrs Exp $
 
-    Original revision: 1.663.2.5
+    Original revision: 1.879
 -->
 
 <articleinfo>
   <title>&os;/&arch; &release.current; $B%j%j!<%9%N!<%H(B</title>
 
-  <corpauthor>FreeBSD $B%W%m%8%'%/%H(B</corpauthor>
+  <corpauthor>&os; $B%W%m%8%'%/%H(B</corpauthor>
 
   <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/new.sgml,v 1.97 2004/01/12 15:39:46 hrs Exp $</pubdate>
 
@@ -19,20 +19,24 @@
     <year>2002</year>
     <year>2003</year>
     <year>2004</year>
-    <holder role="mailto:doc@FreeBSD.org">FreeBSD $B%I%-%e%a%s%F!<%7%g%s(B
+    <year>2005</year>
+    <holder role="mailto:doc@FreeBSD.org">&os; $B%I%-%e%a%s%F!<%7%g%s(B
     $B%W%m%8%'%/%H(B</holder>
   </copyright>
 
+  <legalnotice id="trademarks" role="trademarks">
+    &tm-attrib.freebsd;
+    &tm-attrib.ibm;
+    &tm-attrib.ieee;
+    &tm-attrib.intel;
+    &tm-attrib.sparc;
+    &tm-attrib.general;
+  </legalnotice>
+
   <abstract>
     <para>$B$3$N(B &os; &release.current; $BMQ%j%j!<%9%N!<%H$K$O!"(B
-<![ %include.historic; [
-      &release.prev; $B0J9_$N(B &os; $B%Y!<%9%7%9%F%`$KBP$9$kJQ99E@$N35MW(B
-      $B$,4^$^$l$F$$$^$9!#(B
-]]>
-<![ %no.include.historic; [
-      &release.branch; $B3+H/%V%i%s%A$N(B &os; $B%Y!<%9%7%9%F%`$KBP$9$k:G6a$N(B
+      &release.branch; $B3+H/%V%i%s%A$N(B &os; $B%Y!<%9%7%9%F%`$KBP$9$k(B
       $BJQ99E@$N35MW$,4^$^$l$F$$$^$9!#(B
-]]>
       &os; $B%+!<%M%k$*$h$S%f!<%6!<%i%s%I$K$*$1$kJQ99E@!"(B
       $BA0$N%j%j!<%90J9_$KH/9T$5$l$?%;%-%e%j%F%#4+9p$,=q$+$l$F$$$^$9!#(B
       $B$^$?!"%"%C%W%0%l!<%I$N:]$NCm0UE@$b:\$;$F$"$j$^$9!#(B</para>
@@ -47,13 +51,23 @@
     $B$3$l$O(B &os; $B$K:G6aDI2C!"JQ99!":o=|$5$l$?5!G=$K$D$$$F2r@b$7$?$b$N$G$"$j!"(B
     &os; $B$NA0$N%P!<%8%g%s$+$i$N%"%C%W%0%l!<%I$K$D$$$F$b8@5Z$7$F$$$^$9!#(B</para>
 
+<![ %release.type.current [
+
+  <para>$B$3$N%j%j!<%9%N!<%H$,BP1~$9$k(B &release.type; $BG[I[J*$O!"(B
+    &release.branch; $B3+H/%V%i%s%A$N@hC<$K$"$?$j$^$9!#(B
+    $B$3$N%V%i%s%A$N$"$i$+$8$a%3%s%Q%$%k$5$l$?%P%$%J%j(B
+    &release.type; $BG[I[J*$K4X$9$k>pJs$O(B
+    <ulink url="&release.url;"></ulink> $B$G8x3+$5$l$F$$$^$9!#(B</para>
+
+]]>
+
 <![ %release.type.snapshot [
 
   <para>$B$3$N%j%j!<%9%N!<%H$,BP1~$9$k(B &release.type; $BG[I[J*$O!"(B
     &release.branch; $B3+H/%V%i%s%A$N(B &release.prev; $B$+$i(B
     $B>-Mh$N(B &release.next; $B$N4V$K0LCV$7$^$9!#(B
     $B$3$N%V%i%s%A$N$"$i$+$8$a%3%s%Q%$%k$5$l$?%P%$%J%j(B &release.type;
-    $BG[I[J*$O(B <ulink url="&release.url;"></ulink> $B$K8x3+$5$l$F$$$^$9!#(B
+    $BG[I[J*$K4X$9$k>pJs$O(B <ulink url="&release.url;"></ulink> $B$G8x3+$5$l$F$$$^$9!#(B
   </para>
 
 ]]>
@@ -65,25 +79,14 @@
     $B$G8+$D$1$k$3$H$,$G$-$^$9!#(B
     $B$3$N(B ($B$b$7$/$OB>$N(B) &os; $B$N(B &release.type; $BG[I[J*$r<hF@$9$kJ}K!(B
     $B$O(B
-    <ulink url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/">FreeBSD $B%O%s%I%V%C%/(B</ulink>
+    <ulink url="&url.books.handbook;/">FreeBSD $B%O%s%I%V%C%/(B</ulink>
     $B$N(B
-    <ulink url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/mirrors.html">
+    <ulink url="&url.books.handbook;/mirrors.html">
       $BIUO?(B <quote>FreeBSD $B$r<hF@$9$k(B</quote></ulink>
     $B$r;2>H$7$F$/$@$5$$!#(B</para>
 
 ]]>
 
-  <para>&os; &release.type; $B$N(B &release.branch;
-    $B7ONs$r$O$8$a$FMxMQ$9$k%f!<%6$O!"$^$:(B <quote>&os;
-    &release.current; $B=i4|MxMQ<T$N<j0z$-(B</quote> $B$r$4Mw$/$@$5$$!#(B
-    $B$3$NJ8=q$O(B (&os; $BG[I[%U%!%$%k$N0lIt$H$7$F!"(B
-    $B$b$7$/$O(B &os; $B%&%'%V%5%$%H>e$N(B)
-    $B%j%j!<%9%N!<%H$HF1$8>l=j$KCV$+$l$F$*$j!"(B
-    &os; 4-STABLE
-    $B3+H/%V%i%s%A$r%Y!<%9$K$7$?%j%j!<%9$HHf3S$7$F!"(B
-    &os; &release.current;
-    $B$rMxMQ$9$k:]$NMxE@$H7gE@$K$D$$$F=EMW$J>pJs$,=q$+$l$F$$$^$9!#(B</para>
-
   <para>&os; $B$r%$%s%9%H!<%k$9$kA0$K!"I,$:$=$N%j%j!<%9$N(B
     errata $BJ8=q$r$*FI$_$/$@$5$$!#(B
     errata $BJ8=q$K$O!"%j%j!<%99)Dx$N:G8e$d%j%j!<%98e$KH=L@$7$?(B
@@ -98,19 +101,10 @@
   <title>$B99?7>pJs(B</title>
 
   <para>$B$3$N@a$G$O(B
-<![ %include.historic; [
     &release.prev; $B0J9_$K?7$?$KDI2C!&JQ99$5$l$?(B
     $B%f!<%6$K1F6A$9$k5!G=$K$D$$$F@bL@$7$^$9!#(B
     $B0lHLE*$K!"$3$3$K=q$+$l$F$$$kJQ99E@$N$&$A(B &merged;
     $B$H$$$&0u$NIU$$$F$$$J$$$b$N$O(B &release.branch; $B$K8GM-$N$b$N$G$9!#(B
-]]>
-<![ %no.include.historic; [
-    &release.prev; $B0J9_$K?7$?$KDI2C!&JQ99$5$l$?(B
-    $B%f!<%6$K1F6A$9$k5!G=$K$D$$$F@bL@$7$^$9!#(B
-    $B$3$l$K$OB>$N%V%i%s%A(B (&os; &release.prev.historic; $B0J9_(B) $B$X$H(B
-    $B:G6a%^!<%8$5$l$?5!G=$K2C$($F!"(B&release.branch; $B%V%i%s%A(B
-    $B$K8GM-$N9`L\$b4^$^$l$^$9!#(B
-]]>
   </para>
 
   <para>$B%j%j!<%9%N!<%H$K$O!"(B
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

$B$G$9!#(B

$B::FI$7$F$$$?$@$-$^$9$h$&!"$*4j$$$7$^$9!#(B

-- rushani
