Update .rnc files for all DTDs and add new files that are now deps.

1 files changed, 9 insertions, 45 deletions

diff --git a/userinfo.rnc b/userinfo.rnc
index 75968df..fa3492c 100644
--- a/userinfo.rnc
+++ b/userinfo.rnc
@@ -1,19 +1,17 @@
-namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
-
-userlist = element userlist { attlist.userlist, user* }
+userlist = element userlist { attlist.userlist, user+ }
 attlist.userlist &= empty
 user =
   element user {
     attlist.user,
     realname,
     pgpkey,
+    alias*,
     email+,
     joined,
-    birthday,
+    retired?,
     status?,
     roles?,
-    location?,
-    address*
+    location?
   }
 attlist.user &= attribute username { xsd:ID }
 realname = element realname { attlist.realname, firstname, familyname }
@@ -24,49 +22,15 @@ familyname = element familyname { attlist.familyname, text }
 attlist.familyname &= attribute sort { text }?
 pgpkey = element pgpkey { attlist.pgpkey, text }
 attlist.pgpkey &= empty
-pgpfingerprint = element pgpfingerprint { attlist.pgpfingerprint, text }
-attlist.pgpfingerprint &= empty
+alias = element alias { attlist.alias, text }
+attlist.alias &= empty
 email = element email { attlist.email, text }
-attlist.email &=
-  attribute role { "primary" | "alias" | "secondary" | "gentoo" }
-# all dates should be DD MMMM YYYY - eg '15 October 2006'
+attlist.email &= empty
+# all dates should be YYYY-MM-DD - eg '2006-11-22'
 joined = element joined { attlist.joined, text }
 attlist.joined &= empty
 retired = element retired { attlist.retired, text }
 attlist.retired &= empty
-birthday = element birthday { attlist.birthday, text }
-attlist.birthday &= empty
-address =
-  element address {
-    attlist.address,
-    street,
-    number,
-    suffix?,
-    zipcode,
-    city,
-    state?,
-    country,
-    formatted?
-  }
-attlist.address &=
-  attribute role { "main" | "work" | "secondary" | "home" }
-street = element street { attlist.street, text }
-attlist.street &= empty
-number = element number { attlist.number, text }
-attlist.number &= empty
-suffix = element suffix { attlist.suffix, text }
-attlist.suffix &= empty
-zipcode = element zipcode { attlist.zipcode, text }
-attlist.zipcode &= empty
-city = element city { attlist.city, text }
-attlist.city &= empty
-state = element state { attlist.state, text }
-attlist.state &= empty
-country = element country { attlist.country, text }
-attlist.country &= attribute fullname { text }?
-formatted = element formatted { attlist.formatted, text }
-attlist.formatted &=
-  [ a:defaultValue = "preserve" ] attribute xml:space { "preserve" }?
 status = element status { attlist.status, text }
 attlist.status &= empty
 roles = element roles { attlist.roles, text }
@@ -77,4 +41,4 @@ location = element location { attlist.location, text }
 attlist.location &=
   attribute latitude { text }?,
   attribute longitude { text }?
-start = retired | userlist | pgpfingerprint
+start = userlist