[Zodb-checkins] CVS: Zope/lib/python/ZConfig/doc - schema.dtd:1.6.26.1 zconfig.pdf:1.7.26.1 zconfig.tex:1.70.16.1

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/ZConfig/doc
In directory cvs.zope.org:/tmp/cvs-serv17213/lib/python/ZConfig/doc

Modified Files:
      Tag: Zope-2_7-branch
	schema.dtd zconfig.pdf zconfig.tex 
Log Message:
Merge changes from HEAD since the release of Zope 2.7a1 into the Zope-2_7-branch in preparation for release of Zope 2.7b1.


=== Zope/lib/python/ZConfig/doc/schema.dtd 1.6 => 1.6.26.1 ===
--- Zope/lib/python/ZConfig/doc/schema.dtd:1.6	Mon Apr 21 09:22:13 2003
+++ Zope/lib/python/ZConfig/doc/schema.dtd	Mon Jul 21 12:36:55 2003
@@ -34,6 +34,7 @@
 
 <!ELEMENT import EMPTY>
 <!ATTLIST import
+          file       CDATA    #IMPLIED
           package    NMTOKEN  #IMPLIED
           src        CDATA    #IMPLIED>
 
@@ -61,7 +62,7 @@
 
 <!ELEMENT key (description?, metadefault?, example?)>
 <!ATTLIST key
-          name       PCDATA   #REQUIRED
+          name       CDATA    #REQUIRED
           attribute  NMTOKEN  #IMPLIED
           datatype   NMTOKEN  #IMPLIED
           handler    NMTOKEN  #IMPLIED
@@ -70,7 +71,7 @@
 
 <!ELEMENT multikey (description?, metadefault?, example?, default*)>
 <!ATTLIST multikey
-          name       PCDATA   #REQUIRED
+          name       CDATA    #REQUIRED
           attribute  NMTOKEN  #IMPLIED
           datatype   NMTOKEN  #IMPLIED
           handler    NMTOKEN  #IMPLIED
@@ -78,7 +79,7 @@
 
 <!ELEMENT section (description?)>
 <!ATTLIST section
-          name       PCDATA   #REQUIRED
+          name       CDATA    #REQUIRED
           attribute  NMTOKEN  #IMPLIED
           type       NMTOKEN  #REQUIRED
           handler    NMTOKEN  #IMPLIED
@@ -87,7 +88,7 @@
 
 <!ELEMENT multisection (description?)>
 <!ATTLIST multisection
-          name       PCDATA   #REQUIRED
+          name       CDATA    #REQUIRED
           attribute  NMTOKEN  #IMPLIED
           type       NMTOKEN  #REQUIRED
           handler    NMTOKEN  #IMPLIED


=== Zope/lib/python/ZConfig/doc/zconfig.pdf 1.7 => 1.7.26.1 ===
  <Binary-ish file>

=== Zope/lib/python/ZConfig/doc/zconfig.tex 1.70 => 1.70.16.1 ===
--- Zope/lib/python/ZConfig/doc/zconfig.tex:1.70	Mon May 12 17:24:58 2003
+++ Zope/lib/python/ZConfig/doc/zconfig.tex	Mon Jul 21 12:36:55 2003
@@ -402,11 +402,18 @@
   Import a schema component.
   Exactly one of the two possible attributes must be specified.
 
+  \begin{attributedesc}{file}{file name without directory information}
+    Name of the component file within a package; if not specified,
+    \file{component.xml} is used.  This may only be given when
+    \attribute{package} is used.
+  \end{attributedesc}
+
   \begin{attributedesc}{package}{\datatype{dotted-name}}
     Python-package style name that identifies a directory found on
     \code{sys.path} containing a schema component in a file named
-    \file{component.xml}.  Dots in the value are converted to
-    directory separators.
+    \file{component.xml} (unless the file name is overridden using
+    \attribute{file}).  Dots in the value are converted to directory
+    separators.
   \end{attributedesc}
 
   \begin{attributedesc}{src}{\datatype{url-reference}}
@@ -630,22 +637,12 @@
 Components are identified using a dotted-name, similar to a Python
 module name.  For example, one component may be \code{zodb.storage}.
 
-%A schema component \dfn{extension} is allowed to define new abstract
-%and section types, extend types provided by the component it extends,
-%and include new section types in abstract types provided by the
-%component.  The expected usage is that extensions will provide one or
-%more concrete types that implement abstract types defined by the
-%component.
-
 Schema components are stored alongside application code since they
 directly reference datatype code.  Schema components are provided by
 Python packages; packages which contain a file named
 \file{component.xml} can be ``imported''.  The \file{component.xml}
 file defines the types provided by that component; it must have a
 \element{component} element as the document element.
-%Extensions to a component are stored in immediate subdirectories; a
-%file \file{extension.xml} provides the extension types.  Extensions
-%must have an \element{extension} element as the document element.
 
 The following element is used as the document element for schema
 components.  Note that schema components do not allow keys and
@@ -663,18 +660,6 @@
     attribute.
   \end{attributedesc}
 \end{elementdesc}
-
-%\begin{elementdesc}{extension}{description?, (abstracttype | sectiontype)*}
-%  The top-level element for schema component extensions.
-
-%  \begin{attributedesc}{prefix}{\datatype{dotted-name}}
-%    Prefix to be pre-pended in front of partial dotted-names that
-%    start with a period.  The value of this attribute is used in all
-%    contexts within the \element{extension} element if it hasn't been
-%    overridden by an inner element with a \attribute{prefix}
-%    attribute.
-%  \end{attributedesc}
-%\end{elementdesc}
 
 
 \section{Standard \module{ZConfig} Datatypes\label{standard-datatypes}}