1 |
commit: 88b814fa147ad085a74be4308b4de56de254b19d |
2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Mar 2 08:37:32 2017 +0000 |
4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Mar 2 08:37:32 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=88b814fa |
7 |
|
8 |
Update rnc schemas from dtds. |
9 |
|
10 |
book.rnc | 2 +- |
11 |
glsa.rnc | 3 ++- |
12 |
guide.rnc | 2 +- |
13 |
metadata.rnc | 1 + |
14 |
metadoc.rnc | 12 ++++++------ |
15 |
project.rnc | 2 +- |
16 |
6 files changed, 12 insertions(+), 10 deletions(-) |
17 |
|
18 |
diff --git a/book.rnc b/book.rnc |
19 |
index 51d57b1..bcffc69 100644 |
20 |
--- a/book.rnc |
21 |
+++ b/book.rnc |
22 |
@@ -43,4 +43,4 @@ subsection.attlist &= |
23 |
attribute id { text }?, |
24 |
attribute test { text }? |
25 |
body = element body { body.attlist, (\include | block.class+) } |
26 |
-start = summary | glepindex | included | sections | book |
27 |
+start = sections | book | included | summary | glepindex |
28 |
|
29 |
diff --git a/glsa.rnc b/glsa.rnc |
30 |
index f5adaf7..a9f182a 100644 |
31 |
--- a/glsa.rnc |
32 |
+++ b/glsa.rnc |
33 |
@@ -49,6 +49,7 @@ attlist.synopsis &= empty |
34 |
# infrastructure |
35 |
# |
36 |
# The text contains one keyword that defines the issue. |
37 |
+# Note: All type values but 'ebuild' are considered deprecated. |
38 |
# |
39 |
# Example: <product type="ebuild">openssl</product> |
40 |
# Example: <product type="infrastructure">rsync mirror</product> |
41 |
@@ -87,7 +88,7 @@ attlist.access &= empty |
42 |
# Element: affected |
43 |
# Description: Describe what the affected subjects are. |
44 |
# |
45 |
-# If product@type = 'build', the child elements are 'package' |
46 |
+# If product@type = 'ebuild', the child elements are 'package' |
47 |
# If product@type = 'portage', the child elements are 'package' |
48 |
# If product@type = 'infrastructure', the child elements are |
49 |
# 'service' |
50 |
|
51 |
diff --git a/guide.rnc b/guide.rnc |
52 |
index aaef013..523af1c 100644 |
53 |
--- a/guide.rnc |
54 |
+++ b/guide.rnc |
55 |
@@ -81,4 +81,4 @@ mirrorlist.attlist &= |
56 |
[ a:defaultValue = "full" ] attribute select { "full" | "partial" }? |
57 |
mirrorlist.attlist &= |
58 |
[ a:defaultValue = "/main/en/mirrors3.xml" ] attribute src { text }? |
59 |
-start = guide | included | news | mainpage |
60 |
+start = guide | mainpage | included | news |
61 |
|
62 |
diff --git a/metadata.rnc b/metadata.rnc |
63 |
index 3919793..2ac5f01 100644 |
64 |
--- a/metadata.rnc |
65 |
+++ b/metadata.rnc |
66 |
@@ -83,6 +83,7 @@ attlist.remote-id &= |
67 |
| "ctan" |
68 |
| "freecode" |
69 |
| "freshmeat" |
70 |
+ | "gentoo" |
71 |
| "github" |
72 |
| "gitlab" |
73 |
| "gitorious" |
74 |
|
75 |
diff --git a/metadoc.rnc b/metadoc.rnc |
76 |
index a69bef0..481587c 100644 |
77 |
--- a/metadoc.rnc |
78 |
+++ b/metadoc.rnc |
79 |
@@ -69,12 +69,12 @@ section = |
80 |
body = element body { body.attlist, (\include | block.class+) } |
81 |
chapter |= notAllowed |
82 |
start = |
83 |
- summary |
84 |
- | glepindex |
85 |
- | values |
86 |
- | included |
87 |
- | dynamic |
88 |
+ dynamic |
89 |
| author |
90 |
| license |
91 |
- | abstract |
92 |
+ | values |
93 |
+ | included |
94 |
+ | summary |
95 |
| metadoc |
96 |
+ | abstract |
97 |
+ | glepindex |
98 |
|
99 |
diff --git a/project.rnc b/project.rnc |
100 |
index 6984fa9..6a885a5 100644 |
101 |
--- a/project.rnc |
102 |
+++ b/project.rnc |
103 |
@@ -120,4 +120,4 @@ milestone.attlist &= |
104 |
depends = element depends { depends.attlist, text } |
105 |
depends.attlist &= attribute ref { xsd:IDREF } |
106 |
chapter |= notAllowed |
107 |
-start = values | \include | project | included | license | abstract |
108 |
+start = project | license | values | included | \include | abstract |