Merge the following from the English version:

1.117 -> 1.121	authors.ent
	1.292 -> 1.296	contrib/chapter.sgml
	1.154 -> 1.158	staff/chapter.sgml
This commit is contained in:
Hiroki Sato 2000-10-03 11:08:48 +00:00
parent f5f4ee3395
commit 7f08322d60
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=8083
5 changed files with 45 additions and 40 deletions
ja_JP.eucJP
articles/contributing
books/handbook
share/sgml

View file

@ -2,8 +2,8 @@
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
Original revision: 1.292
$FreeBSD: doc/ja_JP.eucJP/books/handbook/contrib/chapter.sgml,v 1.45 2000/09/16 16:07:14 hrs Exp $
Original revision: 1.296
$FreeBSD: doc/ja_JP.eucJP/books/handbook/contrib/chapter.sgml,v 1.46 2000/09/28 14:13:31 hrs Exp $
-->
<chapter id="contrib">
@ -2126,7 +2126,7 @@ Copyright (C) [ǯ]
</listitem>
<listitem>
<para>David A. Bader <email>dbader@umiacs.umd.edu</email></para>
<para>David A. Bader <email>dbader@eece.unm.edu</email></para>
</listitem>
<listitem>
@ -2938,10 +2938,6 @@ Copyright (C) [ǯ]
<para>James da Silva <email>jds@cs.umd.edu</email></para>
</listitem>
<listitem>
<para>James Housley <email>jim@thehousleys.net</email></para>
</listitem>
<listitem>
<para>James Jegers <email>jimj@miller.cs.uwm.edu</email></para>
</listitem>
@ -3683,11 +3679,6 @@ Copyright (C) [ǯ]
<para>Marcin Cieslak <email>saper@system.pl</email></para>
</listitem>
<listitem>
<para>Mario Sergio Fujikawa Ferreira
<email>lioux@gns.com.br</email></para>
</listitem>
<listitem>
<para>Mark Andrews <email>unknown</email></para>
</listitem>
@ -5564,10 +5555,6 @@ Copyright (C) [ǯ]
<para>Trevor Blackwell <email>tlb@viaweb.com</email></para>
</listitem>
<listitem>
<para>Trevor Johnson <email>trevor@jpj.net</email></para>
</listitem>
<listitem>
<para>Udo Schweigert <email>ust@cert.siemens.de</email></para>
</listitem>

View file

@ -2,9 +2,9 @@
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
Original revision: 1.117
Original revision: 1.121
$FreeBSD: doc/ja_JP.eucJP/books/handbook/authors.ent,v 1.37 2000/09/15 07:43:07 hrs Exp $
$FreeBSD: doc/ja_JP.eucJP/books/handbook/authors.ent,v 1.38 2000/09/28 14:13:29 hrs Exp $
Names and email address of contributing authors and CVS committers.
Entity names for committers should be the same as their login names on
@ -237,6 +237,8 @@
<!ENTITY a.jedgar "Chris D. Faulhaber <email>jedgar@FreeBSD.org</email>">
<!ENTITY a.jeh "James Housley <email>jeh@FreeBSD.org</email>">
<!ENTITY a.jehamby "Jake Hamby <email>jehamby@lightside.com</email>">
<!ENTITY a.jesusr "Jesus Rodriguez <email>jesusr@FreeBSD.org</email>">
@ -315,6 +317,8 @@
<!ENTITY a.lile "Larry Lile <email>lile@FreeBSD.org</email>">
<!ENTITY a.lioux "M&aacute;rio S&eacute;rgio Fujikawa Ferreira<email>lioux@FreeBSD.org</email>">
<!ENTITY a.ljo "L Jonas Olsson <email>ljo@FreeBSD.org</email>">
<!ENTITY a.luoqi "Luoqi Chen <email>luoqi@FreeBSD.org</email>">
@ -440,6 +444,8 @@
<!ENTITY a.sada "º´ÅÄ ·û¼£ <email>sada@FreeBSD.org</email>">
<!ENTITY a.sanpei "»°Ê¿ Á±Ïº <email>sanpei@FreeBSD.org</email>">
<!ENTITY a.scottl "Scott Long <email>scottl@FreeBSD.org</email>">
<!ENTITY a.scrappy "Marc G. Fournier <email>scrappy@FreeBSD.org</email>">
@ -493,7 +499,9 @@
<!ENTITY a.torstenb "Torsten Blum <email>torstenb@FreeBSD.org</email>">
<!ENTITY a.toshi "Toshihiko Arai <email>toshi@FreeBSD.org</email>">
<!ENTITY a.toshi "¿·°æ ÍøÉ§ <email>toshi@FreeBSD.org</email>">
<!ENTITY a.trevor "Trevor Johnson <email>trevor@FreeBSD.org</email>">
<!ENTITY a.truckman "Don &ldquo;Truck&rdquo; Lewis <email>truckman@FreeBSD.org</email>">

View file

@ -2,8 +2,8 @@
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
Original revision: 1.292
$FreeBSD: doc/ja_JP.eucJP/books/handbook/contrib/chapter.sgml,v 1.45 2000/09/16 16:07:14 hrs Exp $
Original revision: 1.296
$FreeBSD: doc/ja_JP.eucJP/books/handbook/contrib/chapter.sgml,v 1.46 2000/09/28 14:13:31 hrs Exp $
-->
<chapter id="contrib">
@ -2126,7 +2126,7 @@ Copyright (C) [ǯ]
</listitem>
<listitem>
<para>David A. Bader <email>dbader@umiacs.umd.edu</email></para>
<para>David A. Bader <email>dbader@eece.unm.edu</email></para>
</listitem>
<listitem>
@ -2938,10 +2938,6 @@ Copyright (C) [ǯ]
<para>James da Silva <email>jds@cs.umd.edu</email></para>
</listitem>
<listitem>
<para>James Housley <email>jim@thehousleys.net</email></para>
</listitem>
<listitem>
<para>James Jegers <email>jimj@miller.cs.uwm.edu</email></para>
</listitem>
@ -3683,11 +3679,6 @@ Copyright (C) [ǯ]
<para>Marcin Cieslak <email>saper@system.pl</email></para>
</listitem>
<listitem>
<para>Mario Sergio Fujikawa Ferreira
<email>lioux@gns.com.br</email></para>
</listitem>
<listitem>
<para>Mark Andrews <email>unknown</email></para>
</listitem>
@ -5564,10 +5555,6 @@ Copyright (C) [ǯ]
<para>Trevor Blackwell <email>tlb@viaweb.com</email></para>
</listitem>
<listitem>
<para>Trevor Johnson <email>trevor@jpj.net</email></para>
</listitem>
<listitem>
<para>Udo Schweigert <email>ust@cert.siemens.de</email></para>
</listitem>

View file

@ -2,8 +2,8 @@
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
Original revision: 1.154
$FreeBSD: doc/ja_JP.eucJP/books/handbook/staff/chapter.sgml,v 1.33 2000/09/15 07:43:11 hrs Exp $
Original revision: 1.158
$FreeBSD: doc/ja_JP.eucJP/books/handbook/staff/chapter.sgml,v 1.34 2000/09/28 14:13:32 hrs Exp $
-->
<appendix id="staff">
@ -289,6 +289,10 @@
<para>&a.fenner;</para>
</listitem>
<listitem>
<para>&a.lioux;</para>
</listitem>
<listitem>
<para>&a.jfieber;</para>
</listitem>
@ -913,6 +917,17 @@
<para>&a.jmz;</para>
</listitem>
<listitem>
<para>&a.scottl;</para>
</listitem>
<listitem>
<para>&a.jeh;</para>
</listitem>
<listitem>
<para>&a.trevor;</para>
</listitem>
</itemizedlist>
</sect1>

View file

@ -2,9 +2,9 @@
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
Original revision: 1.117
Original revision: 1.121
$FreeBSD: doc/ja_JP.eucJP/books/handbook/authors.ent,v 1.37 2000/09/15 07:43:07 hrs Exp $
$FreeBSD: doc/ja_JP.eucJP/books/handbook/authors.ent,v 1.38 2000/09/28 14:13:29 hrs Exp $
Names and email address of contributing authors and CVS committers.
Entity names for committers should be the same as their login names on
@ -237,6 +237,8 @@
<!ENTITY a.jedgar "Chris D. Faulhaber <email>jedgar@FreeBSD.org</email>">
<!ENTITY a.jeh "James Housley <email>jeh@FreeBSD.org</email>">
<!ENTITY a.jehamby "Jake Hamby <email>jehamby@lightside.com</email>">
<!ENTITY a.jesusr "Jesus Rodriguez <email>jesusr@FreeBSD.org</email>">
@ -315,6 +317,8 @@
<!ENTITY a.lile "Larry Lile <email>lile@FreeBSD.org</email>">
<!ENTITY a.lioux "M&aacute;rio S&eacute;rgio Fujikawa Ferreira<email>lioux@FreeBSD.org</email>">
<!ENTITY a.ljo "L Jonas Olsson <email>ljo@FreeBSD.org</email>">
<!ENTITY a.luoqi "Luoqi Chen <email>luoqi@FreeBSD.org</email>">
@ -440,6 +444,8 @@
<!ENTITY a.sada "º´ÅÄ ·û¼£ <email>sada@FreeBSD.org</email>">
<!ENTITY a.sanpei "»°Ê¿ Á±Ïº <email>sanpei@FreeBSD.org</email>">
<!ENTITY a.scottl "Scott Long <email>scottl@FreeBSD.org</email>">
<!ENTITY a.scrappy "Marc G. Fournier <email>scrappy@FreeBSD.org</email>">
@ -493,7 +499,9 @@
<!ENTITY a.torstenb "Torsten Blum <email>torstenb@FreeBSD.org</email>">
<!ENTITY a.toshi "Toshihiko Arai <email>toshi@FreeBSD.org</email>">
<!ENTITY a.toshi "¿·°æ ÍøÉ§ <email>toshi@FreeBSD.org</email>">
<!ENTITY a.trevor "Trevor Johnson <email>trevor@FreeBSD.org</email>">
<!ENTITY a.truckman "Don &ldquo;Truck&rdquo; Lewis <email>truckman@FreeBSD.org</email>">