From owner-p4-projects@FreeBSD.ORG  Wed Dec  8 10:59:13 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B97BF1065670; Wed,  8 Dec 2010 10:59:13 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7B802106566B
	for <perforce@FreeBSD.org>; Wed,  8 Dec 2010 10:59:13 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 4DCA48FC0C
	for <perforce@FreeBSD.org>; Wed,  8 Dec 2010 10:59:13 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id oB8AxDtO064113
	for <perforce@FreeBSD.org>; Wed, 8 Dec 2010 10:59:13 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id oB8AxCuN064110
	for perforce@freebsd.org; Wed, 8 Dec 2010 10:59:12 GMT
	(envelope-from rene@FreeBSD.org)
Date: Wed, 8 Dec 2010 10:59:12 GMT
Message-Id: <201012081059.oB8AxCuN064110@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan <rene@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 186759 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Dec 2010 10:59:14 -0000

http://p4web.freebsd.org/@@186759?ac=10

Change 186759 by rene@rene_acer on 2010/12/08 10:58:26

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#57 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#50 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/freebsd.dsl#2 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/freebsd.dsl#3 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/fjoe.key#2 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/flo.key#1 branch
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#50 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#47 integrate
.. //depot/projects/docproj_nl/share/sgml/freebsd-common.dsl#2 integrate
.. //depot/projects/docproj_nl/share/sgml/freebsd-html.dsl#5 integrate
.. //depot/projects/docproj_nl/share/sgml/freebsd-print.dsl#2 integrate
.. //depot/projects/docproj_nl/www/en/developers.sgml#50 integrate
.. //depot/projects/docproj_nl/www/share/sgml/news.xml#96 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#57 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.316 2010/11/15 13:59:32 rea Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.317 2010/12/07 23:00:15 flo Exp $ -->
 <!--
 	NOTE TO NEW COMMITTERS: Core and committers lists are sorted in
 	alphabetical order by last name. Please keep in mind that fact while
@@ -1467,6 +1467,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.flo;</para>
+    </listitem>
+
+    <listitem>
       <para>&a.glebius;</para>
     </listitem>
 

==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#50 (text+ko) ====

@@ -13,7 +13,7 @@
                  builds for the other languages, and we will poke fun of you
                  in public.
 
-     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.531 2010/11/15 08:49:15 rea Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.532 2010/12/07 23:00:16 flo Exp $
 -->
 
 <!ENTITY a.aaron "Aaron Dalton <email>aaron@FreeBSD.org</email>">
@@ -372,6 +372,8 @@
 
 <!ENTITY a.flathill "Seiichirou Hiraoka <email>flathill@FreeBSD.org</email>">
 
+<!ENTITY a.flo "Florian Smeets <email>flo@FreeBSD.org</email>">
+
 <!ENTITY a.fluffy "Dima Panov <email>fluffy@FreeBSD.org</email>">
 
 <!ENTITY a.flz "Florent Thoumie <email>flz@FreeBSD.org</email>">

==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/freebsd.dsl#2 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/share/sgml/freebsd.dsl,v 1.22 2006/01/22 16:23:01 delphij Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/share/sgml/freebsd.dsl,v 1.23 2010/12/08 06:25:58 hrs Exp $ -->
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 <!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
@@ -14,236 +14,6 @@
 <style-sheet>
   <style-specification use="docbook">
     <style-specification-body>
-      <!-- HTML only .................................................... -->
- 
-      <![ %output.html; [ 
-
-        <!-- Generate links to HTML man pages -->
-        (define %refentry-xref-link% #t)
-
-	(define ($email-footer$)
-          (make sequence
-	    (make element gi: "p"
-                  attributes: (list (list "align" "center"))
-              (make element gi: "small"
-                (literal "This, and other documents, can be downloaded from ")
-		(create-link
-		  (list (list "HREF" "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
-                  (literal "ftp://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 ")
-		(create-link
-		  (list (list "HREF" "http://www.FreeBSD.org/docs.html"))
-                  (literal "documentation"))
-                (literal " before contacting <")
-		(create-link
-		  (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 <")
-		(create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
-                  (literal "doc@FreeBSD.org"))
-	        (literal ">.")))))
-      ]]>
-
-      <!-- More aesthetically pleasing chapter headers for print output --> 
-
-      <![ %output.print.niceheaders; [
-
-      (define niceheader-rule-spacebefore (* (HSIZE 5) %head-before-factor%))
-      (define niceheader-rule-spaceafter 0pt)
-
-      (define ($component-title$)
-	(let* ((info (cond
-		((equal? (gi) (normalize "appendix"))
-		 (select-elements (children (current-node)) (normalize "docinfo")))
-		((equal? (gi) (normalize "article"))
-		 (node-list-filter-by-gi (children (current-node))
-					 (list (normalize "artheader")
-					       (normalize "articleinfo"))))
-		((equal? (gi) (normalize "bibliography"))
-		 (select-elements (children (current-node)) (normalize "docinfo")))
-		((equal? (gi) (normalize "chapter"))
-		 (select-elements (children (current-node)) (normalize "docinfo")))
-		((equal? (gi) (normalize "dedication")) 
-		 (empty-node-list))
-		((equal? (gi) (normalize "glossary"))
-		 (select-elements (children (current-node)) (normalize "docinfo")))
-		((equal? (gi) (normalize "index"))
-		 (select-elements (children (current-node)) (normalize "docinfo")))
-		((equal? (gi) (normalize "preface"))
-		 (select-elements (children (current-node)) (normalize "docinfo")))
-		((equal? (gi) (normalize "reference"))
-		 (select-elements (children (current-node)) (normalize "docinfo")))
-		((equal? (gi) (normalize "setindex"))
-		 (select-elements (children (current-node)) (normalize "docinfo")))
-		(else
-		 (empty-node-list))))
-	 (exp-children (if (node-list-empty? info)
-			   (empty-node-list)
-			   (expand-children (children info) 
-					    (list (normalize "bookbiblio") 
-						  (normalize "bibliomisc")
-						  (normalize "biblioset")))))
-	 (parent-titles (select-elements (children (current-node)) (normalize "title")))
-	 (info-titles   (select-elements exp-children (normalize "title")))
-	 (titles        (if (node-list-empty? parent-titles)
-			    info-titles
-			    parent-titles))
-	 (subtitles     (select-elements exp-children (normalize "subtitle"))))
-    (make sequence
-      (make paragraph
-	font-family-name: %title-font-family%
-	font-weight: 'bold
-	font-size: (HSIZE 4)
-	line-spacing: (* (HSIZE 4) %line-spacing-factor%)
-	space-before: (* (HSIZE 4) %head-before-factor%)
-	start-indent: 0pt
-	first-line-start-indent: 0pt
-	quadding: %component-title-quadding%
-	heading-level: (if %generate-heading-level% 1 0)
-	keep-with-next?: #t
-
-	(if (string=? (element-label) "")
-	    (empty-sosofo)
-	    (literal (gentext-element-name-space (current-node))
-		     (element-label)
-		     (gentext-label-title-sep (gi)))))
-      (make paragraph
-	font-family-name: %title-font-family%
-	font-weight: 'bold
-	font-posture: 'italic
-	font-size: (HSIZE 6)
-	line-spacing: (* (HSIZE 6) %line-spacing-factor%)
-;	space-before: (* (HSIZE 5) %head-before-factor%)
-	start-indent: 0pt
-	first-line-start-indent: 0pt
-	quadding: %component-title-quadding%
-	heading-level: (if %generate-heading-level% 1 0)
-	keep-with-next?: #t
-
-	(if (node-list-empty? titles)
-	    (element-title-sosofo) ;; get a default!
-	    (with-mode component-title-mode
-	      (make sequence
-		(process-node-list titles)))))
-
-      (make paragraph
-	font-family-name: %title-font-family%
-	font-weight: 'bold
-	font-posture: 'italic
-	font-size: (HSIZE 3)
-	line-spacing: (* (HSIZE 3) %line-spacing-factor%)
-	space-before: (* 0.5 (* (HSIZE 3) %head-before-factor%))
-	space-after: (* (HSIZE 4) %head-after-factor%)
-	start-indent: 0pt
-	first-line-start-indent: 0pt
-	quadding: %component-subtitle-quadding%
-	keep-with-next?: #t
-
-	(with-mode component-title-mode
-	  (make sequence
-	    (process-node-list subtitles))))
-
-      (if (equal? (gi) (normalize "index"))
-	(empty-sosofo)
-	(make rule
-	  length: %body-width%
-	  display-alignment: 'start
-	  space-before: niceheader-rule-spacebefore
-	  space-after: niceheader-rule-spaceafter
-	  line-thickness: 0.5pt)))))
-
-      (element authorgroup
-        (empty-sosofo))
-
-      ]]>
-
-      <!-- Print only ................................................... --> 
-
-      <![ %output.print; [
-
-      (define minimal-section-labels #f)
-      (define max-section-level-labels
-        (if minimal-section-labels 3 10))
-
-      (define ($section-title$)
-        (let* ((sect (current-node))
-      	       (info (info-element))
-	       (exp-children (if (node-list-empty? info)
-		 	         (empty-node-list)
-			         (expand-children (children info) 
-					          (list (normalize "bookbiblio") 
-						        (normalize "bibliomisc")
-						        (normalize "biblioset")))))
-	       (parent-titles (select-elements (children sect) (normalize "title")))
-  	       (info-titles   (select-elements exp-children (normalize "title")))
-	       (titles        (if (node-list-empty? parent-titles)
-		   	          info-titles
-			          parent-titles))
-	       (subtitles     (select-elements exp-children (normalize "subtitle")))
-	       (renderas (inherited-attribute-string (normalize "renderas") sect))
-	       (hlevel                          ;; the apparent section level;
-	        (if renderas                    ;; if not real section level,
-  	            (string->number             ;;   then get the apparent level
-	             (substring renderas 4 5))  ;;   from "renderas",
-	            (SECTLEVEL)))               ;; else use the real level
-	       (hs (HSIZE (- 4 hlevel))))
-
-          (make sequence
-            (make paragraph
- 	      font-family-name: %title-font-family%
-	      font-weight:  (if (< hlevel 5) 'bold 'medium)
-	      font-posture: (if (< hlevel 5) 'upright 'italic)
-	      font-size: hs
-	      line-spacing: (* hs %line-spacing-factor%)
-	      space-before: (* hs %head-before-factor%)
-	      space-after: (if (node-list-empty? subtitles)
-	    	  	       (* hs %head-after-factor%)
-	 	  	       0pt)
-	      start-indent: (if (or (>= hlevel 3)
-			            (member (gi) (list (normalize "refsynopsisdiv") 
-					    	       (normalize "refsect1") 
-						       (normalize "refsect2") 
-						       (normalize "refsect3"))))
-	 		        %body-start-indent%
-			        0pt)
-	      first-line-start-indent: 0pt
-	      quadding: %section-title-quadding%
-	      keep-with-next?: #t
-	      heading-level: (if %generate-heading-level% (+ hlevel 1) 0)
-  	      ;; SimpleSects are never AUTO numbered...they aren't hierarchical
-	      (if (> hlevel (- max-section-level-labels 1))
-	          (empty-sosofo)
-	          (if (string=? (element-label (current-node)) "")
-	  	      (empty-sosofo)
-		      (literal (element-label (current-node)) 
-			       (gentext-label-title-sep (gi sect)))))
-	      (element-title-sosofo (current-node)))
-            (with-mode section-title-mode
-	      (process-node-list subtitles))
-            ($section-info$ info))))
-
-      ]]>
-
-      <!-- Both sets of stylesheets ..................................... -->
-
-      (define (local-en-label-title-sep)
-        (list
-          (list (normalize "warning")		": ")
-	  (list (normalize "caution")		": ")
-          (list (normalize "chapter")           "  ")
-          (list (normalize "sect1")             "  ")
-          (list (normalize "sect2")             "  ")
-          (list (normalize "sect3")             "  ")
-          (list (normalize "sect4")             "  ")
-          (list (normalize "sect5")             "  ")
-          ))
-
     </style-specification-body>
   </style-specification>
     

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/freebsd.dsl#3 (text+ko) ====

@@ -1,6 +1,6 @@
 <!--
       The FreeBSD Documentation Project
-      $FreeBSD: doc/nl_NL.ISO8859-1/share/sgml/freebsd.dsl,v 1.10 2008/12/28 12:23:36 rene Exp $
+      $FreeBSD: doc/nl_NL.ISO8859-1/share/sgml/freebsd.dsl,v 1.11 2010/12/08 06:25:59 hrs Exp $
       $FreeBSDnl$
 
       %SOURCE%	en_US.ISO8859-1/share/sgml/freebsd.dsl
@@ -15,19 +15,13 @@
 
 <!ENTITY % output.html  "IGNORE"> 
 <!ENTITY % output.print "IGNORE">
-<!ENTITY % output.print.niceheaders "IGNORE">
 ]>
 
 <style-sheet>
   <style-specification use="docbook">
     <style-specification-body>
-      <!-- HTML only .................................................... -->
- 
       <![ %output.html; [ 
 
-        <!-- Generate links to HTML man pages -->
-        (define %refentry-xref-link% #t)
-
 	(define ($email-footer$)
           (make sequence
 	    (make element gi: "p"
@@ -56,201 +50,6 @@
                   (literal "doc@FreeBSD.org"))
 	        (literal ">.")))))
       ]]>
-
-      <!-- More aesthetically pleasing chapter headers for print output --> 
-
-      <![ %output.print.niceheaders; [
-
-      (define niceheader-rule-spacebefore (* (HSIZE 5) %head-before-factor%))
-      (define niceheader-rule-spaceafter 0pt)
-
-      (define ($component-title$)
-	(let* ((info (cond
-		((equal? (gi) (normalize "appendix"))
-		 (select-elements (children (current-node)) (normalize "docinfo")))
-		((equal? (gi) (normalize "article"))
-		 (node-list-filter-by-gi (children (current-node))
-					 (list (normalize "artheader")
-					       (normalize "articleinfo"))))
-		((equal? (gi) (normalize "bibliography"))
-		 (select-elements (children (current-node)) (normalize "docinfo")))
-		((equal? (gi) (normalize "chapter"))
-		 (select-elements (children (current-node)) (normalize "docinfo")))
-		((equal? (gi) (normalize "dedication")) 
-		 (empty-node-list))
-		((equal? (gi) (normalize "glossary"))
-		 (select-elements (children (current-node)) (normalize "docinfo")))
-		((equal? (gi) (normalize "index"))
-		 (select-elements (children (current-node)) (normalize "docinfo")))
-		((equal? (gi) (normalize "preface"))
-		 (select-elements (children (current-node)) (normalize "docinfo")))
-		((equal? (gi) (normalize "reference"))
-		 (select-elements (children (current-node)) (normalize "docinfo")))
-		((equal? (gi) (normalize "setindex"))
-		 (select-elements (children (current-node)) (normalize "docinfo")))
-		(else
-		 (empty-node-list))))
-	 (exp-children (if (node-list-empty? info)
-			   (empty-node-list)
-			   (expand-children (children info) 
-					    (list (normalize "bookbiblio") 
-						  (normalize "bibliomisc")
-						  (normalize "biblioset")))))
-	 (parent-titles (select-elements (children (current-node)) (normalize "title")))
-	 (info-titles   (select-elements exp-children (normalize "title")))
-	 (titles        (if (node-list-empty? parent-titles)
-			    info-titles
-			    parent-titles))
-	 (subtitles     (select-elements exp-children (normalize "subtitle"))))
-    (make sequence
-      (make paragraph
-	font-family-name: %title-font-family%
-	font-weight: 'bold
-	font-size: (HSIZE 4)
-	line-spacing: (* (HSIZE 4) %line-spacing-factor%)
-	space-before: (* (HSIZE 4) %head-before-factor%)
-	start-indent: 0pt
-	first-line-start-indent: 0pt
-	quadding: %component-title-quadding%
-	heading-level: (if %generate-heading-level% 1 0)
-	keep-with-next?: #t
-
-	(if (string=? (element-label) "")
-	    (empty-sosofo)
-	    (literal (gentext-element-name-space (current-node))
-		     (element-label)
-		     (gentext-label-title-sep (gi)))))
-      (make paragraph
-	font-family-name: %title-font-family%
-	font-weight: 'bold
-	font-posture: 'italic
-	font-size: (HSIZE 6)
-	line-spacing: (* (HSIZE 6) %line-spacing-factor%)
-;	space-before: (* (HSIZE 5) %head-before-factor%)
-	start-indent: 0pt
-	first-line-start-indent: 0pt
-	quadding: %component-title-quadding%
-	heading-level: (if %generate-heading-level% 1 0)
-	keep-with-next?: #t
-
-	(if (node-list-empty? titles)
-	    (element-title-sosofo) ;; get a default!
-	    (with-mode component-title-mode
-	      (make sequence
-		(process-node-list titles)))))
-
-      (make paragraph
-	font-family-name: %title-font-family%
-	font-weight: 'bold
-	font-posture: 'italic
-	font-size: (HSIZE 3)
-	line-spacing: (* (HSIZE 3) %line-spacing-factor%)
-	space-before: (* 0.5 (* (HSIZE 3) %head-before-factor%))
-	space-after: (* (HSIZE 4) %head-after-factor%)
-	start-indent: 0pt
-	first-line-start-indent: 0pt
-	quadding: %component-subtitle-quadding%
-	keep-with-next?: #t
-
-	(with-mode component-title-mode
-	  (make sequence
-	    (process-node-list subtitles))))
-
-      (if (equal? (gi) (normalize "index"))
-	(empty-sosofo)
-	(make rule
-	  length: %body-width%
-	  display-alignment: 'start
-	  space-before: niceheader-rule-spacebefore
-	  space-after: niceheader-rule-spaceafter
-	  line-thickness: 0.5pt)))))
-
-      (element authorgroup
-        (empty-sosofo))
-
-      ]]>
-
-      <!-- Print only ................................................... --> 
-
-      <![ %output.print; [
-
-      (define minimal-section-labels #f)
-      (define max-section-level-labels
-        (if minimal-section-labels 3 10))
-
-      (define ($section-title$)
-        (let* ((sect (current-node))
-      	       (info (info-element))
-	       (exp-children (if (node-list-empty? info)
-		 	         (empty-node-list)
-			         (expand-children (children info) 
-					          (list (normalize "bookbiblio") 
-						        (normalize "bibliomisc")
-						        (normalize "biblioset")))))
-	       (parent-titles (select-elements (children sect) (normalize "title")))
-  	       (info-titles   (select-elements exp-children (normalize "title")))
-	       (titles        (if (node-list-empty? parent-titles)
-		   	          info-titles
-			          parent-titles))
-	       (subtitles     (select-elements exp-children (normalize "subtitle")))
-	       (renderas (inherited-attribute-string (normalize "renderas") sect))
-	       (hlevel                          ;; the apparent section level;
-	        (if renderas                    ;; if not real section level,
-  	            (string->number             ;;   then get the apparent level
-	             (substring renderas 4 5))  ;;   from "renderas",
-	            (SECTLEVEL)))               ;; else use the real level
-	       (hs (HSIZE (- 4 hlevel))))
-
-          (make sequence
-            (make paragraph
- 	      font-family-name: %title-font-family%
-	      font-weight:  (if (< hlevel 5) 'bold 'medium)
-	      font-posture: (if (< hlevel 5) 'upright 'italic)
-	      font-size: hs
-	      line-spacing: (* hs %line-spacing-factor%)
-	      space-before: (* hs %head-before-factor%)
-	      space-after: (if (node-list-empty? subtitles)
-	    	  	       (* hs %head-after-factor%)
-	 	  	       0pt)
-	      start-indent: (if (or (>= hlevel 3)
-			            (member (gi) (list (normalize "refsynopsisdiv") 
-					    	       (normalize "refsect1") 
-						       (normalize "refsect2") 
-						       (normalize "refsect3"))))
-	 		        %body-start-indent%
-			        0pt)
-	      first-line-start-indent: 0pt
-	      quadding: %section-title-quadding%
-	      keep-with-next?: #t
-	      heading-level: (if %generate-heading-level% (+ hlevel 1) 0)
-  	      ;; SimpleSects are never AUTO numbered...they aren't hierarchical
-	      (if (> hlevel (- max-section-level-labels 1))
-	          (empty-sosofo)
-	          (if (string=? (element-label (current-node)) "")
-	  	      (empty-sosofo)
-		      (literal (element-label (current-node)) 
-			       (gentext-label-title-sep (gi sect)))))
-	      (element-title-sosofo (current-node)))
-            (with-mode section-title-mode
-	      (process-node-list subtitles))
-            ($section-info$ info))))
-
-      ]]>
-
-      <!-- Both sets of stylesheets ..................................... -->
-
-      (define (local-en-label-title-sep)
-        (list
-          (list (normalize "warning")		": ")
-	  (list (normalize "caution")		": ")
-          (list (normalize "chapter")           "  ")
-          (list (normalize "sect1")             "  ")
-          (list (normalize "sect2")             "  ")
-          (list (normalize "sect3")             "  ")
-          (list (normalize "sect4")             "  ")
-          (list (normalize "sect5")             "  ")
-          ))
-
     </style-specification-body>
   </style-specification>
 

==== //depot/projects/docproj_nl/share/pgpkeys/fjoe.key#2 (text+ko) ====

@@ -1,37 +1,44 @@
-<!-- $FreeBSD: doc/share/pgpkeys/fjoe.key,v 1.3 2003/05/11 07:37:51 murray Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/fjoe.key,v 1.4 2010/12/07 04:13:29 fjoe Exp $ -->
 <!--
-sh addkey.sh fjoe 414420F4;
+sh addkey.sh fjoe 6B87E212;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
-pub  1024D/414420F4 2003-04-29 Max Khon <fjoe@freebsd.org>
-     Key fingerprint = CE1F 29CA A6BF 2F26 13E8  1B61 62AE 6B8F 4144 20F4
-uid                            Max Khon <fjoe@iclub.nsu.ru>
-sub  1024g/6585039B 2003-04-29
+pub   1024D/6B87E212 2009-02-17
+      Key fingerprint = 124D EC6C 6365 D41A 497A  9C3E FCF3 8708 6B87 E212
+uid                  Max Khon <fjoe@FreeBSD.org>
+uid                  Max Khon <fjoe@samodelkin.net>
+sub   2048g/CB71491D 2009-02-17
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mQGiBD6urdgRBADQpkTC4vQZ0QvJaenfB5vMGNzpxq3shsQD5C/ExNtZ2PTrPe8A
-GAcsNUmZD2O2d0r7VSDmPWQ2zDB8bE+gak1pEmooOZ+lb9t+1UwtkzDWK5MEgbRj
-8dlNEagiWZ70jwbm+q8P09LMmjB2ez3OFpDzROjvA0/rU7FMWlo893aqxwCg+0P1
-d6tf6xfiE0Dgz0h7aoOBNhUEAIds+i+l14zzp5Dg8nVcrp8GhsDhGUERkpmnu4Ks
-iXRAbgnhv7XD1qD4EKagITMXmHQ1A6IXVqGjKuEPW3otOEhOMkfOrvI9TCcp4s7s
-6d4eHt0wgjptmWF4pV8KCjj6hAkakFuli/ZjVMNiGAb3cXVocw/Q847Df6jNI5vp
-OfPtA/9kGOoNIssPPa1Ni0k5MPAXB6jm658pmQShlHv1GCG+tbbzqawvimwcal31
-m20DwVc/ocRQFf0/2Rqx0h9GfU/QtB+uq2qk6HTEvDfzGv7SRpPwx43fscF3Sn8N
-K9VXs4Xtbrs5OYGJAMFOWg5SHd9jddTnViNtJQPGD6Bd12BB1bQcTWF4IEtob24g
-PGZqb2VAaWNsdWIubnN1LnJ1PohXBBMRAgAXBQI+rq3YBQsHCgMEAxUDAgMWAgEC
-F4AACgkQYq5rj0FEIPTqigCg2Qe8X9Qw88N7mk9llaZqs+3A+FkAn0Hy5JfEudVm
-/3rXsNKkDf95Z9cmtBtNYXggS2hvbiA8ZmpvZUBmcmVlYnNkLm9yZz6IVwQTEQIA
-FwUCPq6uzAULBwoDBAMVAwIDFgIBAheAAAoJEGKua49BRCD02zMAmgLFdtcfQwJ3
-ctRFpJf8dHyClNQZAKDzqyItbtqEsWQGgN3QsG9+dpsbmrkBDQQ+rq4AEAQAyLyK
-nyVL7VVb7oJh3n8H6CMXcBy/5OV4bATxxCJLQIP/eJkOWv8H+feYnv8Z1LpMI6CT
-qhtVpobIpejR1CA/jo0NStQ5phhejvg08K+wgLMPFEOCCI/RUdHjNGHW4CXmhy6G
-Pm1PPwBiIJGG2AvZie+7NdYjnyd7Q77lE/bFQV8ABRcD/2B36PEMQJu2HpivP/hU
-15sVnYim3phBpGeYTV4e8PLhx1TFDgxnplBkCrEB24hqIFge5zjDVvJyE6t4Zlkz
-IilsEanYbzBUkO/3qYCnwrUefxLxmzMx3tkNVK9W7Z22j3H6Dtvcxb17kMuJNHoV
-KIufCJXylZFXAp7t03T3uo2miEYEGBECAAYFAj6urgAACgkQYq5rj0FEIPSc0QCg
-3Jjbq8a/pI2C+MXDMrW1sC/PhkQAn3vNQqLa/nntV0b3V4lWRI3wk3k+
-=AcmI
+mQGiBEmbEFERBACe5xJF2u+R6020qrAb42ZcqdTUFDepqVWI/qrxXoEpC+fxAD4x
+9s8zilNIZkG6NVpEr7swAWG3+XMSqM5vdtGDj09JFsGEuREB05JTzIBtqGGKWuEn
+Mhg/3K1ZxPPwAokm0Sr3kiGk0Q0O+dTesc1kq6xjuDYC1CrLKwVewp8GqwCg2irJ
+MsYAfODJFAXdK37hG9T5TB0D/2CqorXSukQ2L4U7aFOYlWtDnY61c+gLC9JKJSD1
+TfNTjlJqfu7/1LqVglFZ54Pp6mXYSheq1N853jBFFKAfByiTvD8BFbUsCue/aJHc
+W+STjM8J9fY+oyi/OMZdgdseQ9fn4Y87sK9As/JsE/z4V+kn0V7+x2mqTJwqsSNe
+1JyPBACeQ+yEVchDkoyK+lPgjHYQIqrPbu4SrRalR/WkAwPE95b3j8RHNsX9PL6T
+J3yDxXTOxQgfoCVhS0KPgLoLKTfRf3CvSZYduFkWJgeCtoKaYn9nBzcnlnCjrGvh
+1bplgiOX/4x07aHEYgVRan1Wed2pPjpT7WWy6NDC0VP2HmvpN7QeTWF4IEtob24g
+PGZqb2VAc2Ftb2RlbGtpbi5uZXQ+iGAEExECACAFAkmbEFECGwMGCwkIBwMCBBUC
+CAMEFgIDAQIeAQIXgAAKCRD884cIa4fiEr9CAKCYt+Yc1AiBqAkz1fwDxLC6Kim4
+LQCfXGLJOc7rvsR7lNT8ftexwa36dq+0G01heCBLaG9uIDxmam9lQEZyZWVCU0Qu
+b3JnPohgBBMRAgAgBQJJmxB0AhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQ
+/POHCGuH4hLIcgCfZ8MJjAT+wFB5DfbtNELP72xoTqoAoNXtUquEkBo3pkt2M089
+xPqKnBDvuQINBEmbEFEQCAD49pzUGeoNT6HqnHx56l/+eqMljCm9OMUpt3CeNU5j
+UisWVb4yv83VP8cliLDYw5pWCm4TTSbsG+OdYrwm2l+lIVIUeST0XMxK4VeoNTJF
+DavUs2r6XS0Lspr60Ynnp8z8bA5/O/C82DB9AGo4dpew6ybQoXRyY3O1JAWBucuh
+Y/ti5hGtKT/n82XHYtD/Z8BcHN6DVEsU+tn6FWeKu1yZqen98ZN/KOO0GhBAgTn0
+AyxVYC7sbsul8OHBgNKhUvukIBIHCjZWPYTqJwrwKwlrGLENiUd0sgcugRP7sEEI
+iGdqT3/uy+IcaKP8iHPWUD3lrqV9d74JXjFu7GZoMId3AAMFB/9MT4CxcJGMBBs6
++icdnFwHIGAxBkUXFCSgQsVr4OyhHx8Ac+WDIIeHLF83kd1PKG+ecAxhxwF+MlgG
+kU/Qk9pVwBJBM/Gs+hrwOQODsf5+sp3CcudICSzAXtzm1A01CQVfqQYCscZDQvW6
+ikJZspLLJkbHG+p103C6xsmcOM3qFJN3erQpwRfhqwvKSwH7/pjxijEc6tvTzj3X
+nW/rAUZIHlB4PzSlLZ4plFLgYMBt73ewlt6lKXmMrnhFwJtcA+2bIQd3dAWo3Eba
+feGK5hqHATowvVgLjx+ihE4TdpA7kXyfZ+nP2bGFaCR8JnWVtKZkTqaWrU9xRPpB
+3YwQNOtBiEkEGBECAAkFAkmbEFECGwwACgkQ/POHCGuH4hLFaQCfbr9tE8O9EUjf
+Mre0CBDDd2Ck2sIAnigLJE2wP8hPmK9bSvzEcd1qKpnT
+=3qdH
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>

==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#50 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.146 2010/11/15 15:11:04 rea Exp $
+     $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.147 2010/12/07 23:00:16 flo Exp $
 -->
 
     <sect2 id="pgpkey-ariff">
@@ -1351,6 +1351,11 @@
       &pgpkey.anray;
     </sect2>
 
+    <sect2 id="pgpkey-flo">
+      <title>&a.flo;</title>
+      &pgpkey.flo;
+    </sect2>
+
     <sect2 id="pgpkey-glebius">
       <title>&a.glebius;</title>
       &pgpkey.glebius;

==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#47 (text+ko) ====

@@ -1,5 +1,5 @@
 
-<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.236 2010/11/15 15:11:04 rea Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.237 2010/12/07 23:00:16 flo Exp $ -->
 <!-- PGP keyblocks -->
 <!ENTITY pgpkey.aaron SYSTEM "aaron.key">
 <!ENTITY pgpkey.ache SYSTEM "ache.key">
@@ -103,6 +103,7 @@
 <!ENTITY pgpkey.fanf SYSTEM "fanf.key">
 <!ENTITY pgpkey.farrokhi SYSTEM "farrokhi.key">
 <!ENTITY pgpkey.fjoe SYSTEM "fjoe.key">
+<!ENTITY pgpkey.flo SYSTEM "flo.key">
 <!ENTITY pgpkey.fluffy SYSTEM "fluffy.key">
 <!ENTITY pgpkey.flz SYSTEM "flz.key">
 <!ENTITY pgpkey.foxfair SYSTEM "foxfair.key">

==== //depot/projects/docproj_nl/share/sgml/freebsd-common.dsl#2 (text+ko) ====

@@ -1,10 +1,13 @@
-<!-- $FreeBSD: doc/share/sgml/freebsd-common.dsl,v 1.1 2008/12/24 17:06:07 hrs Exp $ -->
+<!-- $FreeBSD: doc/share/sgml/freebsd-common.dsl,v 1.2 2010/12/08 06:25:59 hrs Exp $ -->
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 <!ENTITY % freebsd.l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
 %freebsd.l10n;
 <!ENTITY % freebsd.l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
 %freebsd.l10n-common;
+
+<!ENTITY % output.html  "IGNORE"> 
+<!ENTITY % output.print "IGNORE">
 ]>
 
 <style-sheet>
@@ -326,6 +329,18 @@
 		($charseq$)
 		(empty-sosofo))))
 
+      (define (local-en-label-title-sep)
+        (list
+          (list (normalize "warning")		": ")
+	  (list (normalize "caution")		": ")
+          (list (normalize "chapter")           "  ")
+          (list (normalize "sect1")             "  ")
+          (list (normalize "sect2")             "  ")
+          (list (normalize "sect3")             "  ")
+          (list (normalize "sect4")             "  ")
+          (list (normalize "sect5")             "  ")
+          ))
+
     </style-specification-body>
   </style-specification>
 </style-sheet>

==== //depot/projects/docproj_nl/share/sgml/freebsd-html.dsl#5 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/share/sgml/freebsd-html.dsl,v 1.5 2010/08/19 21:27:15 blackend Exp $ -->
+<!-- $FreeBSD: doc/share/sgml/freebsd-html.dsl,v 1.6 2010/12/08 06:25:59 hrs Exp $ -->
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 <!ENTITY % output.html		"IGNORE">
@@ -188,7 +188,7 @@
           ;; /DESC
           ;; AUTHOR N/A
           ;; /REFENTRY
-          #f)
+          #t)
 
         <!-- Specify how to generate the man page link HREF -->
         (define ($create-refentry-xref-link$ #!optional (n (current-node)))
@@ -292,7 +292,6 @@
 	    (if (not (last-sibling? (current-node)))
 	        (literal ", ")
 	        (empty-sosofo))))
-
       ]]>
 
       <!-- HTML with images  ............................................ -->

==== //depot/projects/docproj_nl/share/sgml/freebsd-print.dsl#2 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/share/sgml/freebsd-print.dsl,v 1.1 2008/12/24 17:06:07 hrs Exp $ -->
+<!-- $FreeBSD: doc/share/sgml/freebsd-print.dsl,v 1.2 2010/12/08 06:25:59 hrs Exp $ -->
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 <!ENTITY % output.rtf.images 	"IGNORE">
@@ -226,6 +226,117 @@
 
       ]]>
 
+      <![ %output.print.niceheaders; [
+
+      (define niceheader-rule-spacebefore (* (HSIZE 5) %head-before-factor%))
+      (define niceheader-rule-spaceafter 0pt)
+
+      (define ($component-title$)
+	(let* ((info (cond
+		((equal? (gi) (normalize "appendix"))
+		 (select-elements (children (current-node)) (normalize "docinfo")))
+		((equal? (gi) (normalize "article"))
+		 (node-list-filter-by-gi (children (current-node))
+					 (list (normalize "artheader")
+					       (normalize "articleinfo"))))
+		((equal? (gi) (normalize "bibliography"))
+		 (select-elements (children (current-node)) (normalize "docinfo")))
+		((equal? (gi) (normalize "chapter"))
+		 (select-elements (children (current-node)) (normalize "docinfo")))
+		((equal? (gi) (normalize "dedication")) 
+		 (empty-node-list))
+		((equal? (gi) (normalize "glossary"))
+		 (select-elements (children (current-node)) (normalize "docinfo")))
+		((equal? (gi) (normalize "index"))
+		 (select-elements (children (current-node)) (normalize "docinfo")))
+		((equal? (gi) (normalize "preface"))
+		 (select-elements (children (current-node)) (normalize "docinfo")))
+		((equal? (gi) (normalize "reference"))
+		 (select-elements (children (current-node)) (normalize "docinfo")))
+		((equal? (gi) (normalize "setindex"))
+		 (select-elements (children (current-node)) (normalize "docinfo")))
+		(else
+		 (empty-node-list))))
+	 (exp-children (if (node-list-empty? info)
+			   (empty-node-list)
+			   (expand-children (children info) 
+					    (list (normalize "bookbiblio") 
+						  (normalize "bibliomisc")
+						  (normalize "biblioset")))))
+	 (parent-titles (select-elements (children (current-node)) (normalize "title")))
+	 (info-titles   (select-elements exp-children (normalize "title")))
+	 (titles        (if (node-list-empty? parent-titles)
+			    info-titles
+			    parent-titles))
+	 (subtitles     (select-elements exp-children (normalize "subtitle"))))
+    (make sequence
+      (make paragraph
+	font-family-name: %title-font-family%
+	font-weight: 'bold
+	font-size: (HSIZE 4)
+	line-spacing: (* (HSIZE 4) %line-spacing-factor%)
+	space-before: (* (HSIZE 4) %head-before-factor%)
+	start-indent: 0pt
+	first-line-start-indent: 0pt
+	quadding: %component-title-quadding%
+	heading-level: (if %generate-heading-level% 1 0)
+	keep-with-next?: #t
+
+	(if (string=? (element-label) "")
+	    (empty-sosofo)
+	    (literal (gentext-element-name-space (current-node))
+		     (element-label)
+		     (gentext-label-title-sep (gi)))))
+      (make paragraph
+	font-family-name: %title-font-family%
+	font-weight: 'bold
+	font-posture: 'italic
+	font-size: (HSIZE 6)
+	line-spacing: (* (HSIZE 6) %line-spacing-factor%)
+;	space-before: (* (HSIZE 5) %head-before-factor%)
+	start-indent: 0pt
+	first-line-start-indent: 0pt
+	quadding: %component-title-quadding%
+	heading-level: (if %generate-heading-level% 1 0)
+	keep-with-next?: #t
+
+	(if (node-list-empty? titles)
+	    (element-title-sosofo) ;; get a default!
+	    (with-mode component-title-mode
+	      (make sequence
+		(process-node-list titles)))))
+
+      (make paragraph
+	font-family-name: %title-font-family%
+	font-weight: 'bold
+	font-posture: 'italic
+	font-size: (HSIZE 3)
+	line-spacing: (* (HSIZE 3) %line-spacing-factor%)
+	space-before: (* 0.5 (* (HSIZE 3) %head-before-factor%))
+	space-after: (* (HSIZE 4) %head-after-factor%)
+	start-indent: 0pt
+	first-line-start-indent: 0pt
+	quadding: %component-subtitle-quadding%
+	keep-with-next?: #t
+
+	(with-mode component-title-mode
+	  (make sequence
+	    (process-node-list subtitles))))
+
+      (if (equal? (gi) (normalize "index"))
+	(empty-sosofo)
+	(make rule
+	  length: %body-width%
+	  display-alignment: 'start
+	  space-before: niceheader-rule-spacebefore
+	  space-after: niceheader-rule-spaceafter
+	  line-thickness: 0.5pt)))))
+
+      (element authorgroup
+        (empty-sosofo))
+
+      ]]>
+
       <!-- Print only ................................................... -->
       <![ %output.print; [
         (define withpgpkeys
@@ -445,6 +556,66 @@
 	(define (chunk-parent nd)
 	  (sgml-root-element nd))
 
+      (define minimal-section-labels #f)
+      (define max-section-level-labels
+        (if minimal-section-labels 3 10))
+
+      (define ($section-title$)
+        (let* ((sect (current-node))
+      	       (info (info-element))
+	       (exp-children (if (node-list-empty? info)
+		 	         (empty-node-list)
+			         (expand-children (children info) 
+					          (list (normalize "bookbiblio") 
+						        (normalize "bibliomisc")
+						        (normalize "biblioset")))))
+	       (parent-titles (select-elements (children sect) (normalize "title")))
+  	       (info-titles   (select-elements exp-children (normalize "title")))
+	       (titles        (if (node-list-empty? parent-titles)
+		   	          info-titles
+			          parent-titles))
+	       (subtitles     (select-elements exp-children (normalize "subtitle")))
+	       (renderas (inherited-attribute-string (normalize "renderas") sect))
+	       (hlevel                          ;; the apparent section level;
+	        (if renderas                    ;; if not real section level,
+  	            (string->number             ;;   then get the apparent level
+	             (substring renderas 4 5))  ;;   from "renderas",
+	            (SECTLEVEL)))               ;; else use the real level
+	       (hs (HSIZE (- 4 hlevel))))
+
+          (make sequence
+            (make paragraph
+ 	      font-family-name: %title-font-family%
+	      font-weight:  (if (< hlevel 5) 'bold 'medium)
+	      font-posture: (if (< hlevel 5) 'upright 'italic)
+	      font-size: hs
+	      line-spacing: (* hs %line-spacing-factor%)
+	      space-before: (* hs %head-before-factor%)
+	      space-after: (if (node-list-empty? subtitles)
+	    	  	       (* hs %head-after-factor%)
+	 	  	       0pt)
+	      start-indent: (if (or (>= hlevel 3)
+			            (member (gi) (list (normalize "refsynopsisdiv") 
+					    	       (normalize "refsect1") 
+						       (normalize "refsect2") 
+						       (normalize "refsect3"))))
+	 		        %body-start-indent%
+			        0pt)
+	      first-line-start-indent: 0pt
+	      quadding: %section-title-quadding%
+	      keep-with-next?: #t
+	      heading-level: (if %generate-heading-level% (+ hlevel 1) 0)
+  	      ;; SimpleSects are never AUTO numbered...they aren't hierarchical
+	      (if (> hlevel (- max-section-level-labels 1))
+	          (empty-sosofo)
+	          (if (string=? (element-label (current-node)) "")
+	  	      (empty-sosofo)
+		      (literal (element-label (current-node)) 
+			       (gentext-label-title-sep (gi sect)))))
+	      (element-title-sosofo (current-node)))
+            (with-mode section-title-mode
+	      (process-node-list subtitles))
+            ($section-info$ info))))
       ]]>
 
       <![ %output.print.pdf; [

==== //depot/projects/docproj_nl/www/en/developers.sgml#50 (text+ko) ====

@@ -6,7 +6,7 @@
 us to update author names, or the representation of those names (such
 as adding email addresses), by just editing a single file.
 
-$FreeBSD: www/en/developers.sgml,v 1.274 2010/12/01 15:54:41 ryusuke Exp $
+$FreeBSD: www/en/developers.sgml,v 1.275 2010/12/07 23:09:19 flo Exp $
 
 -->
 
@@ -187,6 +187,7 @@
 <!ENTITY a.fenner "Bill Fenner">
 <!ENTITY a.fjoe "Max Khon">
 <!ENTITY a.flathill "Seiichirou Hiraoka">
+<!ENTITY a.flo "Florian Smeets">
 <!ENTITY a.flz "Florent Thoumie">
 <!ENTITY a.foxfair "Howard F. Hu">
 <!ENTITY a.fsmp "Steve Passe">

==== //depot/projects/docproj_nl/www/share/sgml/news.xml#96 (text+ko) ====

@@ -25,7 +25,7 @@
 <news>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/share/sgml/news.xml,v 1.353 2010/11/15 14:02:28 rea Exp $
+      $FreeBSD: www/share/sgml/news.xml,v 1.354 2010/12/07 23:09:19 flo Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -33,6 +33,17 @@
     <name>2010</name>
 
     <month>
+      <name>12</name>
+
+      <day>
+        <name>7</name>
+	<event>
+	  <p>New committer: <a href="mailto:flo@FreeBSD.org">Florian Smeets</a> (ports)</p>
+	</event>
+      </day>
+    </month>
+
+    <month>
       <name>11</name>
 
       <day>