From owner-freebsd-doc@FreeBSD.ORG Sat Jul 24 09:39:33 2004 Return-Path: Delivered-To: freebsd-doc@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AC49B16A4CE; Sat, 24 Jul 2004 09:39:33 +0000 (GMT) Received: from smtp.eos.ocn.ne.jp (eos.ocn.ne.jp [211.6.83.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E21C43D53; Sat, 24 Jul 2004 09:39:33 +0000 (GMT) (envelope-from hrs@FreeBSD.org) Received: from delta.allbsd.org (p25007-adsao12honb4-acca.tokyo.ocn.ne.jp [219.161.86.7]) by smtp.eos.ocn.ne.jp (Postfix) with ESMTP id 909A31FC8; Sat, 24 Jul 2004 18:39:31 +0900 (JST) Received: from localhost (alph.allbsd.org [192.168.0.10]) by delta.allbsd.org (8.12.9p2/8.12.9) with ESMTP id i6O9dBA2071659; Sat, 24 Jul 2004 18:39:12 +0900 (JST) (envelope-from hrs@FreeBSD.org) Date: Sat, 24 Jul 2004 18:37:04 +0900 (JST) Message-Id: <20040724.183704.07580226.hrs@eos.ocn.ne.jp> To: den@FreeBSD.org From: Hiroki Sato In-Reply-To: <20040724.021023.78760665.hrs@eos.ocn.ne.jp> References: <20040719100354.GA90972@hub.freebsd.org> <40FC049D.4010902@FreeBSD.org> <20040724.021023.78760665.hrs@eos.ocn.ne.jp> X-PGPkey-fingerprint: BDB3 443F A5DD B3D0 A530 FFD7 4F2C D3D8 2793 CF2D X-Mailer: Mew version 4.0.65 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Multipart/Signed; protocol="application/pgp-signature"; micalg=pgp-sha1; boundary="--Security_Multipart0(Sat_Jul_24_18_37_04_2004_249)--" Content-Transfer-Encoding: 7bit cc: murray@FreeBSD.org cc: doc@FreeBSD.org cc: hrs@FreeBSD.org Subject: Re: Creating an Admin Handbook X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Jul 2004 09:39:33 -0000 ----Security_Multipart0(Sat_Jul_24_18_37_04_2004_249)-- Content-Type: Multipart/Mixed; boundary="--Next_Part(Sat_Jul_24_18_37_04_2004_124)--" Content-Transfer-Encoding: 7bit ----Next_Part(Sat_Jul_24_18_37_04_2004_124)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Hi, Hiroki Sato wrote in <20040724.021023.78760665.hrs@eos.ocn.ne.jp>: hrs> I will work on the issue this weekend, so could you please hrs> wait? Thanks. Patches are attached. In doc-relative-urls.diff, articles/checkpoint is used for an example. It defines &doc.langcode; in l10n.ent, and it is used for series of the entites &url.books.*; and &url.articles.*; defined in urls.ent. As a result, &url.books.handbook; always points the localized handbook. Since the translation teams often use a link to the original document, &url.books.*.en; are also defined. Comments? What we need to do are: 1) Define doc.langcode in /share/sgml/l10n.ent. When it is not defined, en_US.ISO8859-1 is used by default. (in the case of ja_JP.eucJP, for example, the changes are something like doc-relative-urls-ja.diff). 2) Add URL_RELPREFIX in the Makefile. When it is not defined, absolute URLs are always used. 3) Add l10n.ent and urls.ent in the document preamble. 4) Use &url.*; to point documents in doc/. -- | Hiroki SATO ----Next_Part(Sat_Jul_24_18_37_04_2004_124)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="doc-relative-urls.diff" Index: en_US.ISO8859-1/articles/checkpoint/Makefile =================================================================== RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/checkpoint/Makefile,v retrieving revision 1.6 diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.6 Makefile --- en_US.ISO8859-1/articles/checkpoint/Makefile 6 Apr 2004 16:10:02 -0000 1.6 +++ en_US.ISO8859-1/articles/checkpoint/Makefile 24 Jul 2004 08:58:14 -0000 @@ -13,5 +13,6 @@ SRCS= article.sgml IMAGES_EN= networks.pic +URL_RELPREFIX?= ../../.. DOC_PREFIX?= ${.CURDIR}/../../.. .include "${DOC_PREFIX}/share/mk/doc.project.mk" Index: en_US.ISO8859-1/articles/checkpoint/article.sgml =================================================================== RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/checkpoint/article.sgml,v retrieving revision 1.20 diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.20 article.sgml --- en_US.ISO8859-1/articles/checkpoint/article.sgml 23 Jul 2004 10:43:21 -0000 1.20 +++ en_US.ISO8859-1/articles/checkpoint/article.sgml 24 Jul 2004 09:08:17 -0000 @@ -35,6 +35,10 @@ %trademarks; + +%l10n.ent; + +%urls.ent; ]>
@@ -125,7 +129,7 @@ options IPSEC_DEBUG For instructions on building a custom kernel, refer to the - FreeBSD + FreeBSD handbook. Please note that IP protocol 50 (ESP) and UDP port 500 must be open between the Firewall-1 @@ -421,7 +425,7 @@ The FreeBSD Handbook: VPN over IPsec. - + Index: en_US.ISO8859-1/share/sgml/l10n.ent =================================================================== RCS file: /home/ncvs/doc/en_US.ISO8859-1/share/sgml/l10n.ent,v retrieving revision 1.1 diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 l10n.ent --- en_US.ISO8859-1/share/sgml/l10n.ent 19 Apr 2003 11:39:28 -0000 1.1 +++ en_US.ISO8859-1/share/sgml/l10n.ent 24 Jul 2004 09:09:44 -0000 @@ -7,3 +7,6 @@ + + + Index: share/sgml/urls.ent =================================================================== RCS file: /home/ncvs/doc/share/sgml/urls.ent,v retrieving revision 1.4 diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.4 urls.ent --- share/sgml/urls.ent 7 Jul 2004 11:23:16 -0000 1.4 +++ share/sgml/urls.ent 24 Jul 2004 09:03:40 -0000 @@ -37,16 +37,119 @@ ]]> - - - - ]]> + - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ----Next_Part(Sat_Jul_24_18_37_04_2004_124)-- Content-Type: Text/Plain; charset=iso-2022-jp Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="doc-relative-urls-ja.diff" Index: ja_JP.eucJP/share/sgml/l10n.ent =================================================================== RCS file: /home/ncvs/doc/ja_JP.eucJP/share/sgml/l10n.ent,v retrieving revision 1.1 diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 l10n.ent --- ja_JP.eucJP/share/sgml/l10n.ent 19 Apr 2003 11:39:30 -0000 1.1 +++ ja_JP.eucJP/share/sgml/l10n.ent 24 Jul 2004 08:52:57 -0000 @@ -7,3 +7,6 @@ + + + ----Next_Part(Sat_Jul_24_18_37_04_2004_124)---- ----Security_Multipart0(Sat_Jul_24_18_37_04_2004_249)-- Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (FreeBSD) iD8DBQBBAi3CTyzT2CeTzy0RArlNAJ9b7veQXtDI0M0+cvdgapY8yuYcDwCfclcz 00Ys3XdWzxcj6jIxcix1pUo= =Be3y -----END PGP SIGNATURE----- ----Security_Multipart0(Sat_Jul_24_18_37_04_2004_249)----