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

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

commit:     88b814fa147ad085a74be4308b4de56de254b19d
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  2 08:37:32 2017 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Mar  2 08:37:32 2017 +0000
URL:        https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=88b814fa

Update rnc schemas from dtds.

 book.rnc     |  2 +-
 glsa.rnc     |  3 ++-
 guide.rnc    |  2 +-
 metadata.rnc |  1 +
 metadoc.rnc  | 12 ++++++------
 project.rnc  |  2 +-
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/book.rnc b/book.rnc
index 51d57b1..bcffc69 100644
--- a/book.rnc
+++ b/book.rnc
@@ -43,4 +43,4 @@ subsection.attlist &=
   attribute id { text }?,
   attribute test { text }?
 body = element body { body.attlist, (\include | block.class+) }
-start = summary | glepindex | included | sections | book
+start = sections | book | included | summary | glepindex

diff --git a/glsa.rnc b/glsa.rnc
index f5adaf7..a9f182a 100644
--- a/glsa.rnc
+++ b/glsa.rnc
@@ -49,6 +49,7 @@ attlist.synopsis &= empty
 #                                infrastructure
 # 
 #               The text contains one keyword that defines the issue.
+#               Note: All type values but 'ebuild' are considered deprecated.
 # 
 # Example: <product type="ebuild">openssl</product>
 # Example: <product type="infrastructure">rsync mirror</product>
@@ -87,7 +88,7 @@ attlist.access &= empty
 # Element:      affected
 # Description:  Describe what the affected subjects are.
 # 
-#               If product@type = 'build', the child elements are 'package'
+#               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 
 #               'service'

diff --git a/guide.rnc b/guide.rnc
index aaef013..523af1c 100644
--- a/guide.rnc
+++ b/guide.rnc
@@ -81,4 +81,4 @@ mirrorlist.attlist &=
   [ a:defaultValue = "full" ] attribute select { "full" | "partial" }?
 mirrorlist.attlist &=
   [ a:defaultValue = "/main/en/mirrors3.xml" ] attribute src { text }?
-start = guide | included | news | mainpage
+start = guide | mainpage | included | news

diff --git a/metadata.rnc b/metadata.rnc
index 3919793..2ac5f01 100644
--- a/metadata.rnc
+++ b/metadata.rnc
@@ -83,6 +83,7 @@ attlist.remote-id &=
     | "ctan"
     | "freecode"
     | "freshmeat"
+    | "gentoo"
     | "github"
     | "gitlab"
     | "gitorious"

diff --git a/metadoc.rnc b/metadoc.rnc
index a69bef0..481587c 100644
--- a/metadoc.rnc
+++ b/metadoc.rnc
@@ -69,12 +69,12 @@ section =
 body = element body { body.attlist, (\include | block.class+) }
 chapter |= notAllowed
 start =
-  summary
-  | glepindex
-  | values
-  | included
-  | dynamic
+  dynamic
   | author
   | license
-  | abstract
+  | values
+  | included
+  | summary
   | metadoc
+  | abstract
+  | glepindex

diff --git a/project.rnc b/project.rnc
index 6984fa9..6a885a5 100644
--- a/project.rnc
+++ b/project.rnc
@@ -120,4 +120,4 @@ milestone.attlist &=
 depends = element depends { depends.attlist, text }
 depends.attlist &= attribute ref { xsd:IDREF }
 chapter |= notAllowed
-start = values | \include | project | included | license | abstract
+start = project | license | values | included | \include | abstract