PERFORCE change 169590 for review
Gabor Pali
pgj at FreeBSD.org
Mon Oct 19 06:46:17 UTC 2009
http://p4web.freebsd.org/chv.cgi?CH=169590
Change 169590 by pgj at beehive on 2009/10/19 06:45:58
IFC
Affected files ...
.. //depot/projects/docproj_hu/src/release/doc/en_US.ISO8859-1/errata/article.sgml#2 integrate
.. //depot/projects/docproj_hu/src/release/doc/share/mk/doc.relnotes.mk#2 integrate
.. //depot/projects/docproj_hu/src/release/doc/share/sgml/release.dsl#2 integrate
.. //depot/projects/docproj_hu/src/release/doc/share/sgml/release.ent#3 integrate
.. //depot/projects/docproj_hu/www/en/administration.sgml#9 integrate
.. //depot/projects/docproj_hu/www/hu/platforms/ppc.sgml#14 integrate
Differences ...
==== //depot/projects/docproj_hu/src/release/doc/en_US.ISO8859-1/errata/article.sgml#2 (text+ko) ====
@@ -16,7 +16,6 @@
<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
%release;
-<!ENTITY release.bugfix "5.2.1-RELEASE">
]>
<article>
@@ -37,7 +36,7 @@
The &os; Project
</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.73 2005/04/19 09:42:25 hrs Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.74 2009/10/15 07:58:01 hrs Exp $</pubdate>
<copyright>
<year>2000</year>
==== //depot/projects/docproj_hu/src/release/doc/share/mk/doc.relnotes.mk#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/doc/share/mk/doc.relnotes.mk,v 1.14 2007/02/16 02:10:12 bmah Exp $
+# $FreeBSD: src/release/doc/share/mk/doc.relnotes.mk,v 1.15 2009/10/15 07:58:01 hrs Exp $
DOC_PREFIX?= ${RELN_ROOT}/../../../doc
@@ -11,23 +11,6 @@
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)
==== //depot/projects/docproj_hu/src/release/doc/share/sgml/release.dsl#2 (text+ko) ====
@@ -1,10 +1,8 @@
-<!-- $FreeBSD: src/release/doc/share/sgml/release.dsl,v 1.13 2008/04/20 18:41:16 hrs Exp $ -->
+<!-- $FreeBSD: src/release/doc/share/sgml/release.dsl,v 1.14 2009/10/15 07:58:01 hrs Exp $ -->
<!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;"))
==== //depot/projects/docproj_hu/src/release/doc/share/sgml/release.ent#3 (text+ko) ====
@@ -1,28 +1,28 @@
<!-- -*- sgml -*-
- $FreeBSD: src/release/doc/share/sgml/release.ent,v 1.33 2008/05/31 13:45:35 hrs Exp $
+ $FreeBSD: src/release/doc/share/sgml/release.ent,v 1.34 2009/10/15 07:58:01 hrs Exp $
OS Release Information -->
<!-- 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.-->
==== //depot/projects/docproj_hu/www/en/administration.sgml#9 (text+ko) ====
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
-<!ENTITY date "$FreeBSD: www/en/administration.sgml,v 1.26 2009/10/06 08:03:43 danger Exp $">
+<!ENTITY date "$FreeBSD: www/en/administration.sgml,v 1.30 2009/10/16 18:31:18 keramida Exp $">
<!ENTITY title "FreeBSD Project Administration and Management">
<!ENTITY % navinclude.about "INCLUDE">
<!ENTITY % developers SYSTEM "developers.sgml"> %developers;
@@ -26,8 +26,6 @@
<li>Release Engineering
<ul>
<li><a href="#t-re">Primary Release Engineering Team</a></li>
- <li><a href="#t-re-alpha">FreeBSD/alpha Release Engineering
- Team</a></li>
<li><a href="#t-re-amd64">FreeBSD/amd64 Release Engineering
Team</a></li>
<li><a href="#t-re-ia64">FreeBSD/ia64 Release Engineering
@@ -118,7 +116,7 @@
<li>&a.nik; <<a href="mailto:nik at FreeBSD.org">nik at FreeBSD.org</a>></li>
<li>&a.blackend; <<a href="mailto:blackend at FreeBSD.org">blackend at FreeBSD.org</a>></li>
<li>&a.hrs; <<a href="mailto:hrs at FreeBSD.org">hrs at FreeBSD.org</a>></li>
- <li>&a.murray; <<a href="mailto:murray at FreeBSD.org">murray at FreeBSD.org</a>></li>
+ <li>&a.keramida; <<a href="mailto:keramida at FreeBSD.org">keramida at FreeBSD.org</a>></li>
</ul>
<h3><a name="t-portmgr">FreeBSD Port Management Team</a>
@@ -151,7 +149,7 @@
<p>The Primary Release Engineering Team is responsible for setting and
publishing release schedules for official project releases of FreeBSD,
- announcing code freezes and maintaining RELENG_* branches, among other
+ announcing code freezes and maintaining <code>RELENG_*</code> branches, among other
things. The <a
href="releng/charter.html">release engineering team charter</a>
describes the duties and responsibilities of the Primary Release
@@ -166,23 +164,11 @@
<li>&a.hrs; <<a href="mailto:hrs at FreeBSD.org">hrs at FreeBSD.org</a>></li>
<li>&a.kensmith; <<a href="mailto:kensmith at FreeBSD.org">kensmith at FreeBSD.org</a>>
(Lead)</li>
- <li>&a.murray; <<a href="mailto:murray at FreeBSD.org">murray at FreeBSD.org</a>></li>
<li>&a.rwatson; <<a href="mailto:rwatson at FreeBSD.org">rwatson at FreeBSD.org</a>></li>
<li>&a.dwhite; <<a href="mailto:dwhite at FreeBSD.org">dwhite at FreeBSD.org</a>></li>
<li>&a.bz; <<a href="mailto:bz at FreeBSD.org">bz at FreeBSD.org</a>></li>
</ul>
- <h3><a name="t-re-alpha">FreeBSD/alpha Release Engineering Team</a>
- <<a href="mailto:re-alpha at FreeBSD.org">re-alpha at FreeBSD.org</a>></h3>
-
- <p>The FreeBSD/alpha Release Engineering Team is responsible for specific
- release issues related to the FreeBSD/alpha platform.</p>
-
- <ul>
- <li>&a.murray; <<a href="mailto:murray at FreeBSD.org">murray at FreeBSD.org</a>></li>
- <li>&a.rwatson; <<a href="mailto:rwatson at FreeBSD.org">rwatson at FreeBSD.org</a>></li>
- </ul>
-
<h3><a name="t-re-amd64">FreeBSD/amd64 Release Engineering Team</a>
<<a href="mailto:re-amd64 at FreeBSD.org">re-amd64 at FreeBSD.org</a>></h3>
@@ -210,7 +196,6 @@
release issues related to the FreeBSD/i386 platform.</p>
<ul>
- <li>&a.murray; <<a href="mailto:murray at FreeBSD.org">murray at FreeBSD.org</a>></li>
<li>&a.rwatson; <<a href="mailto:rwatson at FreeBSD.org">rwatson at FreeBSD.org</a>></li>
</ul>
@@ -247,7 +232,6 @@
<li>&a.tmm; <<a href="mailto:tmm at FreeBSD.org">tmm at FreeBSD.org</a>></li>
<li>&a.obrien; <<a href="mailto:obrien at FreeBSD.org">obrien at FreeBSD.org</a>></li>
<li>&a.kensmith; <<a href="mailto:kensmith at FreeBSD.org">kensmith at FreeBSD.org</a>></li>
- <li>&a.murray; <<a href="mailto:murray at FreeBSD.org">murray at FreeBSD.org</a>></li>
<li>&a.rwatson; <<a href="mailto:rwatson at FreeBSD.org">rwatson at FreeBSD.org</a>></li>
</ul>
==== //depot/projects/docproj_hu/www/hu/platforms/ppc.sgml#14 (text+ko) ====
@@ -1,6 +1,6 @@
<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
<!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/hu/platforms/ppc.sgml,v 1.8 2009/02/23 19:18:03 pgj Exp $">
+<!ENTITY date "$FreeBSD: www/hu/platforms/ppc.sgml,v 1.9 2009/10/14 20:06:01 pgj Exp $">
<!ENTITY title "A &os;/ppc projekt">
<!ENTITY email 'freebsd-ppc'>
<!ENTITY % navinclude.developers "INCLUDE">
More information about the p4-projects
mailing list