summaryrefslogtreecommitdiffstats
path: root/release/doc/share
diff options
context:
space:
mode:
Diffstat (limited to 'release/doc/share')
-rw-r--r--release/doc/share/sgml/release.dsl49
-rw-r--r--release/doc/share/sgml/release.ent31
2 files changed, 55 insertions, 25 deletions
diff --git a/release/doc/share/sgml/release.dsl b/release/doc/share/sgml/release.dsl
index dd6ac3e..4a19a83 100644
--- a/release/doc/share/sgml/release.dsl
+++ b/release/doc/share/sgml/release.dsl
@@ -121,7 +121,14 @@
((or (equal? arch #f)
(equal? arch "")
(equal? arch "all"))
- (process-children-trim))
+ (make sequence
+ (if (and (not (null? role)) (equal? role "7.1"))
+ (literal " [7.1R]")
+ (empty-sosofo))
+ (if (and (not (null? role)) (equal? role "7.2"))
+ (literal " [7.2R]")
+ (empty-sosofo))
+ (process-children-trim))
(else
(make sequence
(literal "[")
@@ -135,6 +142,12 @@
(loop (car rest) (cdr rest)))
(empty-sosofo))))
(literal "] ")
+ (if (and (not (null? role)) (equal? role "7.1"))
+ (literal " [7.1R] ")
+ (empty-sosofo))
+ (if (and (not (null? role)) (equal? role "7.2"))
+ (literal " [7.2R] ")
+ (empty-sosofo))
(process-children-trim))))
(if (and (not (null? role)) (equal? role "merged"))
(literal " [" merged-string "]")
@@ -158,7 +171,14 @@
((or (equal? arch #f)
(equal? arch "")
(equal? arch "all"))
- (process-children-trim))
+ (make sequence
+ (if (and (not (null? role)) (equal? role "7.1"))
+ (literal " [7.1R] ")
+ (empty-sosofo))
+ (if (and (not (null? role)) (equal? role "7.2"))
+ (literal " [7.2R] ")
+ (empty-sosofo))
+ (process-children-trim)))
(else
(make sequence
(literal "[")
@@ -172,10 +192,16 @@
(loop (car rest) (cdr rest)))
(empty-sosofo))))
(literal "] ")
+ (if (and (not (null? role)) (equal? role "7.1"))
+ (literal " [7.1R]")
+ (empty-sosofo))
+ (if (and (not (null? role)) (equal? role "7.2"))
+ (literal " [7.2R]")
+ (empty-sosofo))
(process-children-trim))))
(if (and (not (null? role)) (equal? role "merged"))
(literal " [" merged-string "]")
- (empty-sosofo)))))))
+ (empty-sosofo))))))))
]]>
<![ %output.html; [
@@ -198,7 +224,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;"))
@@ -226,10 +251,24 @@
((or (equal? arch #f)
(equal? arch "")
(equal? arch "all"))
- (process-children))
+ (make sequence
+ (if (and (not (null? role)) (equal? role "7.1"))
+ (literal " [7.1R] ")
+ (empty-sosofo))
+ (if (and (not (null? role)) (equal? role "7.2"))
+ (literal " [7.2R] ")
+ (empty-sosofo))
+ (process-children)))
(else
(sosofo-append
(make sequence
+ (make sequence
+ (if (and (not (null? role)) (equal? role "7.1"))
+ (literal " [7.1R] ")
+ (empty-sosofo))
+ (if (and (not (null? role)) (equal? role "7.2"))
+ (literal " [7.2R] ")
+ (empty-sosofo)))
(literal "[")
(let loop ((prev (car (split-string-to-list arch)))
(rest (cdr (split-string-to-list arch))))
diff --git a/release/doc/share/sgml/release.ent b/release/doc/share/sgml/release.ent
index 03017d5..c931155 100644
--- a/release/doc/share/sgml/release.ent
+++ b/release/doc/share/sgml/release.ent
@@ -6,41 +6,35 @@
<!-- 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 "8.0-RELEASE">
<!-- 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">
-<!-- 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">
-
<!-- The next version to be released, usually used for snapshots. -->
-<!ENTITY release.next "8.0-RELEASE">
+<!ENTITY release.next "8.1-RELEASE">
<!-- The name of this branch. -->
-<!ENTITY release.branch "8-CURRENT">
+<!ENTITY release.branch "8-STABLE">
<!-- The URL for obtaining this version of FreeBSD. -->
-<!ENTITY release.url "http://www.FreeBSD.org/snapshots/">
+<!ENTITY release.url "ftp://ftp.FreeBSD.org/">
<!-- The type of release (usually this will be either "snapshot"
or "release" -->
-<!ENTITY release.type "snapshot">
-<!ENTITY % release.type.current "INCLUDE">
+<!ENTITY release.type "release">
+<!ENTITY % release.type.current "IGNORE">
<!ENTITY % release.type.snapshot "IGNORE">
-<!ENTITY % release.type.release "IGNORE">
+<!ENTITY % release.type.release "INCLUDE">
<!-- 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 "8.0-RELEASE">
<!-- Text constants which probably don't need to be changed.-->
@@ -54,11 +48,8 @@
<!ENTITY arch.arm "arm">
<!ENTITY arch.i386 "i386">
<!ENTITY arch.ia64 "ia64">
-<!ENTITY arch.mips "mips">
+<!ENTITY arch.mips "MIPS">
<!ENTITY arch.pc98 "pc98">
<!ENTITY arch.powerpc "powerpc">
<!ENTITY arch.sparc64 "sparc64">
<!ENTITY arch.sun4v "sun4v">
-
-<!-- The marker for MFCs. -->
-<!ENTITY merged "MERGED">
OpenPOWER on IntegriCloud