DE release notes catchup for RELENG_4_7, Phase 2 of 2, framework fixes:

- remove the localized release.ent from cvs and catalog
- change all articles to use the global release.ent, not the local one
- bring the release.dsl into sync with the english version

Note: There is no phase 3 for the RELENG_4_7 stuff because there have
been no changes to the english release notes except framework stuff

Reviewed by:	re, security-officer
Approved by:	bmah

11 files changed, 13 insertions, 74 deletions

diff --git a/release/doc/de_DE.ISO8859-1/errata/article.sgml b/release/doc/de_DE.ISO8859-1/errata/article.sgml
index 9aee0550dd2e..493f21f2ce15 100644
--- a/release/doc/de_DE.ISO8859-1/errata/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/errata/article.sgml
@@ -21,7 +21,7 @@
 %translators;
 <!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE">
 %mlists;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//DE">
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 
 <!ENTITY release.point "4.6.2-RELEASE">
diff --git a/release/doc/de_DE.ISO8859-1/hardware/alpha/article.sgml b/release/doc/de_DE.ISO8859-1/hardware/alpha/article.sgml
index f7f1d886129c..8277aaf8f287 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/alpha/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/alpha/article.sgml
@@ -1,7 +1,6 @@
 <!--
   $FreeBSD$
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/alpha/article.sgml,v 1.3.2.2 2002/03/17 10:38:45 ue Exp $
-  $Id: article.sgml,v 1.7 2002/03/10 15:37:14 ue Exp $
   basiert auf: 1.1.2.3
 -->
 
@@ -14,7 +13,7 @@
 %translators;
 <!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE">
 %mlists;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//DE">
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
 
diff --git a/release/doc/de_DE.ISO8859-1/hardware/i386/article.sgml b/release/doc/de_DE.ISO8859-1/hardware/i386/article.sgml
index bb99a7ff4bca..851df54a053a 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/i386/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/i386/article.sgml
@@ -1,7 +1,6 @@
 <!--
   $FreeBSD$
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/i386/article.sgml,v 1.2.2.2 2002/03/17 10:38:45 ue Exp $
-  $Id: article.sgml,v 1.4 2002/03/10 15:37:15 ue Exp $
   basiert auf: 1.1.2.3
 -->
 
@@ -12,7 +11,7 @@
 %authors;
 <!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE">
 %mlists;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//DE">
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
 
diff --git a/release/doc/de_DE.ISO8859-1/installation/alpha/article.sgml b/release/doc/de_DE.ISO8859-1/installation/alpha/article.sgml
index 9a3e00f84d8d..abd7920faddf 100644
--- a/release/doc/de_DE.ISO8859-1/installation/alpha/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/installation/alpha/article.sgml
@@ -1,7 +1,6 @@
 <!--
   $FreeBSD$
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/alpha/article.sgml,v 1.2.2.2 2002/03/17 10:38:46 ue Exp $
-  $Id: article.sgml,v 1.3 2002/03/10 15:37:17 ue Exp $
   basiert auf: 1.1.2.3
 -->
 
@@ -12,7 +11,7 @@
 %authors;
 <!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE">
 %mlists;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//DE">
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % sections SYSTEM "../common/install.ent"> %sections;
 
diff --git a/release/doc/de_DE.ISO8859-1/installation/i386/article.sgml b/release/doc/de_DE.ISO8859-1/installation/i386/article.sgml
index e9381070c9f6..8be3545a66f4 100644
--- a/release/doc/de_DE.ISO8859-1/installation/i386/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/installation/i386/article.sgml
@@ -1,7 +1,6 @@
 <!--
   $FreeBSD$
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/i386/article.sgml,v 1.2.2.2 2002/03/17 10:38:47 ue Exp $
-  $Id: article.sgml,v 1.4 2002/03/10 15:37:18 ue Exp $
   basiert auf: 1.1.2.3
 -->
 
@@ -12,7 +11,7 @@
 %authors;
 <!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE">
 %mlists;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//DE">
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % sections SYSTEM "../common/install.ent"> %sections;
 
diff --git a/release/doc/de_DE.ISO8859-1/readme/article.sgml b/release/doc/de_DE.ISO8859-1/readme/article.sgml
index 148095a2dbb3..e0e8a90f7e3d 100644
--- a/release/doc/de_DE.ISO8859-1/readme/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/readme/article.sgml
@@ -12,7 +12,7 @@
 %authors;
 <!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE">
 %mlists;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//DE">
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % misc PUBLIC  "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
 %misc;
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/alpha/article.sgml b/release/doc/de_DE.ISO8859-1/relnotes/alpha/article.sgml
index a3ad9db40e59..1f26902f8451 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/alpha/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/relnotes/alpha/article.sgml
@@ -1,7 +1,6 @@
 <!--
   $FreeBSD$
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/alpha/article.sgml,v 1.2.2.2 2002/03/17 10:38:47 ue Exp $
-  $Id: article.sgml,v 1.3 2002/03/10 15:37:19 ue Exp $
   basiert auf: 1.1.2.3
 -->
 
@@ -12,7 +11,7 @@
 %authors;
 <!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE">
 %mlists;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//DE">
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
 
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/i386/article.sgml b/release/doc/de_DE.ISO8859-1/relnotes/i386/article.sgml
index 5a6afce01acd..3b4203a35ed8 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/i386/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/relnotes/i386/article.sgml
@@ -1,7 +1,6 @@
 <!--
   $FreeBSD$
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/i386/article.sgml,v 1.2.2.2 2002/03/17 10:38:48 ue Exp $
-  $Id: article.sgml,v 1.3 2002/03/10 15:37:20 ue Exp $
   basiert auf: 1.1.2.3
 -->
 
@@ -12,7 +11,7 @@
 %authors;
 <!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE">
 %mlists;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//DE">
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
 
diff --git a/release/doc/de_DE.ISO8859-1/share/sgml/catalog b/release/doc/de_DE.ISO8859-1/share/sgml/catalog
index 45269e79e6dc..dbc45ba9223c 100644
--- a/release/doc/de_DE.ISO8859-1/share/sgml/catalog
+++ b/release/doc/de_DE.ISO8859-1/share/sgml/catalog
@@ -3,13 +3,9 @@
 
   -- $FreeBSD$ --
   -- $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/share/sgml/catalog,v 1.3.2.3 2002/03/12 17:57:15 ue Exp $ --
-  -- $Id: catalog,v 1.3 2002/03/10 15:37:20 ue Exp $ --
   -- basiert auf: 1.1.2.1 --
 
 PUBLIC "-//FreeBSD//DOCUMENT Release Notes DocBook Stylesheet//EN"
        "release.dsl"
 
-PUBLIC "-//FreeBSD//ENTITIES Release Specification//DE"
-       "release.ent"
-
 
diff --git a/release/doc/de_DE.ISO8859-1/share/sgml/release.dsl b/release/doc/de_DE.ISO8859-1/share/sgml/release.dsl
index 9e8db80141f2..c9efc9a8e0b8 100644
--- a/release/doc/de_DE.ISO8859-1/share/sgml/release.dsl
+++ b/release/doc/de_DE.ISO8859-1/share/sgml/release.dsl
@@ -1,8 +1,7 @@
 <!--
 	$FreeBSD$
 	$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/share/sgml/release.dsl,v 1.2.2.3 2002/03/12 15:22:43 ue Exp $
-	$Id: release.dsl,v 1.6 2002/03/10 15:37:20 ue Exp $
-	basiert auf: 1.1.2.5
+	basiert auf: 1.1.2.6.2.1
 -->
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
@@ -39,17 +38,6 @@
                 (literal "> wenden.")
             (make element gi: "p"
                   attributes: (list (list "align" "center"))
-              (make element gi: "small"  
-                (literal "Alle Anwender von FreeBSD ")
-		(literal (entity-text "release.branch"))
-		(literal " sollten sich in die Mailingliste ")
-                (literal "<")
-		(create-link (list (list "HREF" "mailto:stable@FreeBSD.org"))
-                  (literal "stable@FreeBSD.org"))
-                (literal "> eintragen.")))
-
-            (make element gi: "p"
-                  attributes: (list (list "align" "center"))
 	      (literal "Wenn Sie Fragen zu dieser Dokumentation haben, wenden Sie sich an <")
 	      (create-link (list (list "HREF" "mailto:de-bsd-translators@de.FreeBSD.org"))
                 (literal "de-bsd-translators@de.FreeBSD.org"))
@@ -76,14 +64,14 @@
               (("xfree86") (string-append u "&" "manpath=XFree86+4.2.0"))
               (("netbsd")  (string-append u "&" "manpath=NetBSD+1.5"))
               (("ports")   (string-append u "&" "manpath=FreeBSD+Ports"))
-              (else        (string-append u "&" "manpath=FreeBSD+4.6-stable")))))
+              (else        (string-append u "&" "manpath=FreeBSD+4.7-RELEASE")))))
+      ]]>
 
-       (define (toc-depth nd)
-         (if (string=? (gi nd) (normalize "book"))
+      (define (toc-depth nd)
+        (if (string=? (gi nd) (normalize "book"))
             3
             3))
 
-      ]]>
     </style-specification-body>
   </style-specification>
 
diff --git a/release/doc/de_DE.ISO8859-1/share/sgml/release.ent b/release/doc/de_DE.ISO8859-1/share/sgml/release.ent
deleted file mode 100644
index d4480abb57f1..000000000000
--- a/release/doc/de_DE.ISO8859-1/share/sgml/release.ent
+++ /dev/null
@@ -1,39 +0,0 @@
-<!-- -*- sgml -*-
-
-     $FreeBSD$
-     $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/share/sgml/release.ent,v 1.1.2.1 2002/03/12 17:57:15 ue Exp $
-     basiert auf: 1.1.2.8
-
-     OS Release Information -->
-
-<!-- Version of the OS we're describing.  This needs to be updated
-     with each new release. -->
-<!ENTITY release.current "4.5-STABLE">
-
-<!-- The previous version used for comparison in the "What's New"
-     section.  For -STABLE, we might point back to the last
-     branchpoint. -->
-<!ENTITY release.prev "4.5-RELEASE">
-
-<!-- The next version to be released, usually used for snapshots. -->
-<!ENTITY release.next "4.6-RELEASE">
-
-<!-- The name of this branch. -->
-<!ENTITY release.branch "4-STABLE">
-
-<!-- The URL for obtaining this version of FreeBSD. -->
-<!ENTITY release.url "ftp://releng4.FreeBSD.org/pub/FreeBSD/">
-
-<!-- The type of release (usually this will be either "snapshot"
-     or "release" -->
-<!ENTITY release.type "Snapshot">
-<!ENTITY % release.type.snapshot "INCLUDE">
-<!ENTITY % release.type.release "IGNORE">
-
-<!-- Text constants which probably don't need to be changed.-->
-
-<!-- Name of our OS.  This is almost certainly going to remain
-     FreeBSD, but we might want to try to do some other formatting or
-     other fancy markup on it in the future. -->
-<!ENTITY os "FreeBSD">
-