Update metadata.rnc from DTD.nxml-gentoo-schemas-20160506

1 files changed, 19 insertions, 22 deletions

diff --git a/metadata.rnc b/metadata.rnc
index 2ed65b0..3919793 100644
--- a/metadata.rnc
+++ b/metadata.rnc
@@ -10,12 +10,7 @@ attlist.catmetadata &=
 pkgmetadata =
   element pkgmetadata {
     attlist.pkgmetadata,
-    (maintainer
-     | natural-name
-     | longdescription
-     | slots
-     | use
-     | upstream)*
+    (maintainer | longdescription | slots | use | upstream)*
   }
 attlist.pkgmetadata &=
   [ a:defaultValue = "" ] attribute pkgname { text }?
@@ -30,9 +25,6 @@ maintainer =
 attlist.maintainer &=
   [ a:defaultValue = "unknown" ]
   attribute type { "person" | "project" | "unknown" }?
-# Natural name for package, example: LibreOffice (for app-office/libreoffice)
-natural-name = element natural-name { attlist.natural-name, text }
-attlist.natural-name &= empty
 #  A long description of the package in freetext
 longdescription =
   element longdescription {
@@ -42,7 +34,10 @@ longdescription =
 slots = element slots { attlist.slots, slot*, subslots? }
 # A particular SLOT
 slot = element slot { attlist.slot, text* }
-# name attribute holds the name of the SLOT, for sub-SLOTS use the subslots element
+# name attribute holds the name of the SLOT, for sub-SLOTS
+# use the subslots element. A slot name of '*' can be used to
+# indicate a single description applying to all the slots in which
+# case no other <slot/> elements may be present.
 attlist.slot &= attribute name { text }
 # The meaning of sub-SLOTs for the whole package
 subslots = element subslots { attlist.subslots, text* }
@@ -71,7 +66,7 @@ changelog = element changelog { attlist.changelog, text }
 attlist.changelog &= empty
 # URL where the location of the upstream documentation can be found
 doc = element doc { attlist.doc, text }
-attlist.doc &= [ a:defaultValue = "C" ] attribute lang { text }?
+attlist.doc &= [ a:defaultValue = "en" ] attribute lang { text }?
 # location where to report bugs
 # (may also be an email address prefixed with mailto:)
 bugs-to = element bugs-to { attlist.bugs-to, text }
@@ -110,20 +105,22 @@ cat = element cat { attlist.cat, text }
 attlist.cat &= empty
 # Common attributes
 
-# the lang attribute, specifies the language of this tag. This is 
-# only useful for descriptions of various kinds. If a tag with this 
-# attribute is included there must be a description in the default 
-# language "C" or "en", which is equivalent
-attlist.description &= [ a:defaultValue = "C" ] attribute lang { text }?
+# the lang attribute, specifies the language of this tag in the
+# form of a ISO 639-1 language code. This is only useful for
+# descriptions of various kinds. If a tag with this attribute is
+# included there must be a description in the default language "en"
+attlist.description &=
+  [ a:defaultValue = "en" ] attribute lang { text }?
 attlist.longdescription &=
-  [ a:defaultValue = "C" ] attribute lang { text }?
-attlist.slots &= [ a:defaultValue = "C" ] attribute lang { text }?
-attlist.use &= [ a:defaultValue = "C" ] attribute lang { text }?
+  [ a:defaultValue = "en" ] attribute lang { text }?
+attlist.slots &= [ a:defaultValue = "en" ] attribute lang { text }?
+attlist.use &= [ a:defaultValue = "en" ] attribute lang { text }?
 # The restrict attribute, this attribute specifies restrictions on 
 # the applicability of tags on versions. The format of this attribute is 
-# equal to the format of DEPEND lines in ebuilds. There is one special 
-# value though: restrict="*". A tag that specifies this only applies if 
-# there are no other tags that apply.
+# equal to the format of DEPEND lines in ebuilds. Only package
+# dependency specifications conforming to EAPI=0 syntax are allowed.
+# The dependency specification may only contain references to the
+# package itself and no other package.
 # 
 # For required tags, there must be either an unrestricted version, or a 
 # version that is default restricted.