commit: 86251a7c37c55cf30fb598c96266093aa47790a7
Author: Diego Elio Pettenò <flameeyes <AT> gmail <DOT> com>
AuthorDate: Wed Mar 9 15:31:03 2011 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 9 15:31:03 2011 +0000
URL:
https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=86251a7c
Update schemas.
book.rnc | 2 +-
guide.rnc | 8 ++++++--
metadata.rnc | 13 ++++++++++++-
userinfo.rnc | 6 +++---
4 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/book.rnc b/book.rnc
index ebec9f6..b7ebf7e 100644
--- a/book.rnc
+++ b/book.rnc
@@ -42,4 +42,4 @@ subsection.attlist &=
attribute id { text }?,
attribute test { text }?
body = element body { body.attlist, (\include | block.class+) }
-start = glepindex | book | included | sections | summary
+start = summary | glepindex | included | sections | book
diff --git a/guide.rnc b/guide.rnc
index 6b5a014..1ef1921 100644
--- a/guide.rnc
+++ b/guide.rnc
@@ -46,7 +46,9 @@ news =
element news { news.attlist, poster, date, title, summary?, body }
news.attlist &=
[ a:defaultValue = "no" ] attribute gentoo { "yes" | "no" }?,
- attribute category { "gentoo" | "main" | "linux" | "moo" | "plans" }
+ attribute category {
+ "gentoo" | "main" | "linux" | "moo" | "plans" | "birthday"
+ }
subtitle = element subtitle { subtitle.attlist, text }
subtitle.attlist &= empty
poster = element poster { poster.attlist, text }
@@ -78,4 +80,6 @@ glsa-latest.attlist &= empty
mirrorlist = element mirrorlist { mirrorlist.attlist, empty }
mirrorlist.attlist &=
[ a:defaultValue = "full" ] attribute select { "full" | "partial" }?
-start = news | included | mainpage | guide
+mirrorlist.attlist &=
+ [ a:defaultValue = "/main/en/mirrors3.xml" ] attribute src { text }?
+start = guide | included | news | mainpage
diff --git a/metadata.rnc b/metadata.rnc
index 4fb8abd..e325a21 100644
--- a/metadata.rnc
+++ b/metadata.rnc
@@ -94,7 +94,18 @@ attlist.bugs-to &= empty
# specify a type of package identification tracker
remote-id = element remote-id { attlist.remote-id, text }
attlist.remote-id &=
- attribute type { "freshmeat" | "sourceforge" | "cpan" | "vim" }
+ attribute type {
+ "freshmeat"
+ | "sourceforge"
+ | "sourceforge-jp"
+ | "cpan"
+ | "vim"
+ | "google-code"
+ | "ctan"
+ | "pypi"
+ | "rubyforge"
+ | "cran"
+ }
# category/package information for cross-linking in descriptions
# and useflag descriptions
pkg = element pkg { attlist.pkg, text }
diff --git a/userinfo.rnc b/userinfo.rnc
index fa3492c..54a1305 100644
--- a/userinfo.rnc
+++ b/userinfo.rnc
@@ -4,11 +4,11 @@ user =
element user {
attlist.user,
realname,
- pgpkey,
+ pgpkey+,
alias*,
email+,
- joined,
- retired?,
+ joined*,
+ retired*,
status?,
roles?,
location?
