Date: Thu, 15 Oct 2009 07:58:01 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r198114 - in head/release/doc: . en_US.ISO8859-1/errata share/mk share/sgml Message-ID: <200910150758.n9F7w1as064193@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Thu Oct 15 07:58:01 2009 New Revision: 198114 URL: http://svn.freebsd.org/changeset/base/198114 Log: Bump version numbers and update descriptions for the 9-CURRENT world. The %[no]include.historic knobs are removed because they are not used for a long time. Modified: head/release/doc/README head/release/doc/en_US.ISO8859-1/errata/article.sgml head/release/doc/share/mk/doc.relnotes.mk head/release/doc/share/sgml/release.dsl head/release/doc/share/sgml/release.ent Modified: head/release/doc/README ============================================================================== --- head/release/doc/README Thu Oct 15 07:47:49 2009 (r198113) +++ head/release/doc/README Thu Oct 15 07:58:01 2009 (r198114) @@ -99,9 +99,10 @@ element will be included. For example: <para arch="sparc64">SPARC64-specific text</para> -The currently-supported architectures are i386, sparc64, and -ia64. An element may appear for multiple architectures by specifying -a comma-separated list of architectures (i.e. arch="sparc64,ia64"). +The currently-supported architectures are amd64, arm, i386, ia64, +pc98, powerpc, and sparc64. An element may appear for multiple +architectures by specifying a comma-separated list of architectures +(i.e. arch="sparc64,ia64"). When creating a translation, make a new directory under this directory with a language code (paralleling the DocProj directory Modified: head/release/doc/en_US.ISO8859-1/errata/article.sgml ============================================================================== --- head/release/doc/en_US.ISO8859-1/errata/article.sgml Thu Oct 15 07:47:49 2009 (r198113) +++ head/release/doc/en_US.ISO8859-1/errata/article.sgml Thu Oct 15 07:58:01 2009 (r198114) @@ -16,7 +16,6 @@ <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN"> %release; -<!ENTITY release.bugfix "5.2.1-RELEASE"> ]> <article> Modified: head/release/doc/share/mk/doc.relnotes.mk ============================================================================== --- head/release/doc/share/mk/doc.relnotes.mk Thu Oct 15 07:47:49 2009 (r198113) +++ head/release/doc/share/mk/doc.relnotes.mk Thu Oct 15 07:58:01 2009 (r198114) @@ -11,23 +11,6 @@ DSLHTML?= ${RELN_ROOT}/share/sgml/defaul DSLPRINT?= ${RELN_ROOT}/share/sgml/default.dsl # -# Tweakable Makefile variables -# -# INCLUDE_HISTORIC Used by relnotes document only. When set, -# causes all release notes entries to be printed, -# even those marked as "historic". If not set -# (the default), only print "non-historic" -# release note entries. To designate a release -# note entry as "historic", add a role="historic" -# attribute to the applicable element(s). -# -.if defined(INCLUDE_HISTORIC) -JADEFLAGS+= -iinclude.historic -.else -JADEFLAGS+= -ino.include.historic -.endif - -# # Automatic device list generation: # .if exists(${RELN_ROOT}/../man4) Modified: head/release/doc/share/sgml/release.dsl ============================================================================== --- head/release/doc/share/sgml/release.dsl Thu Oct 15 07:47:49 2009 (r198113) +++ head/release/doc/share/sgml/release.dsl Thu Oct 15 07:58:01 2009 (r198114) @@ -3,8 +3,6 @@ <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [ <!ENTITY % output.html "IGNORE"> <!ENTITY % output.print "IGNORE"> -<!ENTITY % include.historic "IGNORE"> -<!ENTITY % no.include.historic "IGNORE"> <!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN" CDATA DSSSL> <!ENTITY % release.ent PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN"> %release.ent; @@ -14,14 +12,6 @@ <style-specification use="docbook"> <style-specification-body> -; Configure behavior of this stylesheet -<![ %include.historic; [ - (define %include-historic% #t) -]]> -<![ %no.include.historic; [ - (define %include-historic% #f) -]]> - ; String manipulation functions (define (split-string-to-list STR) ;; return list of STR separated with char #\ or #\, @@ -54,36 +44,6 @@ ((equal? STR (car s)) #t) (else (loop (cdr s)))))) -; Deal with conditional inclusion of text via entities. -(default - (let* ((role (attribute-string (normalize "role"))) - (for-arch (entity-text "arch"))) - (cond - - ;; If role=historic, and we're not printing historic things, then - ;; don't output this element. - ((and (equal? role "historic") - (not %include-historic%)) - (empty-sosofo)) - - ;; None of the above - (else (next-match))))) - -(mode qandatoc - (default - (let* ((role (attribute-string (normalize "role"))) - (for-arch (entity-text "arch"))) - (cond - - ;; If role=historic, and we're not printing historic things, then - ;; don't output this element. - ((and (equal? role "historic") - (not %include-historic%)) - (empty-sosofo)) - - ;; None of the above - (else (next-match)))))) - ; We might have some sect1 level elements where the modification times ; are significant. An example of this is the "What's New" section in ; the release notes. We enable the printing of pubdate entry in @@ -198,7 +158,6 @@ (u (string-append "&release.man.url;?query=" (data r) "&" "sektion=" (data m)))) (case v - (("xfree86") (string-append u "&" "manpath=XFree86+&release.manpath.xfree86;" )) (("xorg") (string-append u "&" "manpath=Xorg+&release.manpath.xorg;" )) (("netbsd") (string-append u "&" "manpath=NetBSD+&release.manpath.netbsd;")) (("ports") (string-append u "&" "manpath=FreeBSD+&release.manpath.freebsd-ports;")) Modified: head/release/doc/share/sgml/release.ent ============================================================================== --- head/release/doc/share/sgml/release.ent Thu Oct 15 07:47:49 2009 (r198113) +++ head/release/doc/share/sgml/release.ent Thu Oct 15 07:58:01 2009 (r198114) @@ -6,23 +6,23 @@ <!-- Version of the OS we're describing. This needs to be updated with each new release. --> -<!ENTITY release.current "8.0-CURRENT"> +<!ENTITY release.current "9.0-CURRENT"> <!-- The previous version used for comparison in the "What's New" section. For -CURRENT, we might point back to the last branchpoint. --> -<!ENTITY release.prev "7.0-RELEASE"> +<!ENTITY release.prev "8.0-RELEASE"> <!-- The previous stable release, useful for pointing user's at the release they SHOULD be running if they don't want the bleeding edge. --> -<!ENTITY release.prev.stable "7.0-RELEASE"> +<!ENTITY release.prev.stable "8.0-RELEASE"> <!-- The next version to be released, usually used for snapshots. --> -<!ENTITY release.next "8.0-RELEASE"> +<!ENTITY release.next "9.0-RELEASE"> <!-- The name of this branch. --> -<!ENTITY release.branch "8-CURRENT"> +<!ENTITY release.branch "9-CURRENT"> <!-- The URL for obtaining this version of FreeBSD. --> <!ENTITY release.url "http://www.FreeBSD.org/snapshots/">; @@ -36,11 +36,10 @@ <!-- The manpaths for man page references --> <!ENTITY release.man.url "http://www.FreeBSD.org/cgi/man.cgi">; -<!ENTITY release.manpath.xfree86 "4.5.0"> -<!ENTITY release.manpath.xorg "7.2"> -<!ENTITY release.manpath.netbsd "3.0"> +<!ENTITY release.manpath.xorg "7.4"> +<!ENTITY release.manpath.netbsd "5.0.1"> <!ENTITY release.manpath.freebsd-ports "Ports"> -<!ENTITY release.manpath.freebsd "8-current"> +<!ENTITY release.manpath.freebsd "9-current"> <!-- Text constants which probably don't need to be changed.-->
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200910150758.n9F7w1as064193>