[Zodb-checkins] CVS: Zope/lib/python/ZConfig/doc - schema.dtd:1.1.2.1 Makefile:1.1.4.2 zconfig.tex:1.5.4.8

[Chris McDonough]

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

Modified Files:
      Tag: chrism-install-branch
	Makefile zconfig.tex 
Added Files:
      Tag: chrism-install-branch
	schema.dtd 
Log Message:
Merge with HEAD.


=== Added File Zope/lib/python/ZConfig/doc/schema.dtd ===
<!-- DTD for ZConfig schema documents. -->

<!ELEMENT schema (description?, metadefault?, example?,
                  import*,
                  (sectiontype | sectiongroup)*,
                  (section | key | multisection | multikey)*)>
<!ATTLIST schema
          prefix     NMTOKEN  #IMPLIED
          handler    NMTOKEN  #IMPLIED
          keytype    NMTOKEN  #IMPLIED
          datatype   NMTOKEN  #IMPLIED>

<!ELEMENT import EMPTY>
<!ATTLIST import
          src        CDATA    #REQUIRED>

<!ELEMENT description (#PCDATA)*>
<!ELEMENT metadefault (#PCDATA)*>
<!ELEMENT example     (#PCDATA)*>

<!ELEMENT key (description?, metadefault?, example?)>
<!ATTLIST key
          name       NMTOKEN  #REQUIRED
          attribute  NMTOKEN  #IMPLIED
          datatype   NMTOKEN  #IMPLIED
          handler    NMTOKEN  #IMPLIED
          required   (yes|no) "no"
          default    CDATA    #IMPLIED>

<!ELEMENT multikey (description?, metadefault?, example?, default*)>
<!ATTLIST multikey
          name       NMTOKEN  #REQUIRED
          attribute  NMTOKEN  #IMPLIED
          datatype   NMTOKEN  #IMPLIED
          handler    NMTOKEN  #IMPLIED
          required   (yes|no) "no">

<!ELEMENT sectiontype (description?, (section | key)*)>
<!ATTLIST sectiontype
          type       NMTOKEN  #REQUIRED
          prefix     NMTOKEN  #IMPLIED
          keytype    NMTOKEN  #IMPLIED
          datatype   NMTOKEN  #IMPLIED>

<!ELEMENT sectiongroup (description?, sectiontype+)>
<!ATTLIST sectiongroup
          type       NMTOKEN  #REQUIRED
          prefix     NMTOKEN  #IMPLIED>

<!ELEMENT section (description?)>
<!ATTLIST section
          name       NMTOKEN  #REQUIRED
          attribute  NMTOKEN  #IMPLIED
          type       NMTOKEN  #REQUIRED
          handler    NMTOKEN  #IMPLIED
          minOccurs  NMTOKEN  #IMPLIED
          maxOccurs  NMTOKEN  #IMPLIED>

<!ELEMENT multisection (description?)>
<!ATTLIST multisection
          name       NMTOKEN  #REQUIRED
          attribute  NMTOKEN  #IMPLIED
          type       NMTOKEN  #REQUIRED
          handler    NMTOKEN  #IMPLIED
          required   (yes|no) "no">


=== Zope/lib/python/ZConfig/doc/Makefile 1.1.4.1 => 1.1.4.2 ===
--- Zope/lib/python/ZConfig/doc/Makefile:1.1.4.1	Thu Oct 10 14:29:12 2002
+++ Zope/lib/python/ZConfig/doc/Makefile	Sat Jan  4 13:10:50 2003
@@ -1,4 +1,7 @@
 # Rules to convert the documentation to a single PDF file.
+#
+# See the README.txt file for information on the mkhowto program used
+# to generate the PDF and PostScript versions of the documentation.
 
 .PHONY:	default all pdf ps
 


=== Zope/lib/python/ZConfig/doc/zconfig.tex 1.5.4.7 => 1.5.4.8 ===
--- Zope/lib/python/ZConfig/doc/zconfig.tex:1.5.4.7	Fri Jan  3 10:51:58 2003
+++ Zope/lib/python/ZConfig/doc/zconfig.tex	Sat Jan  4 13:10:50 2003
@@ -22,6 +22,13 @@
 for components of a Zope installation written by Zope Corporation.  This
 configuration mechanism is itself configured using a schema specification
 written in XML.
+
+\begin{notice}[warning]
+  ZConfig have changed a great deal since this document was initially
+  written, and parts of this have not yet been updated, though
+  portions have been.  Please be patient as the documentation catches
+  up.
+\end{notice}
 \end{abstract}
 
 \tableofcontents
@@ -245,6 +252,11 @@
   \constant{False}.  Comparisons are case-insensitive.  All other
   input strings are disallowed.
 
+\term{byte-size}
+  A specification of a size, with byte multiplier suffixes (for
+  example, \samp{128MB}).  Suffixes are case insensitive and may be
+  ``KB'', ``MB'', or ``GB''.
+
 \term{constructor}
   Parse value in the form \samp{fn('1', '2', kw1='a', kw2='b')} into a
   3-tuple where the first element is the string \code{'fn'}, the 2nd
@@ -335,6 +347,12 @@
   string, this implies that it will be checked to be simple 7-bit
   \ASCII.  This is the default data type for key values in
   configuration files.
+
+\term{time-interval}
+  A specification of a time interval, with multiplier suffixes,
+  e.g. 12h.  Suffixes are case insensitive and may be ``s'' (seconds),
+  ``m'' (minutes), ``h'' (hours), or ``d'' (days).
+
 \end{definitions}