From owner-freebsd-doc  Tue Jan 30 21:53:46 2001
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 D694A37B503
	for <doc@freebsd.org>; Tue, 30 Jan 2001 21:52:46 -0800 (PST)
Received: (from nik@localhost)
	by nothing-going-on.demon.co.uk (8.11.1/8.11.1) id f0V5p3W13507
	for doc@freebsd.org; Wed, 31 Jan 2001 05:51:03 GMT
	(envelope-from nik)
Date: Wed, 31 Jan 2001 05:51:03 +0000
From: Nik Clayton <nik@freebsd.org>
To: doc@freebsd.org
Subject: Updates to doc/share/sgml/freebsd.dsl
Message-ID: <20010131055103.B13461@canyon.nothing-going-on.org>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="+g7M9IMkV8truYOl"
Content-Disposition: inline
User-Agent: Mutt/1.2.5i
Organization: FreeBSD Project <URL:http://www.freebsd.org/>
Sender: owner-freebsd-doc@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


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

I've got some updates to doc/share/sgml/freebsd.dsl (and it's English
specific counterpart) to run past everyone.

See the attached diff.  Basically;

  1.  Pull out the code to handle <segmentedlist>, as the regular
      stylesheets now do this.

  2.  Slightly change the handling of the footer at the bottom of HTML
      files.  The $email-footer$ function must now make sure the text is
      wrapped inside one or more <p> elements.

  3.  Pull out the broken definitions of *-label-title-sep, and replace
      it with something that doesn't (yet) work, but should do with the
      next version of Norm's stylesheets.

  4.  Pull out all the docinfo stuff, it doesn't work.

  5.  Remove the code that handle's <literallayout>, it's been rolled
      into Norm's stylesheets.

The change to the English specific freebsd.dsl is the second part of the
$email-footer$ change.  It also adds some additional text that (a) tells
the reader that the document can be downloaded from the FTP site, to
hopefully cut down on some of those questions, and (b) includes a
specific link to the other documentation on the web site.

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

--+g7M9IMkV8truYOl
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="dsl.diff"

Index: freebsd.dsl
===================================================================
RCS file: /home/ncvs/doc/share/sgml/freebsd.dsl,v
retrieving revision 1.20
diff -u -r1.20 freebsd.dsl
--- freebsd.dsl	2001/01/08 12:40:52	1.20
+++ freebsd.dsl	2001/01/31 05:29:37
@@ -47,25 +47,6 @@
           ;; Write a manifest?
           #f)
 
-        <!-- Understand <segmentedlist> and related elements.  Simpleminded,
-             and only works for the HTML output. -->
-
-        (element segmentedlist
-          (make element gi: "TABLE"
-            (process-children)))
-
-        (element seglistitem
-          (make element gi: "TR"
-            (process-children)))
-
-        (element seg
-          (make element gi: "TD"
-                attributes: '(("VALIGN" "TOP"))
-            (process-children)))
-
-        <!-- The next two definitions control the appearance of an
-             e-mail footer at the bottom of each page. -->
-
         <!-- This is the text to display at the bottom of each page.
              Defaults to nothing.  The individual stylesheets should
              redefine this as necessary. -->
@@ -88,10 +69,7 @@
               (if nochunks
                   (make empty-element gi: "hr")
                   (empty-sosofo))
-              (make element gi: "p"
-                    attributes: (list (list "align" "center"))
-                  (make element gi: "small"
-                    ($email-footer$))))))
+              ($email-footer$))))
 
       ]]>
 
@@ -283,8 +261,11 @@
       (element (caution para) ($admonpara$))
       (element (caution simpara) ($admonpara$))
 
-      (define en-warning-label-title-sep ": ")
-      (define en-caution-label-title-sep ": ")
+      (define (local-en-label-title-sep)
+        (list
+          (list (normalize "warning")		": ")
+	  (list (normalize "caution")		": ")
+          ))
 
       <!-- Tell the stylesheet about our local customisations -->
       
@@ -317,24 +298,6 @@
                                     (process-node-list (children firstch)))))
                 (process-node-list restch))))
       ]]>
-
-      (element docinfo (process-children))
-
-      (element (docinfo authorgroup) (process-children))
-
-      (element (docinfo date) (process-children))
-
-      <!-- Override literallayout to handle 'class="monospaced"' properly -->
-      (element literallayout 
-	(if (equal? (attribute-string "class") (normalize "monospaced"))
-	  (make sequence
-	    ($verbatim-display$
-             %indent-literallayout-lines%
-             %number-literallayout-lines%))
-          (make sequence
-            ($linespecific-display$
-             %indent-literallayout-lines%
-             %number-literallayout-lines%))))
 
       <!-- Override generate-anchor.  This is used to generate a unique ID for
            each element that can be linked to.  The element-id function calls

--+g7M9IMkV8truYOl
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="dsl2.diff"

Index: freebsd.dsl
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO_8859-1/share/sgml/freebsd.dsl,v
retrieving revision 1.4
diff -u -r1.4 freebsd.dsl
--- freebsd.dsl	2000/09/28 23:29:45	1.4
+++ freebsd.dsl	2001/01/31 05:24:13
@@ -13,17 +13,33 @@
       <![ %output.html; [ 
 	(define ($email-footer$)
           (make sequence
-            (literal "For questions about FreeBSD, e-mail <")
-            (make element gi: "a"
-                  attributes: (list (list "href" "mailto:questions@FreeBSD.org"))
-              (literal "questions@FreeBSD.org"))
-            (literal ">.")
-            (make empty-element gi: "br")
-            (literal "For questions about this documentation, e-mail <")
-              (make element gi: "a"
-                    attributes: (list (list "href" "mailto:doc@FreeBSD.org"))
-                (literal "doc@FreeBSD.org"))
-	      (literal ">."))) 
+	    (make element gi: "p"
+                  attributes: (list (list "align" "center"))
+              (make element gi: "small"
+                (literal "This, and other documents, can be downloaded from ")
+	        (make element gi: "a"
+                      attributes: (list (list "href" "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc"))
+                  (literal "ftp.FreeBSD.org/pub/FreeBSD/doc/"))
+                (literal ".")))
+            (make element gi: "p"
+                  attributes: (list (list "align" "center"))
+              (make element gi: "small"  
+                (literal "For questions about FreeBSD, read the ")
+                (make element gi: "a"
+                      attributes: (list (list "href" "http://www.freebsd.org/docs.html"))
+                  (literal "documentation"))
+                (literal " before contacting <")
+                (make element gi: "a"
+                      attributes: (list (list "href" "mailto:questions@FreeBSD.org"))
+                  (literal "questions@FreeBSD.org"))
+                (literal ">.")
+                (make empty-element gi: "br")
+                (literal "For questions about this documentation, e-mail <")
+                (make element gi: "a"
+                      attributes: (list (list "href" "mailto:doc@FreeBSD.org"))
+                  (literal "doc@FreeBSD.org"))
+	        (literal ">.")))))
+
 
 	<!-- Convert " ... " to `` ... '' in the HTML output. -->
 	(element quote

--+g7M9IMkV8truYOl--


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