PERFORCE change 31910 for review

Marcel Moolenaar marcel at FreeBSD.org
Mon May 26 18:05:29 PDT 2003


http://perforce.freebsd.org/chv.cgi?CH=31910

Change 31910 by marcel at marcel_nfs on 2003/05/26 18:04:37

	IFC 31909

Affected files ...

.. //depot/projects/ia64/lib/libthr/arch/i386/i386/_setcurthread.c#5 integrate
.. //depot/projects/ia64/lib/libthr/arch/ia64/ia64/_curthread.c#5 integrate
.. //depot/projects/ia64/lib/libthr/arch/sparc64/sparc64/_setcurthread.c#2 integrate
.. //depot/projects/ia64/lib/libthr/thread/thr_create.c#7 integrate
.. //depot/projects/ia64/lib/libthr/thread/thr_gc.c#5 integrate
.. //depot/projects/ia64/lib/libthr/thread/thr_init.c#5 integrate
.. //depot/projects/ia64/lib/libthr/thread/thr_join.c#4 integrate
.. //depot/projects/ia64/lib/libthr/thread/thr_private.h#5 integrate
.. //depot/projects/ia64/lib/libthr/thread/thr_stack.c#3 integrate
.. //depot/projects/ia64/release/doc/ja_JP.eucJP/early-adopter/article.sgml#7 integrate
.. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#11 integrate
.. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/common/intro.sgml#3 integrate
.. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.sgml#5 integrate
.. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/ia64/article.sgml#3 integrate
.. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.sgml#3 integrate
.. //depot/projects/ia64/release/doc/ja_JP.eucJP/share/sgml/release.dsl#8 integrate
.. //depot/projects/ia64/sys/alpha/alpha/busdma_machdep.c#14 integrate
.. //depot/projects/ia64/sys/alpha/include/bus.h#9 integrate
.. //depot/projects/ia64/sys/amd64/amd64/busdma_machdep.c#2 integrate
.. //depot/projects/ia64/sys/amd64/include/bus_dma.h#3 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.c#11 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.h#9 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.reg#10 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.seq#9 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_inline.h#9 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_osm.h#8 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_pci.c#10 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx.c#11 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx.h#7 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx.reg#7 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx.seq#6 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_inline.h#6 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_osm.h#9 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_pci.c#8 integrate
.. //depot/projects/ia64/sys/i386/i386/busdma_machdep.c#17 integrate
.. //depot/projects/ia64/sys/i386/include/bus_dma.h#5 integrate
.. //depot/projects/ia64/sys/ia64/ia64/machdep.c#71 integrate
.. //depot/projects/ia64/sys/ia64/ia64/pmap.c#64 integrate
.. //depot/projects/ia64/sys/ia64/ia64/support.s#8 integrate
.. //depot/projects/ia64/sys/sparc64/include/bus.h#13 integrate
.. //depot/projects/ia64/sys/sparc64/include/iommuvar.h#10 integrate
.. //depot/projects/ia64/sys/sparc64/pci/psycho.c#22 integrate
.. //depot/projects/ia64/sys/sparc64/sbus/sbus.c#13 integrate
.. //depot/projects/ia64/sys/sparc64/sparc64/bus_machdep.c#16 integrate
.. //depot/projects/ia64/sys/sparc64/sparc64/iommu.c#16 integrate
.. //depot/projects/ia64/tools/tools/tinderbox/tbmaster.pl#11 integrate
.. //depot/projects/ia64/usr.bin/usbhidctl/usbhid.c#6 integrate
.. //depot/projects/ia64/usr.sbin/pkg_install/info/show.c#12 integrate
.. //depot/projects/ia64/usr.sbin/pkg_install/lib/lib.h#9 integrate
.. //depot/projects/ia64/usr.sbin/pkg_install/lib/str.c#3 integrate

Differences ...

==== //depot/projects/ia64/lib/libthr/arch/i386/i386/_setcurthread.c#5 (text+ko) ====

@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libthr/arch/i386/i386/_setcurthread.c,v 1.7 2003/05/23 23:39:31 mtm Exp $
+ * $FreeBSD: src/lib/libthr/arch/i386/i386/_setcurthread.c,v 1.8 2003/05/25 22:40:57 mtm Exp $
  */
 
 #include <sys/types.h>
@@ -87,13 +87,15 @@
 }
 
 void *
-_set_curthread(ucontext_t *uc, struct pthread *thr)
+_set_curthread(ucontext_t *uc, struct pthread *thr, int *err)
 {
 	union descriptor desc;
 	void **ldt_entry;
 	int ldt_index;
 	int error;
 
+	*err = 0;
+
 	/*
 	 * If we are setting up the initial thread, the gs register
 	 * won't be setup for the current thread. In any case, we
@@ -106,8 +108,11 @@
 	if (ldt_inited == NULL)
 		ldt_init();
 
-	if (ldt_free == NULL)
-		abort();
+	if (ldt_free == NULL) {
+		/* Concurrent thread limit reached */
+		*err = curthread->error = EAGAIN;
+		return (NULL);
+	}
 
 	/*
 	 * Pull one off of the free list and update the free list pointer.

==== //depot/projects/ia64/lib/libthr/arch/ia64/ia64/_curthread.c#5 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libthr/arch/ia64/ia64/_curthread.c,v 1.2 2003/05/25 06:49:19 marcel Exp $");
+__FBSDID("$FreeBSD: src/lib/libthr/arch/ia64/ia64/_curthread.c,v 1.3 2003/05/25 22:40:57 mtm Exp $");
 
 #include <sys/types.h>
 #include <sys/ucontext.h>
@@ -48,9 +48,9 @@
 }
 
 void *
-_set_curthread(ucontext_t *uc, struct pthread *thread)
+_set_curthread(ucontext_t *uc, struct pthread *thread, int *err)
 {
-
+	*err = 0;
 	if (uc != NULL)
 		uc->uc_mcontext.mc_special.tp = (uint64_t)thread;
 	else

==== //depot/projects/ia64/lib/libthr/arch/sparc64/sparc64/_setcurthread.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libthr/arch/sparc64/sparc64/_setcurthread.c,v 1.2 2003/04/03 03:34:50 jake Exp $");
+__FBSDID("$FreeBSD: src/lib/libthr/arch/sparc64/sparc64/_setcurthread.c,v 1.3 2003/05/25 22:40:57 mtm Exp $");
 
 #include <sys/types.h>
 #include <sys/ucontext.h>
@@ -48,9 +48,9 @@
 }
 
 void *
-_set_curthread(ucontext_t *uc, struct pthread *thread)
+_set_curthread(ucontext_t *uc, struct pthread *thread, int *err)
 {
-
+	*err = 0;
 	if (uc != NULL)
 		uc->uc_mcontext.mc_global[6] = (uint64_t)thread;
 	else

==== //depot/projects/ia64/lib/libthr/thread/thr_create.c#7 (text+ko) ====

@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libthr/thread/thr_create.c,v 1.7 2003/05/25 08:35:37 mtm Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_create.c,v 1.9 2003/05/26 00:37:07 mtm Exp $
  */
 #include <errno.h>
 #include <stdlib.h>
@@ -116,7 +116,17 @@
 	new_thread->ctx.uc_stack.ss_sp = new_thread->stack;
 	new_thread->ctx.uc_stack.ss_size = pattr->stacksize_attr;
 	makecontext(&new_thread->ctx, _thread_start, 0);
-	new_thread->arch_id = _set_curthread(&new_thread->ctx, new_thread);
+	new_thread->arch_id = _set_curthread(&new_thread->ctx, new_thread, &ret);
+	if (ret != 0) {
+		if (pattr->stackaddr_attr == NULL) {
+			STACK_LOCK;
+			_thread_stack_free(new_thread->stack,
+			    pattr->stacksize_attr, pattr->guardsize_attr);
+			STACK_UNLOCK;
+		}
+		free(new_thread);
+		return (ret);
+	}
 
 	/* Copy the thread attributes: */
 	memcpy(&new_thread->attr, pattr, sizeof(struct pthread_attr));

==== //depot/projects/ia64/lib/libthr/thread/thr_gc.c#5 (text+ko) ====

@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libthr/thread/thr_gc.c,v 1.4 2003/05/25 08:31:33 mtm Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_gc.c,v 1.5 2003/05/26 00:37:07 mtm Exp $
  *
  * Garbage collector thread. Frees memory allocated for dead threads.
  *
@@ -113,6 +113,7 @@
 			 * the caller to pthread_create() and has not
 			 * been destroyed yet: 
 			 */
+			STACK_LOCK;
 			if (pthread->attr.stackaddr_attr == NULL &&
 			    pthread->stack != NULL) {
 				_thread_stack_free(pthread->stack,
@@ -120,6 +121,7 @@
 				    pthread->attr.guardsize_attr);
 				pthread->stack = NULL;
 			}
+			STACK_UNLOCK;
 
 			/*
 			 * If the thread has not been detached, leave

==== //depot/projects/ia64/lib/libthr/thread/thr_init.c#5 (text+ko) ====

@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.6 2003/05/25 08:31:33 mtm Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.7 2003/05/25 22:40:57 mtm Exp $
  */
 
 /* Allocate space for global thread variables here: */
@@ -162,6 +162,7 @@
 	size_t		len;
 	int		mib[2];
 	sigset_t	set;
+	int		error;
 
 	struct clockinfo clockinfo;
 	struct sigaction act;
@@ -221,7 +222,7 @@
 	memset(pthread, 0, sizeof(struct pthread));
 
 	_thread_initial = pthread;
-	pthread->arch_id = _set_curthread(NULL, pthread);
+	pthread->arch_id = _set_curthread(NULL, pthread, &error);
 
 	/* Get our thread id. */
 	thr_self(&pthread->thr_id);

==== //depot/projects/ia64/lib/libthr/thread/thr_join.c#4 (text+ko) ====

@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libthr/thread/thr_join.c,v 1.5 2003/05/25 08:31:33 mtm Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_join.c,v 1.6 2003/05/26 00:28:49 mtm Exp $
  */
 #include <errno.h>
 #include <pthread.h>
@@ -82,13 +82,13 @@
 				_SPINLOCK(&pthread->lock);
 				break;
 			}
-	THREAD_LIST_UNLOCK;
 
 	/* Check if the thread was not found or has been detached: */
 	if (thread == NULL ||
 	    ((pthread->attr.flags & PTHREAD_DETACHED) != 0)) {
 		if (thread != NULL)
 			_SPINUNLOCK(&pthread->lock);
+		THREAD_LIST_UNLOCK;
 		DEAD_LIST_UNLOCK;
 		ret = ESRCH;
 		goto out;
@@ -98,6 +98,7 @@
 		/* Multiple joiners are not supported. */
 		/* XXXTHR - support multiple joiners. */
 		_SPINUNLOCK(&pthread->lock);
+		THREAD_LIST_UNLOCK;
 		DEAD_LIST_UNLOCK;
 		ret = ENOTSUP;
 		goto out;
@@ -112,16 +113,16 @@
 
 		/* Keep track of which thread we're joining to: */
 		curthread->join_status.thread = pthread;
-		_SPINUNLOCK(&pthread->lock);
 
 		while (curthread->join_status.thread == pthread) {
 			PTHREAD_SET_STATE(curthread, PS_JOIN);
 			/* Wait for our signal to wake up. */
 			_thread_critical_exit(curthread);
+			_SPINUNLOCK(&pthread->lock);
+			THREAD_LIST_UNLOCK;
 			DEAD_LIST_UNLOCK;
 			_thread_suspend(curthread, NULL);
-			/* XXX - For correctness reasons. */
-			DEAD_LIST_LOCK;
+
 			_thread_critical_enter(curthread);
 		}
 
@@ -133,14 +134,6 @@
 		if ((ret == 0) && (thread_return != NULL))
 			*thread_return = curthread->join_status.ret;
 		_thread_critical_exit(curthread);
-		/*
-		 * XXX - Must unlock here, instead of doing it earlier,
-		 *	 because it could lead to a deadlock. If the thread
-		 *	 we are joining is waiting on this lock we would
-		 *	 deadlock if we released this lock before unlocking the
-		 *	 joined thread.
-		 */
-		DEAD_LIST_UNLOCK;
 	} else {
 		/*
 		 * The thread exited (is dead) without being detached, and no
@@ -158,6 +151,7 @@
 		_SPINUNLOCK(&pthread->lock);
 		if (pthread_cond_signal(&_gc_cond) != 0)
 			PANIC("Cannot signal gc cond");
+		THREAD_LIST_UNLOCK;
 		DEAD_LIST_UNLOCK;
 	}
 

==== //depot/projects/ia64/lib/libthr/thread/thr_private.h#5 (text+ko) ====

@@ -31,7 +31,7 @@
  *
  * Private thread definitions for the uthread kernel.
  *
- * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.12 2003/05/25 08:48:11 mtm Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.14 2003/05/26 00:37:07 mtm Exp $
  */
 
 #ifndef _THR_PRIVATE_H
@@ -578,6 +578,14 @@
 ;
 #endif
 
+SCLASS spinlock_t stack_lock
+#ifdef GLOBAL_PTHREAD_PRIVATE
+= _SPINLOCK_INITIALIZER
+#endif
+;
+#define STACK_LOCK	_SPINLOCK(&stack_lock);
+#define STACK_UNLOCK	_SPINUNLOCK(&stack_lock);
+
 /* List of all threads: */
 SCLASS TAILQ_HEAD(, pthread)	_thread_list
 #ifdef GLOBAL_PTHREAD_PRIVATE
@@ -711,7 +719,7 @@
 void	_cond_wait_backout(pthread_t);
 int     _find_thread(pthread_t);
 pthread_t _get_curthread(void);
-void	*_set_curthread(ucontext_t *, struct pthread *);
+void	*_set_curthread(ucontext_t *, struct pthread *, int *);
 void	_retire_thread(void *arch_id);
 void	*_thread_stack_alloc(size_t, size_t);
 void	_thread_stack_free(void *, size_t, size_t);

==== //depot/projects/ia64/lib/libthr/thread/thr_stack.c#3 (text+ko) ====

@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libthr/thread/thr_stack.c,v 1.2 2003/05/25 08:31:33 mtm Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_stack.c,v 1.3 2003/05/26 00:37:07 mtm Exp $
  */
 #include <sys/types.h>
 #include <sys/mman.h>
@@ -144,7 +144,7 @@
 		 * Use the garbage collector mutex for synchronization of the
 		 * spare stack list.
 		 */
-		DEAD_LIST_LOCK;
+		STACK_LOCK;
 
 		if ((spare_stack = LIST_FIRST(&_dstackq)) != NULL) {
 				/* Use the spare stack. */
@@ -153,7 +153,7 @@
 		}
 
 		/* Unlock the garbage collector mutex. */
-		DEAD_LIST_UNLOCK;
+		STACK_UNLOCK;
 	}
 	/*
 	 * The user specified a non-default stack and/or guard size, so try to
@@ -165,7 +165,7 @@
 		 * Use the garbage collector mutex for synchronization of the
 		 * spare stack list.
 		 */
-		DEAD_LIST_LOCK;
+		STACK_LOCK;
 
 		LIST_FOREACH(spare_stack, &_mstackq, qe) {
 			if (spare_stack->stacksize == stack_size &&
@@ -177,7 +177,7 @@
 		}
 
 		/* Unlock the garbage collector mutex. */
-		DEAD_LIST_UNLOCK;
+		STACK_UNLOCK;
 	}
 
 	/* Check if a stack was not allocated from a stack cache: */

==== //depot/projects/ia64/release/doc/ja_JP.eucJP/early-adopter/article.sgml#7 (text+ko) ====

@@ -19,24 +19,28 @@
 
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
+
+<!ENTITY release.4x "4.<replaceable>X</replaceable>">
+<!ENTITY release.5x "5.<replaceable>X</replaceable>">
+
 ]>
 
 <!--
     FreeBSD Japanese Documentation Project
 
-    $FreeBSD: src/release/doc/ja_JP.eucJP/early-adopter/article.sgml,v 1.6 2003/02/11 18:56:46 rushani Exp $
-    Original revision: 1.12
+    $FreeBSD: src/release/doc/ja_JP.eucJP/early-adopter/article.sgml,v 1.7 2003/05/26 15:32:33 rushani Exp $
+    Original revision: 1.15
 -->
 
 <article>
   <articleinfo>
-    <title>&os; 5.0-RELEASE ½é´üÍøÍѼԤΤ¿¤á¤Î¼ê°ú¤­</title>
+    <title>&os; &release.current; ½é´üÍøÍѼԤΤ¿¤á¤Î¼ê°ú¤­</title>
 
     <authorgroup>
       <corpauthor>&os; ¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°¥Á¡¼¥à</corpauthor>
     </authorgroup>
 
-    <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/early-adopter/article.sgml,v 1.6 2003/02/11 18:56:46 rushani Exp $</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/early-adopter/article.sgml,v 1.7 2003/05/26 15:32:33 rushani Exp $</pubdate>
 
     <copyright>
       <year>2002</year>
@@ -44,44 +48,56 @@
       <holder role="mailto:re at FreeBSD.org">&os;
         ¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°¥Á¡¼¥à</holder>
     </copyright>
+
+    <abstract>
+      <para>¤³¤Îµ­»ö¤Ç¤Ï¡¢&os; &release.current; ¤Î¸½¾õ¤ò
+        &release.5x; ·ÏÎó¤Î¥ê¥ê¡¼¥¹¤Þ¤¿¤Ï &os; °ìÈ̤ËÉÔ´·¤ì¤Ê
+        ÍøÍѼԤÎΩ¾ì¤«¤é¾ÜºÙ¤Ë½Ò¤Ù¤Æ¤¤¤Þ¤¹¡£
+        ¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°¤ÎÇØ·Ê¤È¤Ê¤ë»ö¾ð¡¢
+        ¿·µ¡Ç½¤Î¥Ï¥¤¥é¥¤¥È¡¢½é´üÍøÍѼԤ¬Ä¾Ì̤¹¤ë²ÄǽÀ­¤Î¤¢¤ë¾ã³²¤òµ­ºÜ¤·¤Æ¤¤¤Þ¤¹¡£
+        ¤Þ¤¿¡¢4-STABLE ³«È¯¥Ö¥é¥ó¥Á¤Î¾­Íè¤Î¥ê¥ê¡¼¥¹·×²è¤È
+        ´û¸¤Î¥·¥¹¥Æ¥à¤ò¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ë¤¿¤á¤Î¥Ò¥ó¥È¤ò¤¤¤¯¤Ä¤«¾Ò²ð¤·¤Æ¤¤¤Þ¤¹¡£</para>
+    </abstract>
   </articleinfo>
 
   <sect1 id="intro">
     <title>¤Ï¤¸¤á¤Ë</title>
 
-    <para>&os; 5.0 ¤Ï¡¢2 ǯ¤Ö¤ê¤Ë¸ø³«¤µ¤ì¤ë¿·¤·¤¤¥á¥¸¥ã¡¼¥Ð¡¼¥¸¥ç¥ó¤Ç¤¹¡£
+    <para>&os; &release.5x; ¤Ï¡¢2 ǯ¤Ö¤ê¤Ë¸ø³«¤µ¤ì¤ë¿·¤·¤¤¥á¥¸¥ã¡¼¥Ð¡¼¥¸¥ç¥ó¤Ç¤¹¡£
       ¤µ¤Þ¤¶¤Þ¤Ê¿·µ¡Ç½¤Ë²Ã¤¨¤Æ¡¢¥·¥¹¥Æ¥à¥¢¡¼¥­¥Æ¥¯¥Á¥ã¥ì¥Ù¥ë¤Ç¤Î³«È¯¤â
       ¿ô¿¤¯È¿±Ç¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤¿¤À¤·¤³¤Î¿ÊÊâ¤Ï¡¢¤Þ¤À¹­¤¯»î¸³¤µ¤ì¤Æ¤¤¤Ê¤¤
       ¿·¤·¤¤¥³¡¼¥É¤¬Èó¾ï¤Ë¿¤¯Æ³Æþ¤µ¤ì¤¿·ë²Ì¤Ç¤â¤¢¤ê¤Þ¤¹¡£
-      ¤½¤Î¤¿¤á¡¢¸½ºß¤Î 4.<replaceable>X</replaceable> ¥ê¥ê¡¼¥¹¤ÈÈæ³Ó¤¹¤ë¤È¡¢
-      5.0 ¤Ï°ÂÄêÀ­¤äÀ­Ç½¡¢¾ì¹ç¤Ë¤è¤Ã¤Æ¤Ïµ¡Ç½À­¤Ê¤É¤ÎÅÀ¤ÇÎô¤Ã¤Æ¤¤¤ë¤«¤âÃΤì¤Þ¤»¤ó¡£</para>
+      ¤½¤Î¤¿¤á¡¢¸½ºß¤Î &release.4x; ¥ê¥ê¡¼¥¹¤ÈÈæ³Ó¤¹¤ë¤È¡¢
+      ½é´ü¤Î &release.5x; ¥ê¥ê¡¼¥¹¤Ï°ÂÄêÀ­¤äÀ­Ç½¡¢
+      ¾ì¹ç¤Ë¤è¤Ã¤Æ¤Ïµ¡Ç½À­¤Ê¤É¤ÎÅÀ¤ÇÎô¤Ã¤Æ¤¤¤ë¤«¤âÃΤì¤Þ¤»¤ó¡£</para>
 
-    <para>&a.re; ¤Ï¤³¤Î¤è¤¦¤ÊÍýͳ¤«¤é¡¢²¿¤â¹Í¤¨¤º¤Ë¸Å¤¤
-      &os; ¥ê¥ê¡¼¥¹¤ò 5.0 ¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ë¤Î¤Ï<emphasis>¤ª¤¹¤¹¤á¤·¤Þ¤»¤ó</emphasis>¡£
-      º£¤Þ¤Ç¤É¤ª¤ê¤Îưºî¤ò´üÂÔ¤¹¤ë¥æ¡¼¥¶¤Ë¤ÏÆÃ¤Ë¡¢Åöʬ¤Î´Ö¤Ï
-      4.<replaceable>X</replaceable> ¥ê¥ê¡¼¥¹ (4.7-RELEASE ¤ä¼¡²ó¸ø³«Í½Äê¤Î
-      4.8-RELEASE ¤Ê¤É) ¤ÎÍøÍѤò¤ª¤¹¤¹¤á¤·¤Þ¤¹¡£¤½¤Î¤è¤¦¤Ê¥æ¡¼¥¶¤¬
-      5.<replaceable>X</replaceable> ¤Ø¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É¤ò¹Í¤¨¤ë»þ´ü¤È¤·¤Æ¤Ï¡¢
+    <para>&a.re; ¤Ï¤³¤Î¤è¤¦¤ÊÍýͳ¤«¤é¡¢¿·¤·¤¤¥ê¥ê¡¼¥¹¤Ë¤ª¤¤¤ÆÈ¯À¸¤·¤¦¤ëÌäÂê¤ò
+      ¥æ¡¼¥¶¤¬¼«³Ð¤·¤Æ (¤½¤·¤ÆÂн褹¤ë½àÈ÷¤¬¤Ç¤­¤Æ) ¤¤¤Ê¤¤¸Â¤ê¡¢
+      ¸Å¤¤ &os; ¥ê¥ê¡¼¥¹¤ò &release.current; ¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ë¤Î¤ò
+      ÌÀ³Î¤ËÈó¿ä¾©¤È¤·¤Æ¤¤¤Þ¤¹¡£
+      ÆÃ¤Ë¡¢º£¤Þ¤Ç¤É¤ª¤ê¤Îưºî¤ò´üÂÔ¤¹¤ë¿µ½Å¤Ê¥æ¡¼¥¶¤Ë¤Ï¡¢¤·¤Ð¤é¤¯¤Î´Ö¤Ï
+      (4.8-RELEASE ¤Î¤è¤¦¤Ê) &release.4x; ¥ê¥ê¡¼¥¹¤Ç±¿ÍѤ¹¤ë¤³¤È¤ò¤ª¤¹¤¹¤á¤·¤Þ¤¹¡£
+      &release.5x; ¤Ø¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É¤ò¹Í¤¨¤ë»þ´ü¤È¤·¤Æ¤Ï¡¢
       ¤ª¤½¤é¤¯ 5-STABLE ³«È¯¥Ö¥é¥ó¥Á¤¬ºîÀ®¤µ¤ì¤¿¸å¤¬Å¬Åö¤Ç¤·¤ç¤¦¡£
-      ¤³¤ì¤Ï 5.1-RELEASE ¤« 5.2-RELEASE ¤Î¸ø³«¤¢¤¿¤ê¤Ë¤Ê¤ë¸«¹þ¤ß¤Ç¤¹¡£</para>
+      ¤³¤ì¤Ï 5.2-RELEASE ¤Î¸ø³«¤¢¤¿¤ê¤Ë¤Ê¤ë¸«¹þ¤ß¤Ç¤¹¡£</para>
 
-    <para>(&os; 5.0 ¤Ï¤¤¤ï¤æ¤ë<quote>Íñ·ÜÌäÂê</quote>¤òÊú¤¨¤Æ¤¤¤Þ¤¹¡£
-      ¥×¥í¥¸¥§¥¯¥È¤Ç¤Ï³§¤¬²Äǽ¤Ê¸Â¤ê 5.0-RELEASE
-      ¤ò°ÂÄê¤Ç¿®ÍêÀ­¤Î¹â¤¤¤â¤Î¤Ë¤·¤è¤¦¤È¹Í¤¨¤Æ¤¤¤ë¤Î¤Ç¤¹¤¬¡¢
+    <para>(&os; &release.5x; ¤Ï¤¤¤ï¤æ¤ë<quote>Íñ·ÜÌäÂê</quote>¤òÊú¤¨¤Æ¤¤¤Þ¤¹¡£
+      ¥×¥í¥¸¥§¥¯¥È¤Ç¤Ï³§¤¬²Äǽ¤Ê¸Â¤ê¥ê¥ê¡¼¥¹¤ò
+      °ÂÄê¤Ç¿®ÍêÀ­¤Î¹â¤¤¤â¤Î¤Ë¤·¤è¤¦¤È¹Í¤¨¤Æ¤¤¤ë¤Î¤Ç¤¹¤¬¡¢
       ¤½¤Î°ÂÄêÀ­¤È¿®ÍêÀ­¤òÆÀ¤ë¤Ë¤Ï¡¢¹­¤¤ÈϰϤǤλ¡¢
       ÆÃ¤Ë¥·¥¹¥Æ¥à¤Î¿·¤·¤¤µ¡Ç½¤ËÂФ¹¤ë»î¸³¤¬É¬ÍפǤ¹¡£
       ¤·¤«¤·¡¢¤¿¤¯¤µ¤ó¤Î¥æ¡¼¥¶¤Ë¥·¥¹¥Æ¥à¤ò»î¸³¤·¤Æ¤â¤é¤¦¤¿¤á¤Ë¤Ï¡¢
       ¼ÂºÝ¤Î¤È¤³¤íºÇ½é¤Î¥ê¥ê¡¼¥¹¤òºîÀ®¤·¡¢
       ÇÛÉÛ¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¤Î¤Ç¤¹!)</para>
 
-    <para>¤³¤Îʸ½ñ¤Ç¤Ï¡¢&os; 5.0-RELEASE ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤È±¿ÍѤˤª¤±¤ë
+    <para>¤³¤Îʸ½ñ¤Ç¤Ï¡¢&os; &release.current; ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤È±¿ÍѤˤª¤±¤ë
       ¤¤¤¯¤Ä¤«¤ÎÌäÂêÅÀ¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£
       ¤Þ¤º¡¢&os; ¤Î¥ê¥ê¡¼¥¹¹©Äø¤Î³µÍפˤĤ¤¤Æ²òÀ⤷¡¢
-      ¼¡¤Ë &os; 5.0 ¤ÎÆÃÉ®¤¹¤Ù¤­¿·µ¡Ç½¤Î¤¤¤¯¤Ä¤«¤È¡¢
+      ¼¡¤Ë &os; &release.current; ¤ÎÆÃÉ®¤¹¤Ù¤­¿·µ¡Ç½¤Î¤¤¤¯¤Ä¤«¤È¡¢
       ÉÔÃí°Õ¤«¤é¥æ¡¼¥¶¤¬´Ù¤ê¤ä¤¹¤¤¤È»×¤ï¤ì¤ëÌäÂê¤Ë¤Ä¤¤¤Æ¾Ò²ð¤·¤Þ¤¹¡£
       ¤Þ¤¿¡¢4-STABLE ¥Ù¡¼¥¹¤Î¥ê¥ê¡¼¥¹¤ò»È¤¤Â³¤±¤è¤¦¤È¹Í¤¨¤Æ¤¤¤ë¥æ¡¼¥¶¸þ¤±¤Ë¡¢
       º£¸å¤Î 4-STABLE ³«È¯¥Ö¥é¥ó¥Á¤Ë¤ª¤±¤ëû´ü¡¦Ãæ´üŪ¤Ê¥×¥é¥ó¤Ë¤Ä¤¤¤Æ¤â¿¨¤ì¤Þ¤¹¡£
-      ºÇ¸å¤Ë¡¢4.<replaceable>X</replaceable> ¥·¥¹¥Æ¥à¤ò 5.0
+      ºÇ¸å¤Ë¡¢&release.4x; ¥·¥¹¥Æ¥à¤ò &release.current;
       ¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ëºÝ¤ÎÃí°ÕÅÀ¤ò¼¨¤·¤Þ¤¹¡£</para>
   </sect1>
 
@@ -102,12 +118,12 @@
       ¤Ç¤¢¤ëÄøÅٻ¤µ¤ì¤¿µ¡Ç½¤À¤±¤¬Äɲ䵤ì¤Þ¤¹¡£
       ¸½»þÅÀ¤Ç³èȯ¤Ë³«È¯¤µ¤ì¤Æ¤¤¤ë STABLE ¥Ö¥é¥ó¥Á¤Ï 1 ¤Ä¤À¤±¤Ç¤¹¡£
       ¤½¤Î¥Ö¥é¥ó¥Á¤Ï <quote>4-STABLE</quote> ¤È¸Æ¤Ð¤ì¤Æ¤ª¤ê¡¢
-      &os; 4.<replaceable>X</replaceable>
+      &os; &release.4x;
       ¥ê¥ê¡¼¥¹¤Ï¤¹¤Ù¤Æ¤³¤Î¥Ö¥é¥ó¥Á¤«¤éºîÀ®¤µ¤ì¤Þ¤·¤¿¡£     
       ¤³¤Î¥Ö¥é¥ó¥Á¤Ï CVS ¥ê¥Ý¥¸¥È¥ê¤Ç
       <literal>RELENG_4</literal> ¤È¤¤¤¦¥¿¥°¤¬ÉÕ¤±¤é¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
-    <para>&os; 5.0 ¤Ï CURRENT ¥Ö¥é¥ó¥Á¤ò¥Ù¡¼¥¹¤Ë¤·¤Æ¤¤¤Þ¤¹¡£
+    <para>&os; 5.0 ¤È 5.1 ¤Ï CURRENT ¥Ö¥é¥ó¥Á¤ò¥Ù¡¼¥¹¤Ë¤·¤Æ¤¤¤Þ¤¹¡£
       CURRENT ¥Ö¥é¥ó¥Á¤«¤é¤Î¥ê¥ê¡¼¥¹¤Ï 2 ǯ¤Ö¤ê¤Ç¤¹
       (Á°²ó¤Î &os; 4.0 ¤Ï 2000 ǯ 3 ·î¤Ç¤·¤¿)¡£</para>
 
@@ -117,29 +133,33 @@
       °ÊÁ°¤Î 2 ¤Ä¤Î stable ¥Ö¥é¥ó¥Á (3-STABLE ¤ª¤è¤Ó 4-STABLE) ¤Ï¡¢
       ¤½¤ì¤¾¤ì¤Î <quote>x.0</quote> ¥ê¥ê¡¼¥¹¤Îľ¸å (¤½¤ì¤¾¤ì 3.0 ¤È 4.0) ¤Ë
       ºîÀ®¤µ¤ì¤Æ¤¤¤Þ¤·¤¿¡£¤·¤«¤·¤³¤ÎÊýË¡¤Ç¤Ï¡¢
-      ¿·¤·¤¤ STABLE ¥Ö¥é¥ó¥Á¤¬ºîÀ®¤µ¤ì¤Æ¤«¤é¡¢
-      CURRENT ¥Ö¥é¥ó¥Á¤È¤½¤Î¿·¤·¤¤¥Ö¥é¥ó¥Á¤¬°ÂÄꤹ¤ë¤Þ¤Ç¤Ë
+      ¿·¤·¤¤ STABLE ¥Ö¥é¥ó¥Á¤¬ºîÀ®¤µ¤ì¤ëÁ°¤Ë¡¢
+      CURRENT ¥Ö¥é¥ó¥Á¤¬°ÂÄꤹ¤ë
       ½½Ê¬¤Ê»þ´Ö¤¬³ÎÊݤǤ­¤Ê¤¤¤È¤¤¤¦ÌäÂ꤬¤¢¤ê¤Þ¤¹¡£</para>
 
     <para>¤½¤Î¤¿¤á¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°¥Á¡¼¥à¤Ï¡¢
       ³Æ¥Ö¥é¥ó¥Á¤¬¤½¤Î¥Ö¥é¥ó¥Á¤Î»ý¤ÄÀ­³Ê¤ËÂФ·¤Æ
       Èæ³ÓŪ°ÂÄꤷ¤¿¾õÂ֤ˤʤ俤³¤È¤ò³Îǧ¤·¤Æ¤«¤é¡¢
       CVS ¥ê¥Ý¥¸¥È¥ê¤Ë 5-STABLE ¥Ö¥é¥ó¥Á¤òºîÀ®¤¹¤ë¤³¤È¤òͽÄꤷ¤Æ¤¤¤Þ¤¹¡£
-      ¤ª¤½¤é¤¯¥Ö¥é¥ó¥Á¤¬ºîÀ®¤µ¤ì¤ë¤Þ¤Ç¤Ë¡¢5.<replaceable>X</replaceable>
+      ¤ª¤½¤é¤¯¥Ö¥é¥ó¥Á¤¬ºîÀ®¤µ¤ì¤ë¤Þ¤Ç¤Ë¡¢&release.5x;
       ·ÏÎ󤫤é¥ê¥ê¡¼¥¹ÈǤ¬¤¤¤¯¤Ä¤«¸ø³«¤µ¤ì¤ë¤Ç¤·¤ç¤¦¡£
-      5-STABLE ¥Ö¥é¥ó¥Á¤ÎÅоì¤Ï¡¢5.1-RELEASE ¤« 5.2-RELEASE
+      5-STABLE ¥Ö¥é¥ó¥Á¤ÎÅоì¤Ï¡¢5.2-RELEASE
       ¤Î¸å¤¢¤¿¤ê¤Ë¤Ê¤ë¤È¸«¹þ¤ó¤Ç¤¤¤Þ¤¹¡£</para>
 
     <para>&os; ¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°¹©Äø¤Ë´Ø¤¹¤ë¾ÜºÙ¤Ï¡¢
       <ulink url="http://www.FreeBSD.org/releng/index.html">¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°¤Î¥¦¥§¥Ö¥Ú¡¼¥¸</ulink>
-      ¤ª¤è¤Ó¡¢&os; ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë<ulink url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/releng/index.html">¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°</ulink>¤È¤¤¤¦µ­»ö¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
+      ¤ª¤è¤Ó¡¢<ulink url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/releng/index.html"><quote>&os; ¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°</quote></ulink>
+      ¤È¤¤¤¦µ­»ö¤ò¤´Í÷¤¯¤À¤µ¤¤¡£
+      ¤­¤¿¤ë 5-STABLE ³«È¯¥Ö¥é¥ó¥Á¤Ë¤Ä¤¤¤Æ¤ÎÆÃµ­»ö¹à¤Ï
+      <ulink url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/5-roadmap/index.html"><quote>5-STABL ³«È¯¥Ö¥é¥ó¥Á¤Î¥í¡¼¥É¥Þ¥Ã¥×</quote></ulink>
+      ¤È¤¤¤¦µ­»ö¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
 
   </sect1>
 
   <sect1 id="new">
     <title>¿·µ¡Ç½</title>
 
-    <para>&os; 5.0 ¤ÎÂ礭¤ÊÌ¥ÎϤΠ1 ¤Ä¤Ï¡¢¿ô¿¤¯¤Î¿·µ¡Ç½¤Ç¤¹¡£
+    <para>&os; &release.5x; ¤ÎÂ礭¤ÊÌ¥ÎϤΠ1 ¤Ä¤Ï¡¢¿ô¿¤¯¤Î¿·µ¡Ç½¤Ç¤¹¡£
       ¤³¤ì¤é¤Î¿·¤·¤¤µ¡Ç½¤Ï¡¢&os; 4-STABLE ³«È¯¥Ö¥é¥ó¥Á¤Ë¤ÏÅý¹ç¤Ç¤­¤Ê¤«¤Ã¤¿
       Â礭¤Ê¥¢¡¼¥­¥Æ¥¯¥Á¥ã¥ì¥Ù¥ë¤ÎÊѹ¹¤âÅöÁ³¤Ê¤¬¤é´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹
       (°ìÊý¤Ç¿·¤·¤¤¥Ç¥Ð¥¤¥¹¥É¥é¥¤¥Ð¤ä¥æ¡¼¥¶¥é¥ó¥É¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ê¤É¡¢
@@ -149,7 +169,8 @@
     <itemizedlist>
       <listitem>
         <para>SMPng: <quote>¼¡À¤Âå</quote>¤Ë¸þ¤±¤¿ SMP ¥Þ¥·¥óÂбþ¤Ç¤¹ (³«È¯Ãæ)¡£
-          ¸½ºß¤Ï¡¢¥«¡¼¥Í¥ë¤Ë¤ª¤±¤ë¥Þ¥ë¥Á¥×¥í¥»¥Ã¥µ¤ÎƱ»þ¼Â¹Ô¤ËÉôʬŪ¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£</para>
+          ¸½ºß¤Ï¡¢¥«¡¼¥Í¥ë¤Ë¤ª¤±¤ë¥Þ¥ë¥Á¥×¥í¥»¥Ã¥µ¤ÎƱ»þ¼Â¹Ô¤ËÉôʬŪ¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£
+          ¤³¤Îºî¶È¤Ï¸½ºß¿Ê¹ÔÃæ¤Ç¤¹¡£</para>
       </listitem>
 
       <listitem>
@@ -157,7 +178,10 @@
           (Kernel Scheduled Entities; KSE) ¤Ï¡¢¥¹¥±¥¸¥å¡¼¥é¥¢¥¯¥Æ¥£¥Ù¡¼¥·¥ç¥ó
           (Scheduler Activations) ¤Î¼êË¡¤ÈƱÍͤΡ¢
           1 ¸Ä¤Î¥×¥í¥»¥¹¤¬Ê£¿ô¤Î¥«¡¼¥Í¥ë¥ì¥Ù¥ë¥¹¥ì¥Ã¥É¤ò
-          »ý¤Æ¤ë¤è¤¦¤Ë¤¹¤ë¤¿¤á¤Îµ¡¹½¤Ç¤¹¡£</para>
+          »ý¤Æ¤ë¤è¤¦¤Ë¤¹¤ë¤¿¤á¤Îµ¡¹½¤Ç¤¹¡£¤³¤Îµ¡¹½¤òÍøÍѤ·¤Æ
+          ¥Þ¥ë¥Á¥¹¥ì¥Ã¥É¤Î¥æ¡¼¥¶¥é¥ó¥É¥×¥í¥°¥é¥à¤ò¼Â¸½¤¹¤ë¤¿¤á¤Ë¡¢
+          (¼Â¸³Åª¤Ê)  <filename>libkse</filename> ¥é¥¤¥Ö¥é¥ê¤È
+          <filename>libthr</filename> ¥é¥¤¥Ö¥é¥ê¤¬Ä󶡤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
       </listitem>
 
       <listitem>
@@ -168,7 +192,7 @@
       <listitem>
 	<para>GCC:  ¥³¥ó¥Ñ¥¤¥é¥Ä¡¼¥ë¥Á¥§¥¤¥ó¤¬
 	  GCC 2.95.<replaceable>X</replaceable> ¥Ù¡¼¥¹¤Î¤â¤Î¤«¤é¡¢
-          GCC 3.2.1 ¤Ë¹¹¿·¤µ¤ì¤Þ¤·¤¿¡£</para>
+          GCC 3.2.2 ¤Ë¹¹¿·¤µ¤ì¤Þ¤·¤¿¡£</para>
       </listitem>
 
       <listitem>
@@ -190,7 +214,11 @@
 
       <listitem>
 	<para>UFS2:  UFS2 ¥ª¥ó¥Ç¥£¥¹¥¯¥Õ¥©¡¼¥Þ¥Ã¥È¤¬¿·¤¿¤ËÄɲ䵤ì¤Þ¤·¤¿¡£
-          ¤³¤ì¤Ï¡¢¥Õ¥¡¥¤¥ëñ°Ì¤Ç¤Î³Èĥ°À­¤ÈµðÂç¤Ê¥Õ¥¡¥¤¥ë¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£</para>
+          ¤³¤ì¤Ï¡¢¥Õ¥¡¥¤¥ëñ°Ì¤Ç¤Î³Èĥ°À­¤ÈµðÂç¤Ê¥Õ¥¡¥¤¥ë¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£
+          ¤Þ¤¿¡¢UFS2 ¤Ï &man.newfs.8; ¤Î¥Ç¥Õ¥©¥ë¥È¤Î¥Õ¥©¡¼¥Þ¥Ã¥È¤Ë¤Ê¤ê¤Þ¤·¤¿¡£
+          pc98 ¤ò½ü¤¯¤¹¤Ù¤Æ¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ë¤ª¤¤¤Æ¡¢
+          &man.sysinstall.8; ¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç
+          UFS2 ¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤òºîÀ®¤·¤Þ¤¹¡£</para>
       </listitem>
 
       <listitem>
@@ -199,14 +227,14 @@
 
     </itemizedlist>
 
-    <para>¤µ¤é¤Ë¾Ü¤·¤¤¿·µ¡Ç½¤Î¥ê¥¹¥È¤Ï¡¢&os; 5.0
-      ¤Î¥ê¥ê¡¼¥¹¥Î¡¼¥È¤Ë½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£</para>
+    <para>¤µ¤é¤Ë¾Ü¤·¤¤¿·µ¡Ç½¤Î¥ê¥¹¥È¤Ï¡¢&os; &release.prev; ¤È
+      &os; &release.current; ¤Î¥ê¥ê¡¼¥¹¥Î¡¼¥È¤Ë½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£</para>
   </sect1>
 
   <sect1 id="drawbacks">
     <title>½é´ü¥ê¥ê¡¼¥¹¤ò»È¤¦¾å¤Ç¤Î·çÅÀ</title>
 
-    <para>&os; 5.0 ¤Ë¤ÏÀâÌÀ¤·¤¿¤è¤¦¤Ê¿·µ¡Ç½¤¬Äɲäµ¤ì¤Æ¤¤¤ë¤Î¤Ç¤¹¤¬¡¢
+    <para>&os; &release.5x; ¤Ë¤ÏÀâÌÀ¤·¤¿¤è¤¦¤Ê¿·µ¡Ç½¤¬Äɲäµ¤ì¤Æ¤¤¤ë¤Î¤Ç¤¹¤¬¡¢
       ÌäÂ꤬¤¢¤Ã¤¿¤ê¡¢°Õ¿Þ¤É¤ª¤ê¤Ëư¤«¤Ê¤¤¤È¤¤¤¦Éôʬ¤â¤¤¤¯¤Ä¤«Â¸ºß¤·¤Þ¤¹¡£
       ¤³¤ì¤Ï¤Û¤È¤ó¤É¤Î¾ì¹ç¡¢Â¿¤¯¤Îµ¡Ç½¤¬¤Þ¤À³«È¯Ãæ¤Ç¤¢¤ë¤³¤È¤Ëµ¯°ø¤·¤¿¤â¤Î¤Ç¤¹¡£
       ¼¡¤Ë¡¢ÌäÂê¤Î¤¢¤ëÉôʬ¤Î¤¤¤¯¤Ä¤«¤ò¤Þ¤È¤á¤¿¥ê¥¹¥È¤ò¼¨¤·¤Þ¤¹¡£</para>
@@ -215,7 +243,9 @@
 
       <listitem>
         <para>¤¿¤È¤¨¤Ð¡¢¾å¤Î¿·µ¡Ç½¥ê¥¹¥È¤Ë¤¢¤ë SMPng ¤ä KSE ¤Ê¤É¡¢
-          ³«È¯¤¬¤Þ¤À½ª¤ï¤Ã¤Æ¤¤¤Ê¤¤µ¡Ç½¤¬Â¿¤¯¤¢¤ê¤Þ¤¹¡£</para>
+          ³«È¯¤¬¤Þ¤À½ª¤ï¤Ã¤Æ¤¤¤Ê¤¤µ¡Ç½¤¬Â¿¤¯¤¢¤ê¤Þ¤¹¡£
+          ¤³¤ì¤é¤Îµ¡Ç½¤Ï¥Æ¥¹¥È¤È¼Â¸³ÍÑÅӤˤϸþ¤¤¤Æ¤¤¤ë¤â¤Î¤Î¡¢
+          À½ÉÊÉʼÁ¤Ë¤Ï㤷¤Æ¤¤¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£</para>
       </listitem>
 
       <listitem>
@@ -237,6 +267,14 @@
       </listitem>
 
       <listitem>
+        <para>ÍøÍѼԤÈÊݼéôÅö¼Ô¤¬ÉÔ­¤·¤Æ¤¤¤ë¤¿¤á¡¢
+          &os; ¥Ù¡¼¥¹¥·¥¹¥Æ¥à¤Î°ìÉô¤¬ÇËþ¾õÂ֤˴٤ê¤Þ¤·¤¿¡£
+          ¤³¤ì¤é (¤Î»È¤ï¤ì¤Ê¤¤¤³¤È¤Î¿¤¤µ¡Ç½) ¤Ï¸½ºßºï½ü¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
+          ÆÃÉ®¤¹¤Ù¤­»öÎã¤Ë¡¢a.out ·Á¼°¤Î¼Â¹Ô¥Õ¥¡¥¤¥ë¤ÎÀ¸À®¡¢
+          XNS ¥Í¥Ã¥È¥ï¡¼¥­¥ó¥°Âбþ¡¢X-10 ¥³¥ó¥È¥í¡¼¥é¥É¥é¥¤¥Ð¤¬µó¤²¤é¤ì¤Þ¤¹¡£</para>
+      </listitem>
+
+      <listitem>
         <para>&os; 4.0 ¤ÇÀµ¤·¤¯Æ°ºî¤·¤Æ¤¤¤¿Â¿¤¯¤Î ports/packages ¤¬¡¢
           &os; 5.0 ¤Ç¤Ï¹½ÃۤǤ­¤Ê¤¯¤Ê¤Ã¤¿¤ê¡¢
           Àµ¤·¤¯Æ°ºî¤·¤Ê¤¯¤Ê¤Ã¤¿¤ê¤·¤Æ¤¤¤Þ¤¹¡£
@@ -245,8 +283,8 @@
       </listitem>
 
       <listitem>
-        <para>&os; 5.0 ¤Ï CURRENT ¤«¤é 2 ǯ¤Ö¤ê¤Ë¥ê¥ê¡¼¥¹¤µ¤ì¤¿¤â¤Î¤Ç¤¹¡£
-          ¤³¤ì¤Ï¤½¤Î¿¤¯¤Î¿·µ¡Ç½¤¬¡¢°ìÈ̸þ¤±¤Ë¹­¤¯¸ø³«¤µ¤ì¤ë½é¤á¤Æ¤Îµ¡²ñ¤Ë¤Ê¤ê¤Þ¤¹¡£
+        <para>&os; &release.5x; ¤Î¿¤¯¤Î¿·µ¡Ç½¤¬¡¢
+          °ìÈ̸þ¤±¤Ë¹­¤¯¸ø³«¤µ¤ì¤ë½é¤á¤Æ¤Îµ¡²ñ¤Ë¤Ê¤ê¤Þ¤¹¡£
           ¥«¡¼¥Í¥ë¤Ï¡¢(SMPng ¤Ê¤É¤Î) ¤³¤Î¤è¤¦¤Ê¿·µ¡Ç½¤Ë¤è¤Ã¤Æ¡¢
           Â礭¤¯Êѹ¹¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
       </listitem>
@@ -263,7 +301,7 @@
           &os; 5.0 ¤Ï¡¢¤³¤Î¤è¤¦¤Ê -STABLE ¥Ö¥é¥ó¥Á¤Î»ý¤Ä°ÂÄêÀ­¤ò»ý¤Ã¤Æ¤¤¤Þ¤»¤ó
           (ÌõÃí: &os; 5.0 ¤Ø¤Î¿·µ¡Ç½Äɲäϡ¢¡Ö°ÂÄꤷ¤¿¸å¤ËÅý¹ç¡×¤È¤¤¤¦
           -STABLE ¥Ö¥é¥ó¥Á¤Î´·½¬¤Ë§¤Ã¤Æ¤¤¤Ê¤¤¤È¤¤¤¦°ÕÌ£¤Ç¤¹)¡£
-          (5-STABLE ³«È¯¥Ö¥é¥ó¥Á¤Ï¡¢5.1-RELEASE ¤â¤·¤¯¤Ï 5.2-RELEASE
+          (5-STABLE ³«È¯¥Ö¥é¥ó¥Á¤Ï¡¢5.2-RELEASE
           ¤Î¸å¤¢¤¿¤ê¤ËºîÀ®¤µ¤ì¤ëͽÄê¤Ç¤¹)¡£</para>
       </listitem>
 
@@ -272,14 +310,14 @@
           url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/index.html">¥Ï¥ó¥É¥Ö¥Ã¥¯</ulink>
         ¤È <ulink
           url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/faq/index.html">FAQ</ulink>
-        ¤Î¤è¤¦¤Êʸ½ñ¤Ï &os; 5.0
+        ¤Î¤è¤¦¤Êʸ½ñ¤Ï &os; &release.5x;
         ¤Þ¤Ç¤Ë²Ã¤¨¤é¤ì¤¿ºÇ¶á¤ÎÊѹ¹¤òÈ¿±Ç¤·¤Æ¤¤¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£</para>
       </listitem>
 
     </itemizedlist>
 
     <para>¤³¤Î¤è¤¦¤Ë¥·¥¹¥Æ¥à¤Î°ÂÄêÀ­¤Ë±Æ¶Á¤¹¤ë·çÅÀ¤¬Â¿¤¯¤¢¤ë¤³¤È¤«¤é¡¢
-      5.<replaceable>X</replaceable> ·ÏÎ󤬽½Ê¬¤Ë°ÂÄꤹ¤ë¤Þ¤Ç¤Î´Ö¡¢
+      &release.5x; ·ÏÎ󤬽½Ê¬¤Ë°ÂÄꤹ¤ë¤Þ¤Ç¤Î´Ö¡¢
       ¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°¥Á¡¼¥à¤Ï¡¢
       ¸½ºß¤Îµ¡Ç½À­¡¦°ÂÄêÀ­¤ò½ÅÍ׻뤹¤ë¥µ¥¤¥È¤ä¥æ¡¼¥¶¤ËÂФ·¤Æ
       4-STABLE ¥Ö¥é¥ó¥Á¤«¤é¸ø³«¤µ¤ì¤ë¥ê¥ê¡¼¥¹ÈǤòÍøÍѤ¹¤ë¤³¤È¤ò¿ä¾©¤·¤Æ¤¤¤Þ¤¹¡£</para>
@@ -289,25 +327,25 @@
     <title>4-STABLE ¥Ö¥é¥ó¥Á¤ËÂФ¹¤ëº£¸å¤ÎͽÄê</title>
 
     <para>&os; 5.0 ¤¬¸ø³«¤µ¤ì¤Æ¤â¡¢4-STABLE ¥Ö¥é¥ó¥Á¤Î³«È¯¤¬½ªÎ»¤¹¤ë¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-      ¤³¤Î¥Ö¥é¥ó¥Á¤«¤é¤Ï¾¯¤Ê¤¯¤È¤â 1 ²ó¡¢4.8-RELEASE ¤¬¸ø³«¤µ¤ì¤Þ¤¹¡£
-      4.8-RELEASE ¤Î¸ø³«¤Ï¡¢¸½»þÅÀ¤Ç¤Ï 2003 ǯ 3 ·î 1 Æü¤ÎͽÄê¤Ç¤¹¡£</para>
-
-    <para>¼¹É®»þÅÀ¤Ç¤Ï¡¢¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°¥Á¡¼¥à¤Ï
-      4-STABLE ¥Ö¥é¥ó¥Á¤«¤é¤Î (4.8 °Ê¹ß¤Î) ¥ê¥ê¡¼¥¹¤Î¸ø³«¤Ë¤Ä¤¤¤Æ¡¢
-      ¤Ï¤Ã¤­¤ê¤È¤·¤¿·×²è¤ò»ý¤Ã¤Æ¤¤¤Þ¤»¤ó¡£¤¿¤À¤·¡¢4.9-RELEASE¡¢¤¢¤ë¤¤¤Ï
-      4.10-RELEASE ¤Î¸ø³«¤Ï½½Ê¬¤Ë¤¢¤ê¤¨¤Þ¤¹¡£4-STABLE ¥Ö¥é¥ó¥Á¤«¤é¤Î
-      ¾­Íè¤Î¥ê¥ê¡¼¥¹¤Ï¡¢¤¤¤¯¤Ä¤«¤ÎÍ×ÁǤ¬Íí¤ó¤Ç¤­¤Þ¤¹¡£
+      ¼ÂºÝ¤Ë¡¢&os; 4.8-RELEASE ¤Ï 5.0-RELEASE ¤Î
+      2 ¥õ·î¸å¤Î 2003 ǯ 4 ·î¤Ë¸ø³«¤µ¤ì¤Þ¤·¤¿¡£
+      ¤³¤Î¥Ö¥é¥ó¥Á¤«¤é¤Ï¡¢ºÇÄã¤Ç¤â¤â¤¦ 1 ²ó¤Î¥ê¥ê¡¼¥¹¡¢
+      ¤¹¤Ê¤ï¤Á 4.9-RELEASE ¤¬¸ø³«¤µ¤ì¤ë¤Ç¤·¤ç¤¦
+      (¸½ºß¤Ï 2003 ǯ¤Î²Æ¤òͽÄꤷ¤Æ¤¤¤Þ¤¹)¡£
+      4.10-RELEASE ¤¬¸ø³«¤µ¤ì¤ë²ÄǽÀ­¤Ë¤Ä¤¤¤Æ¤âƱÍͤǤ¹¡£
+      4-STABLE ¥Ö¥é¥ó¥Á¤«¤é¤Î¾­Íè¤Î¥ê¥ê¡¼¥¹¤Ï¡¢¤¤¤¯¤Ä¤«¤ÎÍ×ÁǤ¬Íí¤ó¤Ç¤­¤Þ¤¹¡£
       ºÇ¤â½ÅÍפʤΤϡ¢5-STABLE ¥Ö¥é¥ó¥Á¤ÎºîÀ®¤È¡¢¤½¤Î°ÂÄêÀ­¤Ç¤¹¡£
       CURRENT ¤¬ 5-STABLE ¥Ö¥é¥ó¥Á¤òºîÀ®¤Ç¤­¤ë¤Û¤É¤Ë°ÂÄꤷ¤Æ¤¤¤Ê¤«¤Ã¤¿¾ì¹ç¡¢
       ¥ê¥ê¡¼¥¹¤Ï 4-STABLE ¥Ö¥é¥ó¥Á¤«¤éºîÀ®¤¹¤ë¤³¤È¤Ë¤Ê¤ë¤Ç¤·¤ç¤¦¡£
       ¤Þ¤¿ 4-STABLE ¤Ë¤Ï¡¢4-STABLE ¥Ö¥é¥ó¥Á¤«¤é¤ÎºÇ½ª¥ê¥ê¡¼¥¹¤¬
       ¹ðÃΤµ¤ì¤ë¤Þ¤Ç¡¢³«È¯¼Ô¤ÎȽÃǤȥê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°¤Î
-      ¥Ý¥ê¥·¤Ë´ð¤Å¤¤¤Æ HEAD ¤«¤é¿·µ¡Ç½¤¬Åý¹ç¤µ¤ì¤Þ¤¹¡£</para>
+      ¥Ý¥ê¥·¤Ë´ð¤Å¤¤¤Æ <literal>HEAD</literal> ¤«¤é¿·µ¡Ç½¤¬Åý¹ç¤µ¤ì¤Þ¤¹¡£</para>
 
-    <para>¤¢¤ëÄøÅ٤Ǥ¹¤¬¡¢¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°¥Á¡¼¥à¤Ï¡¢
+    <para>¤¢¤ëÄøÅ٤Ǥ¹¤¬¡¢¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°¥Á¡¼¥à¤Ï
+      ³«È¯¼Ô¥³¥ß¥å¥Ë¥Æ¥£¤ÈƱÍÍ¤Ë¥×¥í¥¸¥§¥¯¥ÈÁ´ÂΤȤ·¤Æ¡¢
       ¾­Íè¤Î 4-STABLE ¥ê¥ê¡¼¥¹¤ËÂФ¹¤ë¥æ¡¼¥¶¤Î¥Ë¡¼¥º¤ò¹Íθ¤¹¤ë¤Ä¤â¤ê¤Ç¤¹¡£
       ¤¿¤À¤·¤½¤Î¥Ë¡¼¥º¤Ï¡¢¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°ºî¶È¤ËɬÍפÊÏ«ÎÏ¡¦»ñ¸»
-      (¿ÍŪ»ñ¸»¡¢·×»»µ¡»ñ¸»¡¢¥ß¥é¡¼¥¢¡¼¥«¥¤¥ÖÍÆÎÌ)
+      (ÆÃ¤Ë³«È¯¼Ô¤Î»þ´Ö¡¢·×»»µ¡»ñ¸»¡¢¥ß¥é¡¼¥¢¡¼¥«¥¤¥ÖÍÆÎÌ)
       ¤Ë¸«¹ç¤Ã¤¿¤â¤Î¤Ç¤¢¤ëɬÍפ¬¤¢¤ë¤Ç¤·¤ç¤¦¡£</para>
 
     <para>&a.security-officer; ¤Ï &os; ¥¦¥§¥Ö¥µ¥¤¥È¤Î
@@ -321,11 +359,11 @@
   </sect1>
 
   <sect1 id="upgrade">
-    <title>¥¢¥Ã¥×¥°¥ì¡¼¥É¤ÎºÝ¤ÎÃí°ÕÅÀ</title>
+    <title>&os; &release.4x; ¤«¤é¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ëºÝ¤ÎÃí°ÕÅÀ</title>
 
     <para>¤³¤ÎÀá¤Ç¤Ï¸½ºß &os; ¥·¥¹¥Æ¥à¤òÍøÍѤ·¤Æ¤¤¤ëÊý¸þ¤±¤Ë¡¢
-      &os; 4.<replaceable>X</replaceable> ¥·¥¹¥Æ¥à¤ò
-      5.<replaceable>X</replaceable> ¥·¥¹¥Æ¥à¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ëºÝ¤Î
+      &os; &release.4x; ¥·¥¹¥Æ¥à¤ò
+      &release.5x; ¥·¥¹¥Æ¥à¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ëºÝ¤Î
       Ãí°ÕÅÀ¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£
       &os; ¤ò¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ë¾ì¹ç¤Ï¡¢¥¢¥Ã¥×¥°¥ì¡¼¥É¤·¤¿¤¤¥Ð¡¼¥¸¥ç¥ó¤Î
       ¥ê¥ê¡¼¥¹¥Î¡¼¥È¤È errata ʸ½ñ¤òÆÉ¤à¤³¤È¡¢¤Þ¤¿¡¢
@@ -339,15 +377,18 @@
         <quote>¤¹¤Ù¤Æ¤ò¥Ð¥Ã¥¯¥¢¥Ã¥×¤·¤Æ¡¢ºÆ¥Õ¥©¡¼¥Þ¥Ã¥È¡¢ºÆ¥¤¥ó¥¹¥È¡¼¥ë¤·¡¢
           ºÇ¸å¤Ë¥Ð¥Ã¥¯¥¢¥Ã¥×¤òŸ³«</quote>¤¹¤ë¤³¤È¤Ç¤·¤ç¤¦¡£
         ¤³¤ÎÊýË¡¤Ï¡¢¸ß´¹À­¤¬¤Ê¤«¤Ã¤¿¤ê¡¢¸Å¤¯¤Æ»È¤¨¤Ê¤¤¼Â¹Ô¥Õ¥¡¥¤¥ë¤ä
-        ÀßÄê¥Õ¥¡¥¤¥ë¤Ë¤è¤Ã¤Æ¡¢¿·¤·¤¤¥·¥¹¥Æ¥à¤¬±øÀ÷¤µ¤ì¤ëÌäÂê¤ò²óÈò¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
+        ÀßÄê¥Õ¥¡¥¤¥ë¤Ë¤è¤Ã¤Æ¡¢¿·¤·¤¤¥·¥¹¥Æ¥à¤¬±øÀ÷¤µ¤ì¤ëÌäÂê¤ò²óÈò¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+        ¤Þ¤¿¡¢¿·µ¬¤Ë¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤òºîÀ®¤¹¤ë¤³¤È¤Ë¤è¤Ã¤Æ¡¢
+        ¥Ç¥Õ¥©¥ë¥È¥Õ¥©¡¼¥Þ¥Ã¥È¤Ç¤¢¤ë
+        UFS2 ¤Î¿·µ¡Ç½¤Î²¸·Ã¤ò¼õ¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
 
       <para>¸½»þÅÀ¤Î &man.sysinstall.8; ¤Î¥Ð¥¤¥Ê¥ê¥¢¥Ã¥×¥°¥ì¡¼¥Éµ¡Ç½¤Ï¡¢
         ¥á¥¸¥ã¡¼¥Ð¡¼¥¸¥ç¥ó¤ò¤Þ¤¿¤°¥¢¥Ã¥×¥°¥ì¡¼¥É¤ËÂФ·¤Æ
         ½½Ê¬¤Ë»î¸³¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£
         ¤½¤Î¤¿¤á¡¢¤³¤Îµ¡Ç½¤ò»È¤¦¤³¤È¤Ï¤ª¤¹¤¹¤á¤Ç¤­¤Þ¤»¤ó¡£
         ÆÃ¤Ë¡¢¥Ð¥¤¥Ê¥ê¥¢¥Ã¥×¥°¥ì¡¼¥É¤Ï
-        &os; 4.<replaceable>X</replaceable> ¤Ë¸ºß¤·¤Æ
-        &os 5.0 ¤Ë¸ºß¤·¤Ê¤¤¥Õ¥¡¥¤¥ë¤ò¥·¥¹¥Æ¥à¤Ë¿ô¿¤¯»Ä¤·¤Þ¤¹¡£
+        &os; &release.4x; ¤Ë¸ºß¤·¤Æ
+        &os; &release.5x; ¤Ë¸ºß¤·¤Ê¤¤¥Õ¥¡¥¤¥ë¤ò¥·¥¹¥Æ¥à¤Ë¿ô¿¤¯»Ä¤·¤Þ¤¹¡£
         ¤³¤ì¤é¤Î¸Å¤¤¥Õ¥¡¥¤¥ë¤Ï²¿¤é¤«¤ÎÌäÂê¤ò°ú¤­µ¯¤³¤¹²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£</para>
 
       <para>i386 ¤ª¤è¤Ó pc98 ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Î 4-STABLE ¤Ç¤Ï¡¢
@@ -372,7 +413,7 @@
         ¥«¡¼¥Í¥ë¤Ç¤Ï¤Ê¤¯¡¢Ä̾ï¤Î <literal>GENERIC</literal> ¥«¡¼¥Í¥ë¤¬
         »ÈÍѤǤ­¤ë¤È¤¤¤¦ÅÀ¤¬¤¢¤²¤é¤ì¤ë¤Ç¤·¤ç¤¦¡£
         ÍýÏÀŪ¤Ë¤Ï¡¢Microsoft Windows NT 4 ¥¤¥ó¥¹¥È¡¼¥ë CDROM
-        ¤¬µ¯Æ°¤Ç¤­¤ë¥·¥¹¥Æ¥à¤Ê¤é¡¢&os; 5.0 CDROM ¤âưºî¤¹¤ë¤Ï¤º¤Ç¤¹¡£</para>
+        ¤¬µ¯Æ°¤Ç¤­¤ë¥·¥¹¥Æ¥à¤Ê¤é¡¢&os; &release.5x; CDROM ¤âưºî¤¹¤ë¤Ï¤º¤Ç¤¹¡£</para>
     </sect2>
 
     <sect2>
@@ -404,8 +445,8 @@
         ¤â¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¤Î¤Ç¡¢
         ¤³¤ÎÊѹ¹¤Ëµ¤¤Å¤¯¥æ¡¼¥¶¤Ï¤´¤¯°ìÉô¤Ç¤·¤ç¤¦¡£</para>
 
-      <para>´ðËÜŪ¤Ë¡¢½¾Íè¤Î 4.<replaceable>X</replaceable>
-        ¤Ç»È¤Ã¤Æ¤¤¤¿¼Â¹Ô¥Õ¥¡¥¤¥ë¤Ï 5.<replaceable>X</replaceable> ¤Ç¤âưºî¤·¤Þ¤¹¡£
+      <para>´ðËÜŪ¤Ë¡¢½¾Íè¤Î &release.4x;
+        ¤Ç»È¤Ã¤Æ¤¤¤¿¼Â¹Ô¥Õ¥¡¥¤¥ë¤Ï &release.5x; ¤Ç¤âưºî¤·¤Þ¤¹¡£
         ¤¿¤À¤·¡¢¤³¤ì¤Ë¤Ï
         <filename>compat4x</filename> ÇÛÉÛʪ¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤³¤È¤¬É¬ÍפǤ¹¡£
         ¤Ä¤Þ¤ê¡¢¸Å¤¤ ports ¤ò»È¤¦¤³¤È¤Ï<emphasis>¤ª¤½¤é¤¯</emphasis>²Äǽ¤Ç¤¹¡£</para>
@@ -418,16 +459,43 @@
         ¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ò¥ê¥Í¡¼¥à¤·¤Æ¤ª¤¯¤ÈÎɤ¤¤Ç¤·¤ç¤¦¡£
         ¤³¤¦¤·¤Ê¤¤¤È¡¢(ÆÃ¤Ë C++ ¥×¥í¥°¥é¥à¤Ç) ¥³¥ó¥Ñ¥¤¥é¤¬¸Å¤¤¥Ø¥Ã¥À¤È
         ¿·¤·¤¤¥Ø¥Ã¥À¤òº®¤¼¤Æ»ÈÍѤ·¤Æ¤·¤Þ¤¤¡¢¤ª¤«¤·¤Ê·ë²Ì¤Ë¤Ê¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£</para>
+
+      <para><filename>MAKEDEV</filename> ¤¬¤â¤Ï¤äÄ󶡤µ¤ì¤Ê¤¯¤Ê¤ê¡¢
+        ¤Þ¤¿É¬Íפʤ¯¤Ê¤ê¤Þ¤·¤¿¡£
+        FreeBSD &release.5x; ¤Ï¡¢É¬Íפ˱þ¤¸¤Æ¥Ç¥Ð¥¤¥¹¥Î¡¼¥É¤ò¼«Æ°Åª¤ËºîÀ®¤¹¤ë
+        ¥Ç¥Ð¥¤¥¹¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤òÍøÍѤ·¤Æ¤¤¤Þ¤¹¡£
+        ¾ÜºÙ¤Ï &man.devfs.5; ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
+
+      <para>UFS2 ¤¬
+        &man.newfs.8; ¤òÍøÍѤ·¤ÆºîÀ®¤¹¤ë¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î
+        ¥Ç¥Õ¥©¥ë¥È¤Î¥Ç¥£¥¹¥¯¥Õ¥©¡¼¥Þ¥Ã¥È¤Ë¤Ê¤ê¤Þ¤·¤¿¡£
+        ¤Þ¤¿¡¢pc98 ¤ò½ü¤¯¤¹¤Ù¤Æ¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ë¤ª¤¤¤Æ¡¢
+        &man.sysinstall.8; ¤¬¥Ç¥£¥¹¥¯¥é¥Ù¥ëºîÀ®²èÌ̤ǺîÀ®¤¹¤ë
+        ¥Ç¥Õ¥©¥ë¥È¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ë¤Ê¤ê¤Þ¤·¤¿¡£
+        &os; &release.4x; ¤Ï UFS1 ¤Î¤ß¤òǧ¼±¤¹¤ë (UFS2 ¤Ïǧ¼±¤·¤Þ¤»¤ó) ¤Î¤Ç¡¢
+        &release.5x; ¤È &release.4x;
+        ¤ÎξÊý¤¬¥¢¥¯¥»¥¹¤¹¤ëɬÍפΤ¢¤ë¥Ç¥£¥¹¥¯¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ï
+        UFS1 ¤ÇºîÀ®¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
+        ¤³¤ì¤Ï &man.newfs.8; ¤Î <option>-O1</option> ¥ª¥×¥·¥ç¥ó¤òÍøÍѤ¹¤ë¤«
+        &man.sysinstall.8; ¤Î¥Ç¥£¥¹¥¯¥é¥Ù¥ëºîÀ®²èÌ̤ǻؼ¨¤¹¤ë¤³¤È¤Ç
+        »ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+        ¤³¤Î¤è¤¦¤Ê¾õ¶·¤Ï¡¢Ã±°ì¤Î¥Þ¥·¥ó¤Ç
+        &os; &release.5x; ¤È &os; &release.4x;
+        ¤ÎÁÐÊý¤òµ¯Æ°¤¹¤ë¥·¥¹¥Æ¥à¤Ç¤·¤Ð¤·¤ÐȯÀ¸¤·¤Þ¤¹¡£
+        ¥Ç¥£¥¹¥¯¥Õ¥©¡¼¥Þ¥Ã¥È´Ö¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤òÊÑ´¹¤¹¤ëÊýË¡¤Ï
+        (¥Ð¥Ã¥¯¥¢¥Ã¥×¤·¤Æ¡¢¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤òºÆÅÙºîÀ®¤·¡¢
+        ¥Ð¥Ã¥¯¥¢¥Ã¥×¤òŸ³«¤¹¤ë°Ê³°¤Ë) ¸ºß¤·¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
     </sect2>
   </sect1>
 
   <sect1 id="summary">
     <title>¤Þ¤È¤á</title>
 
-    <para>&os; 5.0 ¤Ë¤ÏÌ¥ÎÏŪ¤Êµ¡Ç½¤¬¤¿¤¯¤µ¤ó´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
+    <para>&os; &release.current; ¤Ë¤ÏÌ¥ÎÏŪ¤Êµ¡Ç½¤¬¤¿¤¯¤µ¤ó´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
       ¤·¤«¤·¸½»þÅÀ¤Ç¤Ï¡¢¤½¤ì¤¬¤¹¤Ù¤Æ¤Î³§¤µ¤ó¤Î´üÂԤ˱þ¤¨¤é¤ì¤ë¤â¤Î¤Ç¤Ï¤Ê¤¤¤«¤âÃΤì¤Þ¤»¤ó¡£
       ¤³¤Îʸ½ñ¤Ç¤Ï¡¢¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°¤ÎÇØ·Ê¤È
-      5.<replaceable>X</replaceable> ·ÏÎó¤ÎÆÃÉ®¤¹¤Ù¤­¿·µ¡Ç½¤Î°ìÉô¤Ë¤Ä¤¤¤Æ¡¢
+      &release.5x; ·ÏÎó¤ÎÆÃÉ®¤¹¤Ù¤­¿·µ¡Ç½¤Î°ìÉô¤Ë¤Ä¤¤¤Æ¡¢
       ½é´ü¥ê¥ê¡¼¥¹¤ò»È¤¦¾å¤Ç¤Î¤¤¤¯¤Ä¤«¤Î·çÅÀ¤Ë¤Ä¤¤¤Æ¤È¤ê¤¢¤²¤Þ¤·¤¿¡£
       ¤Þ¤¿¡¢¾­Íè¤Î 4-STABLE ³«È¯¥Ö¥é¥ó¥Á¤Î·×²è¤È¡¢
       ½é´ü¥ê¥ê¡¼¥¹¤òÍøÍѤ¹¤ë¿Í¸þ¤±¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É¤Î¥Ò¥ó¥È¤âÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</para>

==== //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#11 (text+ko) ====

@@ -28,13 +28,13 @@
 	this file to fix "missed" conversions are likely to break the
 	build.
 
-        $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml,v 1.12 2003/04/26 19:48:15 hrs Exp $
-        Original revision: 1.143
+        $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml,v 1.13 2003/05/26 15:32:33 rushani Exp $
+        Original revision: 1.155
 -->
 
 <sect1 id="support">
   <sect1info>
-    <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml,v 1.12 2003/04/26 19:48:15 hrs Exp $</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml,v 1.13 2003/05/26 15:32:33 rushani Exp $</pubdate>
   </sect1info>
 
   <title>Âбþ¥Ï¡¼¥É¥¦¥§¥¢</title>
@@ -94,7 +94,10 @@
 	  <para>Promise Fasttrak-33, -66, -100, -100 TX2/TX4, -133 TX2/TX2000</para>
 	</listitem>
 	<listitem>
-	  <para>Promise Ultra-33, -66, -100, -133 TX2/TX2000</para>
+	  <para>Promise SATA150 TX2/TX4 ¥·¥ê¥¢¥ë ATA/150</para>
+        </listitem>
+	<listitem>
+	  <para>Promise Ultra-33, -66, -100, -133 TX2/TX2000/TX4000</para>
         </listitem>
         <listitem>
           <para>ServerWorks ROSB4 ATA33</para>
@@ -842,10 +845,12 @@
       </itemizedlist>
     </para>
 
-    <para arch="i386,alpha,pc98,sparc64">LSI Logic Fusion/MP
+    <para arch="i386">IBM / Adaptec ServeRAID ¥·¥ê¡¼¥º (ips ¥É¥é¥¤¥Ð)</para>
+
+    <para arch="i386,alpha,pc98,sparc64,ia64">LSI Logic Fusion/MP
 	architecture Fiber Channel controllers (mpt ¥É¥é¥¤¥Ð)
       <itemizedlist>
-	<listitem>
+	<listitem arch="i386,alpha,pc98,sparc64">
 	  <para>LSI FC909, FC929</para>
 	</listitem>
 	<listitem>
@@ -1602,16 +1607,19 @@
 	  <para>Billionton USB100, USB100LP, USB100EL, USBE100</para>
         </listitem>
         <listitem>
-	  <para>Corega Ether FEther USB-TX, FEther USB-TXS</para>
+	  <para>Corega Ether FEther USB-T, FEther USB-TX, FEther USB-TXS</para>
         </listitem>
         <listitem>
 	  <para>D-Link DSB-650, DSB-650TX, DSB-650TX-PNA</para>
         </listitem>
         <listitem>
+	  <para>Elecom LD-USBL/TX</para>
+        </listitem>
+        <listitem>
 	  <para>Elsa Microlink USB2Ethernet</para>
         </listitem>
         <listitem>
-	  <para>I/O Data USB ETTX</para>
+	  <para>I-O Data USB ETTX</para>
         </listitem>
         <listitem>
 	  <para>Kingston KNU101TX</para>
@@ -1620,7 +1628,10 @@
 	  <para>LinkSys USB10T, USB10TA, USB10TX, USB100TX, USB100H1</para>
         </listitem>
         <listitem>
-	  <para>Melco Inc. LUA-TX, LUA2-TX</para>
+	  <para>Melco LUA-TX, LUA2-TX</para>
+        </listitem>
+        <listitem>
+	  <para>Planex UE-200TX</para>
         </listitem>
         <listitem>
 	  <para>Siemens Speedstream</para>
@@ -1700,6 +1711,19 @@
       </itemizedlist>
     </para>
 
+    <para arch="i386,pc98">RealTek RTL8150 ¥Ù¡¼¥¹¤Î USB Ethernet NIC
+      (&man.rue.4; ¥É¥é¥¤¥Ð)
+
+      <itemizedlist>
+        <listitem>
+          <para>GREEN HOUSE GH-USB100B</para>
+        </listitem>
+        <listitem>
+          <para>Melco LUA-KTX</para>
+        </listitem>
+      </itemizedlist>
+    </para>
+
     <para arch="i386,pc98">ASIX Electronics AX88172 ¥Ù¡¼¥¹¤Î USB Ethernet NIC
       (&man.axe.4; ¥É¥é¥¤¥Ð)
 
@@ -1877,7 +1901,7 @@
         <listitem>
           <para>Intel Pro/100 S ¥Ç¥¹¥¯¥È¥Ã¥×¡¢¥µ¡¼¥Ð¡¢¥Ç¥å¥¢¥ë¥Ý¡¼¥È¥µ¡¼¥Ð¥¢¥À¥×¥¿</para>
         </listitem>
-        <listitem>
+        <listitem arch="i386,ia64">
           <para>¿¤¯¤Î Intel À½¥Þ¥¶¡¼¥Ü¡¼¥É¤ËÆâ¢¤µ¤ì¤Æ¤¤¤ë Ethernet NIC</para>
         </listitem>
         <listitem arch="pc98">
@@ -1980,16 +2004,16 @@
         <listitem arch="i386,alpha">
 	  <para>3C575TX/575B/XFE575BT/575C/656/656B/656C (Cardbus)</para>
         </listitem>
-        <listitem arch="i386,alpha">
+        <listitem arch="i386">
 	  <para>Dell Optiplex GX1 Æâ¢¤Î 3C918</para>
         </listitem>
-        <listitem arch="i386,alpha">
+        <listitem arch="i386">
 	  <para>Dell On-board 3C920</para>
         </listitem>
-        <listitem arch="i386,alpha">
+        <listitem arch="i386">
 	  <para>Dell Precision Æâ¢¤Î 3C905B</para>
         </listitem>
-        <listitem arch="i386,alpha">
+        <listitem arch="i386">
 	  <para>Dell Latitude ¥é¥Ã¥×¥È¥Ã¥×¥É¥Ã¥­¥ó¥°¥¹¥Æ¡¼¥·¥ç¥ó¤ËÆâ¢¤µ¤ì¤Æ¤¤¤ë
             3C905-TX</para>
         </listitem>
@@ -2138,12 +2162,12 @@
         <listitem>
 	  <para>SysKonnect SK-9D21 ¤ª¤è¤Ó 9D41</para>
         </listitem>
-        <listitem>
+        <listitem arch="i386">
 	  <para>DELL PowerEdge 2550 ¥µ¡¼¥Ð¤ËÆâ¢¤µ¤ì¤Æ¤¤¤ë
             Gigabit Ethernet NIC</para>
         </listitem>
-        <listitem>
-	  <para>IBM x235 server ¤ËÆâ¢¤µ¤ì¤Æ¤¤¤ë gigabit Ethernet NIC</para>
+        <listitem arch="i386">
+	  <para>IBM x235 server ¤ËÆâ¢¤µ¤ì¤Æ¤¤¤ë Gigabit Ethernet NIC</para>
         </listitem>
       </itemizedlist>
     </para>
@@ -2644,73 +2668,76 @@
       </itemizedlist>
     </para>
 
-    <para arch="i386">PCI ¥Ù¡¼¥¹¤Î¥Þ¥ë¥Á¥Ý¡¼¥È¥·¥ê¥¢¥ë¥Ü¡¼¥É (&man.puc.4;
+    <para arch="i386,ia64">PCI ¥Ù¡¼¥¹¤Î¥Þ¥ë¥Á¥Ý¡¼¥È¥·¥ê¥¢¥ë¥Ü¡¼¥É (&man.puc.4;
       ¥É¥é¥¤¥Ð)
       <itemizedlist>
-	<listitem>
+	<listitem arch="i386">
 	  <para>Actiontech 56K PCI</para>
 	</listitem>
-        <listitem>
+        <listitem arch="i386">
 	  <para>Avlab Technology, PCI IO 2S ¤ª¤è¤Ó PCI IO 4S</para>
 	</listitem>
-	<listitem>
+	<listitem arch="i386">
 	  <para>Comtrol RocketPort 550</para>
 	</listitem>
-	<listitem>
+	<listitem arch="i386">
 	  <para>Decision Computers PCCOM 4-port ¥·¥ê¥¢¥ë¤ª¤è¤Ó¥Ç¥å¥¢¥ë¥Ý¡¼¥È RS232/422/485</para>
 	</listitem>
-	<listitem>

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list