glsa.rnc, metadata.rnc, repositories.rnc: Update from DTDs

Signed-off-by: Ulrich Müller <ulm@gentoo.org>

3 files changed, 22 insertions, 27 deletions

diff --git a/glsa.rnc b/glsa.rnc
index 2711a6a..b2fbdf4 100644
--- a/glsa.rnc
+++ b/glsa.rnc
@@ -1,5 +1,3 @@
-# $Header: /var/cvsroot/gentoo/xml/htdocs/dtd/glsa.dtd,v 1.17 2008/04/04 17:04:39 neysx Exp $
-
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
 glsa =
@@ -24,8 +22,8 @@ glsa =
   }
 attlist.glsa &= attribute id { text }
 # Element:      title
-# Description:  Provides a 4-5 word description about the advisory 
-# Example:      <title>Buffer overflow vulnerability found in openssl-0.9.5</title> 
+# Description:  Provides a 4-5 word description about the advisory
+# Example:      <title>Buffer overflow vulnerability found in openssl-0.9.5</title>
 title = element title { attlist.title, text }
 attlist.title &= empty
 # Element:      synopsis
@@ -41,11 +39,11 @@ attlist.synopsis &= empty
 # Description:  Defines what type of security announcement this is.
 # 
 #               Valid types are:
-#               - ebuild         A Portage-provided ebuild has a security 
+#               - ebuild         A Portage-provided ebuild has a security
 #                                issue
 #               - informational  This GLSA is purely informational, no Gentoo
 #                                system is affected
-#               - infrastructure The security issue involves the Gentoo 
+#               - infrastructure The security issue involves the Gentoo
 #                                infrastructure
 # 
 #               The text contains one keyword that defines the issue.
@@ -90,25 +88,25 @@ attlist.access &= empty
 # 
 #               If product@type = 'ebuild', the child elements are 'package'
 #               If product@type = 'portage', the child elements are 'package'
-#               If product@type = 'infrastructure', the child elements are 
+#               If product@type = 'infrastructure', the child elements are
 #               'service'
 #
 affected = element affected { attlist.affected, (package* | service*) }
 attlist.affected &= empty
 # Element:      package
-# Description:  Provide all necessary information regarded the affected 
-#               packages. It also contains information about the affected 
+# Description:  Provide all necessary information regarded the affected
+#               packages. It also contains information about the affected
 #               architectures, if automatic updates can be done and the update
 # 
 #               The "update" attribute contains the path to the non-vulnerable
 #               version of the package
 # 
-#               The "auto" attribute contains either "yes" or "no" and tells 
-#               Portage that the package can be updated automatically (to be 
+#               The "auto" attribute contains either "yes" or "no" and tells
+#               Portage that the package can be updated automatically (to be
 #               implemented) without further user interaction
 # 
 #               The "arch" attribute contains either the architecture (as used
-#               by ACCEPT_KEYWORDS) or the "*" value (in case all 
+#               by ACCEPT_KEYWORDS) or the "*" value (in case all
 #               architectures are affected)
 # 
 # Occurrence:   The package element can occur 0, 1 or more times
@@ -131,11 +129,11 @@ attlist.vulnerable &=
   },
   [ a:defaultValue = "*" ] attribute slot { text }?
 # Element:      unaffected
-# Description:  Version of the fixed (or unaffected) package. In case the 
+# Description:  Version of the fixed (or unaffected) package. In case the
 #               package is superseded by another package, you need to
 #               define that package using the "name" attribute.
 # 
-#               The r* range information is revision-specific. For instance, 
+#               The r* range information is revision-specific. For instance,
 #               rge foo-1.2.3-r4  ==  >=foo-1.2.3-r4 && <foo-1.2.4
 # 
 # Example:
@@ -150,7 +148,7 @@ attlist.unaffected &=
 # Element:      service
 # Description:  Provide information about the Gentoo services that are
 #               affected by the security advisory. Portage must be able
-#               to parse this information to make decisions (for instance, 
+#               to parse this information to make decisions (for instance,
 #               ignore an rsync server or a certain distfiles mirror).
 # 
 #               The type attribute can be one of "rsync", "web", "mirror".
@@ -196,7 +194,7 @@ code = element code { attlist.code, text }
 attlist.code &= empty
 # Element:      background
 # Description:  Provides a background of the affected package(s)/service(s)
-#               The background element contains only "<p>"s in which the text 
+#               The background element contains only "<p>"s in which the text
 #               is placed
 #
 background = element background { attlist.background, (p | ul | ol)* }
@@ -208,18 +206,18 @@ description =
   element description { attlist.description, (p | ul | ol | code)* }
 attlist.description &= empty
 # Element:      impact
-# Description:  Provides information about the impact that the security issue 
+# Description:  Provides information about the impact that the security issue
 #               can have
 # 
 #               The "impact" element contains only "<p>"s.
 # 
-#               The type element gives a short term, such as 
+#               The type element gives a short term, such as
 #               "Denial of Service", "Buffer Overflow", ...
 #
 impact = element impact { attlist.impact, (p | ul | ol)* }
 attlist.impact &= attribute type { text }
 # Element:      workaround
-# Description:  Provides information about how the security issue can be 
+# Description:  Provides information about how the security issue can be
 #               (temporarily) resolved through a work-around
 # 
 #               The "workaround" element contains only "<p>"s and "<code>"s.
@@ -227,7 +225,7 @@ workaround =
   element workaround { attlist.workaround, (p | code | ul | ol)* }
 attlist.workaround &= empty
 # Element:      resolution
-# Description:  Provides information about how the security issue can be 
+# Description:  Provides information about how the security issue can be
 #               resolved.
 # 
 #               The "resolution" element contains only "<p>"s and "<code>"s.
@@ -249,7 +247,7 @@ attlist.ul &= empty
 ol = element ol { attlist.ol, li* }
 attlist.ol &= empty
 # Element:      li
-# Description:  Element of a listing 
+# Description:  Element of a listing
 # 
 # Example:    <ul>
 #               <li>This is element one</li>
@@ -272,7 +270,7 @@ attlist.i &= empty
 # Element:      br
 # Description:  hard line break
 # 
-# Example:      And then: <br/> 
+# Example:      And then: <br/>
 #               KABLAM!
 br = element br { attlist.br, text }
 attlist.br &= empty
@@ -287,7 +285,7 @@ attlist.license &= empty
 # 
 # Example:      <metadata tag="approved">Level 1</metadata>
 # 
-# On request of plasmaroo, metadata can contain all elements again. 
+# On request of plasmaroo, metadata can contain all elements again.
 metadata = element metadata { attlist.metadata, (text | metadata)* }
 attlist.metadata &=
   attribute tag { text },
diff --git a/metadata.rnc b/metadata.rnc
index 8deae47..f815278 100644
--- a/metadata.rnc
+++ b/metadata.rnc
@@ -98,7 +98,6 @@ attlist.remote-id &=
     | "gentoo"
     | "github"
     | "gitlab"
-    | "gitorious"
     | "google-code"
     | "heptapod"
     | "launchpad"
diff --git a/repositories.rnc b/repositories.rnc
index 265a371..8c2d469 100644
--- a/repositories.rnc
+++ b/repositories.rnc
@@ -1,9 +1,7 @@
-# $Header
-
 # Used by [gentoo]/xml/htdocs/proj/en/overlays/repositories.xml
 
 # The source copy and history of this file is available from
-# http://git.overlays.gentoo.org/gitweb/?p=proj/repositories-xml-format.git
+# https://gitweb.gentoo.org/proj/repositories-xml-format.git/
 
 # Gentoo repositories.xml DTD 1.0
 #