svn commit: samba-web r575 - in trunk/DTD: .

[jelmer at samba.org]

Author: jelmer
Date: 2005-03-13 14:31:44 +0000 (Sun, 13 Mar 2005)
New Revision: 575

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=575

Log:
Allow smbconfoption and smbconfsection inside <para/>

Modified:
   trunk/DTD/samba-doc


Changeset:
Modified: trunk/DTD/samba-doc
===================================================================
--- trunk/DTD/samba-doc	2005-03-12 21:55:51 UTC (rev 574)
+++ trunk/DTD/samba-doc	2005-03-13 14:31:44 UTC (rev 575)
@@ -17,8 +17,8 @@
 	"samba.entities">
 %samba.entities;
 
-<!ELEMENT smbconfexample (description,(smbconfoption|smbconfsection|smbconfblock|smbconfcomment)*)>
-<!ELEMENT smbconfblock (description,(smbconfoption|smbconfsection|smbconfblock|smbconfcomment)*)>
+<!ELEMENT smbconfexample (title,(smbconfoption|smbconfsection|smbconfblock|smbconfcomment)*)>
+<!ELEMENT smbconfblock (title?,(smbconfoption|smbconfsection|smbconfblock|smbconfcomment)*)>
 <!ATTLIST smbconfexample
 	id ID #IMPLIED>
 <!ATTLIST smbconfblock
@@ -28,6 +28,24 @@
 <!ELEMENT smbconfoption (#PCDATA)>
 <!ATTLIST smbconfoption 
 	name CDATA #REQUIRED>
+
+<!ENTITY % local.tech.char.class "">
+<!ENTITY % tech.char.class
+		"action|application
+                |classname|methodname|interfacename|exceptionname
+                |ooclass|oointerface|ooexception
+                |command|computeroutput
+		|database|email|envar|errorcode|errorname|errortype|errortext|filename
+		|function|guibutton|guiicon|guilabel|guimenu|guimenuitem
+		|guisubmenu|hardware|interface|keycap
+		|keycode|keycombo|keysym|literal|constant|markup|medialabel
+		|menuchoice|mousebutton|option|optional|parameter
+		|prompt|property|replaceable|returnvalue|sgmltag|structfield
+		|structname|symbol|systemitem|token|type|userinput|varname
+		|smbconfoption|smbconfsection
+                %ebnf.inline.hook;
+		%local.tech.char.class;">
+	
 <!ELEMENT ntgroup (#PCDATA)>
 <!ELEMENT ntuser (#PCDATA)>
 <!ELEMENT image (imagedescription?,imagefile)>
@@ -35,16 +53,19 @@
 <!ELEMENT imagedescription (#PCDATA)>
 <!ELEMENT imagefile (#PCDATA)>
 <!ATTLIST imagefile scale CDATA #IMPLIED>
-<!--
-<!ELEMENT parameterlist (samba:parameter)>
-<!ELEMENT samba:parameter (description,related*,value*)>
+<!ELEMENT samba:parameter (synonym*,description,related*,value*)>
 <!ATTLIST samba:parameter 
 	name CDATA #REQUIRED
 	type CDATA #REQUIRED
 	context CDATA #REQUIRED
+	advanced CDATA #IMPLIED
+	developer CDATA #IMPLIED
+	wizard CDATA #IMPLIED
+	basic CDATA #IMPLIED
+	print CDATA #IMPLIED
 >
--->
 <!ELEMENT description ANY>
+<!ELEMENT synonym (#PCDATA)>
 <!ELEMENT related (#PCDATA)>
 <!ELEMENT value (#PCDATA|comment)*>
 <!ATTLIST value