Permalink
Browse files

Fixed RFE 3174769, add securitycontext and other to systemitem

  • Loading branch information...
ndw committed Apr 19, 2011
1 parent 09af271 commit bcebc1eadb64a9cb0768bf2d018835ab3690031d
Showing with 80 additions and 2 deletions.
  1. +23 −2 relaxng/docbook/src/technical.rnc
  2. +57 −0 relaxng/tools/rng2dtd/overrides/docbook.xml
@@ -86,6 +86,8 @@ div {
"protocol"
| ## A resource
"resource"
| ## A security context (a role, permission, or security token, for example)
"securitycontext"
| ## A server (mail.example.com)
"server"
| ## A service (ppp)
@@ -95,11 +97,30 @@ div {
| ## A user name (ndw)
"username"
db.systemitem.class.attribute =
db.systemitem.class-enum.attribute =
[
db:refpurpose [ "Identifies the nature of the system item" ]
]
attribute class { db.systemitem.class.enumeration }
attribute class { db.systemitem.class.enumeration } ?
db.systemitem.class-other.attribute =
[
db:refpurpose [ "Identifies the nature of the non-standard system item" ]
]
attribute otherclass { xsd:NMTOKEN }
db.systemitem.class-other.attributes =
[
db:refpurpose [ "Identifies the kind of systemitemgraphic identifier" ]
]
attribute class {
## Indicates that the system item is some 'other' kind.
"other"
}
& db.systemitem.class-other.attribute
db.systemitem.class.attribute =
(db.systemitem.class-enum.attribute | db.systemitem.class-other.attributes)
db.systemitem.role.attribute = attribute role { text }
@@ -80,6 +80,11 @@
<attdecl name="class">
<ref name="db.orgname.class.enumeration"/>
</attdecl>
<optional>
<attdecl name="otherclass">
<data type="NMTOKEN"/>
</attdecl>
</optional>
</pe>
<pe name="db.biblio.class.enumeration">
@@ -102,6 +107,11 @@
<attdecl name="class">
<ref name="db.biblio.class.enumeration"/>
</attdecl>
<optional>
<attdecl name="otherclass">
<data type="NMTOKEN"/>
</attdecl>
</optional>
</pe>
<pe name="db.othercredit.class.enumeration">
@@ -130,6 +140,11 @@
<attdecl name="class">
<ref name="db.othercredit.class.enumeration"/>
</attdecl>
<optional>
<attdecl name="otherclass">
<data type="NMTOKEN"/>
</attdecl>
</optional>
</pe>
<pe name="db.bibliorelation.type.enumeration">
@@ -294,6 +309,48 @@
</optional>
</pe>
<pe name="db.systemitem.class.enumeration">
<choice>
<value>daemon</value>
<value>domainname</value>
<value>etheraddress</value>
<value>event</value>
<value>eventhandler</value>
<value>filesystem</value>
<value>fqdomainname</value>
<value>groupname</value>
<value>ipaddress</value>
<value>library</value>
<value>macro</value>
<value>netmask</value>
<value>newsgroup</value>
<value>osname</value>
<value>process</value>
<value>protocol</value>
<value>resource</value>
<value>securitycontext</value>
<value>server</value>
<value>service</value>
<value>systemname</value>
<value>username</value>
<value>other</value>
</choice>
</pe>
<del-pe name="db.systemitem.class-other.attributes"/>
<del-pe name="db.systemitem.class-enum.attribute"/>
<pe name="db.systemitem.class.attribute">
<attdecl name="class">
<ref name="db.systemitem.class.enumeration"/>
</attdecl>
<optional>
<attdecl name="otherclass">
<data type="NMTOKEN"/>
</attdecl>
</optional>
</pe>
<!-- Fix caption -->
<pe name="db.caption.attlist">

0 comments on commit bcebc1e

Please sign in to comment.