[gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /

["Ulrich Müller" <ulm@gentoo.org>]

commit:     c238a3e8fd3240b27f39bb25f3368e36912b71fc
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 25 00:31:52 2022 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 25 00:31:52 2022 +0000
URL:        https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=c238a3e8

mirrors.rnc: Update from DTD

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

 mirrors.rnc | 26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/mirrors.rnc b/mirrors.rnc
index e516d0c..23a8d7d 100644
--- a/mirrors.rnc
+++ b/mirrors.rnc
@@ -1,27 +1,20 @@
-# $Header: /var/cvsroot/gentoo/xml/htdocs/dtd/mirrors.dtd,v 1.3 2009/12/03 09:43:39 robbat2 Exp $
-
 # This file is used for keeping the new mirrors.xml file
 
 # element: mirrors
-# description: A set of mirrorgroups followed by a list of countries with their code
+# description: A set of mirrorgroups
 # example: <mirrors>
 #            <mirrorgroup country="US" region="North America">
 #              ...
 #            </mirrorgroup>
 #            ...
-#            <countries>
-#              <country code="CA">Canada</country>
-#              ...
-#            </countries>
 #          </mirrors>
 
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
-mirrors = element mirrors { attlist.mirrors, mirrorgroup*, countries }
+mirrors = element mirrors { attlist.mirrors, mirrorgroup* }
 attlist.mirrors &= empty
 # element: mirrorgroup
 # description: Group mirrors by region and country.
-#              The country code must exist in //countries/country
 # example: <mirrorgroup region="South America" country="BZ">
 #            <mirror>
 #              ...
@@ -31,7 +24,8 @@ attlist.mirrors &= empty
 mirrorgroup = element mirrorgroup { attlist.mirrorgroup, mirror* }
 attlist.mirrorgroup &=
   attribute region { text },
-  attribute country { xsd:IDREF }
+  attribute country { text },
+  attribute countryname { text }?
 # element: mirror
 # description: One per mirror; name the mirror and provide one or more uris
 # optionally: provide GPS coordinates, a city and a bug id.
@@ -64,16 +58,4 @@ attlist.uri &=
   [ a:defaultValue = "n" ] attribute partial { "Y" | "y" | "N" | "n" }?,
   [ a:defaultValue = "http" ]
   attribute protocol { "http" | "ftp" | "rsync" }?
-# element: countries
-# description: A list of countries with their code and name
-# example: <countries>
-#            <country code="CA">Canada</country>
-#          <countries>
-countries = element countries { attlist.countries, country* }
-attlist.countries &= empty
-# element: country
-# description: A country with its code
-# example: <country code="CA">Canada</country>
-country = element country { attlist.country, text }
-attlist.country &= attribute code { xsd:ID }
 start = mirrors