From owner-doc-jp@jp.freebsd.org  Fri Feb  2 23:43:02 2001
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id XAA58841;
	Fri, 2 Feb 2001 23:43:02 +0900 (JST)
	(envelope-from owner-doc-jp@jp.FreeBSD.org)
Received: from eos.ocn.ne.jp (eos.ocn.ne.jp [210.190.142.171])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id XAA58836
	for <doc-jp@jp.freebsd.org>; Fri, 2 Feb 2001 23:43:02 +0900 (JST)
	(envelope-from hrs@eos.ocn.ne.jp)
Received: from mail.hrslab.yi.org (p0649-ip01funabasi.chiba.ocn.ne.jp [61.119.147.141])
	by eos.ocn.ne.jp (8.9.1a/OCN/) with ESMTP id XAA26192
	for <doc-jp@jp.freebsd.org>; Fri, 2 Feb 2001 23:43:00 +0900 (JST)
Received: from localhost (alph.hrslab.yi.org [192.168.0.10])
	by mail.hrslab.yi.org (8.9.3/3.7W/DomainMaster) with ESMTP id XAA05507
	for <doc-jp@jp.freebsd.org>; Fri, 2 Feb 2001 23:42:05 +0900 (JST)
	(envelope-from hrs@eos.ocn.ne.jp)
Date: Fri, 02 Feb 2001 23:38:55 +0900 (JST)
Message-Id: <20010202.233855.74751837.hrs@eos.ocn.ne.jp>
To: doc-jp@jp.freebsd.org
From: Hiroki Sato <hrs@eos.ocn.ne.jp>
X-Mailer: Mew version 1.95b101 on Emacs 20.7 / Mule 4.0 (HANANOEN)
Mime-Version: 1.0
Content-Type: Multipart/Mixed;
 boundary="--Next_Part(Fri_Feb__2_23:38:55_2001_031)--"
Content-Transfer-Encoding: 7bit
Reply-To: doc-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+000315
X-Sequence: doc-jp 7964
Subject: [doc-jp 7964] Fw: Basing freebsd.dtd on DocBook 4.1
Errors-To: owner-doc-jp@jp.freebsd.org
Sender: owner-doc-jp@jp.freebsd.org
X-Originator: hrs@eos.ocn.ne.jp

----Next_Part(Fri_Feb__2_23:38:55_2001_031)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit

$B:4F#!wEl5~M}2JBg3X$G$9!#(B

 -doc $B$G(B DocBook V3.1 -> V4.1 $B$N0\9TOC$,=P$F$$$^$9$N$G!"(B
 $B0l1~!"$3$A$i$K$b2s$7$F$*$-$^$9!#(B

  # $B%^!<%/%"%C%W$,<c43JQ99$K$J$kDxEY$G!"(B
  # $BBg$-$J1F6A$O$J$$$G$7$g$&!"B?J,!#(B

----Next_Part(Fri_Feb__2_23:38:55_2001_031)--
Content-Type: Message/Rfc822

Return-Path: owner-freebsd-doc@FreeBSD.ORG
Received: from castle.jp.freebsd.org (castle.jp.FreeBSD.org [210.226.20.15])
	by eos.ocn.ne.jp (8.9.1a/OCN/) with ESMTP id OAA21340
	for <hrs@eos.ocn.ne.jp>; Wed, 31 Jan 2001 14:53:11 +0900 (JST)
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id OAA35142;
	Wed, 31 Jan 2001 14:53:08 +0900 (JST)
	(envelope-from owner-freebsd-doc@FreeBSD.ORG)
Received: from hub.freebsd.org (hub.FreeBSD.org [216.136.204.18])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 217026E2814; Tue, 30 Jan 2001 21:53:05 -0800 (PST)
Received: by hub.freebsd.org (Postfix, from userid 538)
	id C124237B65D; Tue, 30 Jan 2001 21:53:04 -0800 (PST)
Received: from localhost (localhost [127.0.0.1])
	by hub.freebsd.org (Postfix) with SMTP
	id B7FEB2E81BD; Tue, 30 Jan 2001 21:53:04 -0800 (PST)
Received: by hub.freebsd.org (bulk_mailer v1.12); Tue, 30 Jan 2001 21:53:04 -0800
Delivered-To: freebsd-doc@freebsd.org
Received: from nothing-going-on.demon.co.uk (nothing-going-on.demon.co.uk [193.237.89.66])
	by hub.freebsd.org (Postfix) with ESMTP id 0C26E37B4EC
	for <doc@freebsd.org>; Tue, 30 Jan 2001 21:52:40 -0800 (PST)
Received: (from nik@localhost)
	by nothing-going-on.demon.co.uk (8.11.1/8.11.1) id f0V5ihZ13487
	for doc@freebsd.org; Wed, 31 Jan 2001 05:44:43 GMT
	(envelope-from nik)
Date: Wed, 31 Jan 2001 05:44:43 +0000
From: Nik Clayton <nik@freebsd.org>
To: doc@freebsd.org
Subject: Basing freebsd.dtd on DocBook 4.1
Message-ID: <20010131054443.A13461@canyon.nothing-going-on.org>
Content-Type: multipart/mixed; boundary="pf9I7BMVVzbSWLtt"
Content-Disposition: inline
User-Agent: Mutt/1.2.5i
Organization: FreeBSD Project <URL:http://www.freebsd.org/>
Sender: owner-freebsd-doc@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk
Mime-Version: 1.0 (modified by Mew)


--pf9I7BMVVzbSWLtt
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hi folks,

I think it's time to consider basing the FreeBSD Docbook customisation
layer on DocBook 4.1, rather than 3.1.

Rather than suggest that we cut all documentation over at once, I'm
planning on

  1.  Committing doc/share/sgml/freebsd41.dtd.  This will be based on 
      the existing freebsd.dtd, but with a couple of minor changes.
      The first patch attached to this message contains those changes.

  2.  Update doc/share/sgml/catalog to list the new FPI.  The second
      patch contains that change.

  3.  Work through the documentation set, changing them from using 3.1
      to 4.1, changing some of the markup as necessary (where elements
      were renamed, removed, or the content model was altered).  I've
      attached a patch to the Committer's Guide document, which shows
      the sorts of changes that will be necessary.

Any thoughts, or objections?

N
-- 
Internet connection, $19.95 a month.  Computer, $799.95.  Modem, $149.95.
Telephone line, $24.95 a month.  Software, free.  USENET transmission,
hundreds if not thousands of dollars.  Thinking before posting, priceless.
Somethings in life you can't buy.  For everything else, there's MasterCard.
  -- Graham Reed, in the Scary Devil Monastery

--pf9I7BMVVzbSWLtt
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=diff41

--- freebsd.dtd	Sun Jan 14 17:13:33 2001
+++ freebsd41.dtd	Wed Jan 31 05:40:31 2001
@@ -1,11 +1,11 @@
 <!-- FreeBSD Documentation Project, Extended DocBook DTD
 
-     This DTD builds upon the DocBook 3.1 DTD. It extends it in order to
+     This DTD builds upon the DocBook 4.1 DTD. It extends it in order to
      add some new elements.
 
      The comment style and section headings are drawn from the DocBook DTD.
 
-     The FPI for this DTD is "-//FreeBSD//DTD DocBook V3.1-Based Extension//EN"
+     The FPI for this DTD is "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN"
 
      $FreeBSD: doc/share/sgml/freebsd.dtd,v 1.8 2001/01/06 18:26:11 alex Exp $
 -->
@@ -30,9 +30,6 @@
 
 <!ENTITY % local.cptr.char.mix "|CO">
 
-<!ENTITY % local.notation.class "|PNG">
-<!NOTATION PNG SYSTEM "PNG">
-
 <!-- OS Version attributes ...............................................
 
      Each element has three attributes which specify which version(s) of
@@ -67,8 +64,10 @@
 <!ENTITY dollar "$">
 ]]>
 
+<!ENTITY % filename.element "IGNORE">
+
 <!-- Pull in the original DTD -->
-<!ENTITY % orig-docbook PUBLIC "-//OASIS//DTD DocBook V3.1//EN">
+<!ENTITY % orig-docbook PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
 %orig-docbook;
 
 <!-- ...................................................................... -->
@@ -111,6 +110,14 @@
 <!ATTLIST MakeVar
                 %common.attrib;
 >
+
+<!-- The content model for <filename> was changed between DocBook 3.1 and
+     4.1.  Specifically, <envar> was disallowed.  There's a suggestion from
+     the DocBook maintainers that this may have been a mistake.  In the
+     meantime, explicitly allow it here. 
+
+     In addition, allow our custom addition, <makevar> -->
+<!ELEMENT Filename - - (%smallcptr.char.mix;|Envar|MakeVar)+>
 
 <!-- ...................................................................... -->
 <!-- General entities for reuse ........................................... -->

--pf9I7BMVVzbSWLtt
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="catalog.patch"

Index: catalog
===================================================================
RCS file: /home/ncvs/doc/share/sgml/catalog,v
retrieving revision 1.13
diff -u -r1.13 catalog
--- catalog	2001/01/06 18:39:27	1.13
+++ catalog	2001/01/14 17:14:25
@@ -14,6 +14,9 @@
 PUBLIC "-//FreeBSD//DTD DocBook V3.1-Based Extension//EN" 
        "freebsd.dtd"
 
+PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN"
+	"freebsd41.dtd"
+
 PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN" 
        "man-refs.ent"
 

--pf9I7BMVVzbSWLtt
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="article.patch"

Index: article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v
retrieving revision 1.49
diff -u -r1.49 article.sgml
--- article.sgml	2001/01/25 00:09:15	1.49
+++ article.sgml	2001/01/31 05:29:54
@@ -1,4 +1,4 @@
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V3.1-Based Extension//EN" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
 %man;
 
@@ -10,7 +10,7 @@
 ]>
 
 <article>
-  <artheader>
+  <articleinfo>
     <title>Committer Guide</title>
 
     <authorgroup>
@@ -34,7 +34,7 @@
 	start, and existing committers are strongly encouraged to review it
 	from time to time.</para>
     </abstract>
-  </artheader>
+  </articleinfo>
 
   <sect1 id="admin">
     <title>Administrative Details</title>
@@ -1968,6 +1968,9 @@
 	    file.</para>
 
 	  <segmentedlist>
+	    <segtitle>Revision number</segtitle>
+	    <segtitle>Change</segtitle>
+	    
 	    <seglistitem>
 	      <seg>1.1.1.1</seg>
 	      <seg>vendor import</seg>

--pf9I7BMVVzbSWLtt--


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-doc" in the body of the message


----Next_Part(Fri_Feb__2_23:38:55_2001_031)----
