diff --git a/crm/crm-1.0.dtd b/crm/crm-1.0.dtd
index 14e16fc851..1247301d28 100644
--- a/crm/crm-1.0.dtd
+++ b/crm/crm-1.0.dtd
@@ -1,372 +1,364 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <!-- 
      This document describes the XML elements used by the CRM. 
 
      It can be found on the web at: 
 	http://wiki.linux-ha.org/ClusterResourceManager/DTD1.0
 
 
      For reasons of user availability, the annotations formerly found here
      are now located at:
 
 	http://wiki.linux-ha.org/ClusterResourceManager/DTD1.0/Annotated
 
      which is also linked to directly by the page above.
  
 -->
 
 <!ELEMENT cib (configuration, status)>
 <!ATTLIST cib
           timestamp    CDATA    #IMPLIED
           last_written CDATA    #IMPLIED
 
           admin_epoch  CDATA    #IMPLIED
           epoch        CDATA    #IMPLIED
           num_updates  CDATA    #IMPLIED
           num_peers    CDATA    #IMPLIED        
 
           dc_uuid      CDATA    #IMPLIED
           ccm_transition CDATA  #REQUIRED
           have_quorum    (true|false)   'false'
-          cib_feature_revision  CDATA   #REQUIRED>
-<!ELEMENT configuration (nodes, resources, constraints, crm_config)>
+          cib_feature_revision  CDATA   #REQUIRED
+          crm_feature_set       CDATA   #REQUIRED
+
+          generated    CDATA    #IMPLIED        
+          debug_source CDATA    #IMPLIED>
+
+<!ELEMENT configuration (crm_config, nodes, resources, constraints)>
 <!-- Annotated version -->
 
-<!ELEMENT crm_config (cluster_property_set,nvpair)*>
+<!ELEMENT crm_config (cluster_property_set|nvpair)*>
 <!ELEMENT cluster_property_set (rule*, attributes)>
 <!ELEMENT nodes       (node*)>
 <!-- Annotated version -->
 
 <!ELEMENT node (instance_attributes*)>
 <!ATTLIST node
           id            CDATA         #REQUIRED
           uname         CDATA         #REQUIRED
           description   CDATA         #IMPLIED
           type          (normal|member|ping) #REQUIRED>
-<!ELEMENT resources   (primitive*, group*, clone*)>
+<!ELEMENT resources   (primitive|group|clone|master_slave)*>
 <!-- Annotated version -->
 
 <!ELEMENT primitive (operations?, instance_attributes*)>
 <!ATTLIST primitive
           id                CDATA        #REQUIRED
           description       CDATA        #IMPLIED
-          class             (ocf|init|heartbeat|stonith) #REQUIRED
+          class             (ocf|lsb|heartbeat|stonith) #REQUIRED
           type              CDATA        #REQUIRED
           provider          CDATA        #IMPLIED
 
-          is_managed            (true|false)                     'true'
+          is_managed            (true|1|false|0)                     'true'
           on_stopfail           (ignore|stonith|block)           #IMPLIED
           restart_type          (ignore|restart)                 'ignore'
           multiple_active       (stop_start|stop_only|block)     'stop_start'
           resource_stickiness   (0|INFINITY|-INFINITY)           '0'
           start_prereq          (nothing|quorum|fencing)         #IMPLIED>
 <!-- Annotated version -->
 
 <!ELEMENT operations (op*)>
 <!ELEMENT op (instance_attributes*)>
 <!ATTLIST op
           id            CDATA         #REQUIRED
           name          CDATA         #REQUIRED
           description   CDATA         #IMPLIED
           interval      CDATA         #IMPLIED
           timeout       CDATA         #IMPLIED
+          role       (Master|Slave|Started|Stopped) 'Started'
           prereq     (nothing|quorum|fencing)   #IMPLIED
           on_fail    (nothing|block|stop|fence) #IMPLIED>
 <!-- Annotated version -->
 
 <!ELEMENT group (primitive+,instance_attributes*)>
 <!ATTLIST group
           id                    CDATA               #REQUIRED
           description   CDATA               #IMPLIED
 
           is_managed            (true|false)                     'true'
           on_stopfail           (ignore|stonith|block)           #IMPLIED
           restart_type          (ignore|restart)                 'ignore'
           multiple_active       (stop_start|stop_only|block)     'stop_start'
           resource_stickiness   (0|INFINITY|-INFINITY)           '0'
           start_prereq          (nothing|quorum|fencing)         #IMPLIED
 
           ordered               (true|false)                     'true'
           collocated            (true|false)                     'true'>
-<!ELEMENT clone (primitive?,group?,instance_attributes*)>
+<!ELEMENT clone (instance_attributes*, (primitive|group))>
 <!ATTLIST clone
           id            CDATA               #REQUIRED
           description   CDATA               #IMPLIED
 
           is_managed            (true|false)                     'true'
           on_stopfail           (ignore|stonith|block)           #IMPLIED
           restart_type          (ignore|restart)                 'ignore'
           multiple_active       (stop_start|stop_only|block)     'stop_start'
           resource_stickiness   (0|INFINITY|-INFINITY)           '0'
           start_prereq          (nothing|quorum|fencing)         #IMPLIED
           notify                (true|false)                     'false'
 
           globally_unique       (true|false)                     'true'
 
           ordered       (true|false)     'true'
           interleave    (true|false)     'false'>
-<!ELEMENT master_slave (clone, instance_attributes*)>
+<!ELEMENT master_slave (instance_attributes*, (primitive|group))>
 <!ATTLIST master_slave
           id            CDATA       #REQUIRED
           description   CDATA       #IMPLIED
 
           is_managed            (true|false)                     'true'
           on_stopfail           (ignore|stonith|block)           #IMPLIED
           restart_type          (ignore|restart)                 'ignore'
           multiple_active       (stop_start|stop_only|block)     'stop_start'
           resource_stickiness   (0|INFINITY|-INFINITY)           '0'
           start_prereq          (nothing|quorum|fencing)         #IMPLIED
           notify                (true|false)                     'false'
 
           globally_unique       (true|false)                     'true'
 
           ordered          (true|false)  'true'
-          interleave       (true|false)  'false'
-          max_masters      CDATA         #REQUIRED
-          max_node_masters CDATA         #REQUIRED>
+          interleave       (true|false)  'false'>
 <!-- Annotated version -->
 
 <!ELEMENT instance_attributes (rule*, attributes)>
+<!ATTLIST instance_attributes id CDATA #IMPLIED>
 <!-- Annotated version -->
 
 <!ELEMENT constraints (rsc_order*, rsc_colocation*, rsc_location*)>
 <!ELEMENT rsc_order (lifetime?)>
 <!ATTLIST rsc_order
           id        CDATA #REQUIRED
           from      CDATA #REQUIRED
           action    (start|stop)        'start'
           type      (before|after)      'after'
           to        CDATA #REQUIRED
           symetrical    (TRUE|FALSE)    'TRUE'>
 <!-- Annotated version -->
 
 <!ELEMENT rsc_colocation (lifetime?)>
 <!ATTLIST rsc_colocation
           id        CDATA #REQUIRED
           from      CDATA #REQUIRED
           to        CDATA #REQUIRED
           score     (INFINITY|-INFINITY) #REQUIRED>
 <!-- Annotated version -->
 
 <!ELEMENT rsc_location (lifetime?,rule+)>
 <!ATTLIST rsc_location
           id          CDATA #REQUIRED
           description CDATA #IMPLIED
           rsc         CDATA #REQUIRED>
 <!ELEMENT lifetime (rule+)>
 <!-- Annotated version -->
 
 <!ELEMENT rule (expression|time_expression|rule)+>
 <!ATTLIST rule
           id                    CDATA     #REQUIRED
           role                  CDATA     #IMPLIED
           score                 CDATA     #IMPLIED
           score_attribute       CDATA     #IMPLIED
           boolean_op (or|and)     'and'>
 <!-- Annotated version -->
 
 <!ELEMENT expression EMPTY>
 <!ATTLIST expression
           id         CDATA                    #REQUIRED
           attribute  CDATA                    #REQUIRED
           operation  (lt|gt|lte|gte|eq|ne|defined|not_defined) #REQUIRED
           value      CDATA                    #IMPLIED
           type       (integer|string|version) 'string'>
 <!-- Annotated version -->
 
 <!ELEMENT date_expression (date_spec?,duration?)>
 <!ATTLIST date_expression
         operation  (in_range|date_spec|gt|lt) 'in_range'
         start      CDATA  #IMPLIED
         end        CDATA  #IMPLIED>
 <!-- Annotated version -->
 
 <!ELEMENT date_spec EMPTY>
 <!ATTLIST date_spec
         monthdays  CDATA  #IMPLIED
         weekdays   CDATA  #IMPLIED
         yeardays   CDATA  #IMPLIED
         months     CDATA  #IMPLIED
         weeks      CDATA  #IMPLIED
         weekyears  CDATA  #IMPLIED
         years      CDATA  #IMPLIED
         moon       CDATA  #IMPLIED>
 
 <!ELEMENT duration EMPTY>
 <!ATTLIST duration
         monthdays  CDATA  #IMPLIED
         weekdays   CDATA  #IMPLIED
         yeardays   CDATA  #IMPLIED
         months     CDATA  #IMPLIED
         weeks      CDATA  #IMPLIED
         years      CDATA  #IMPLIED>
 <!-- Annotated version -->
 
 <!ELEMENT status (node_state*)>
-<!ELEMENT node_state (lrm, transient_attributes)>
+<!ELEMENT node_state ((transient_attributes|lrm), (transient_attributes|lrm)) >
 <!ATTLIST node_state
         id              CDATA                   #REQUIRED
         uname           CDATA                   #REQUIRED
         crmd            (online|offline)        'offline'
         join            (pending|member|down)   'down'
         expected        (pending|member|down)   'down'
         in_ccm          (true|false)            'false'
         shutdown        CDATA                   #IMPLIED
         timestamp       CDATA                   #IMPLIED>
 <!ELEMENT lrm (lrm_resources)>
-<!ATTLIST lrm
-        id      CDATA #REQUIRED
-        version CDATA #REQUIRED>
 <!-- Annotated version -->
 
 <!ELEMENT lrm_resources (lrm_resource*)>
-<!ELEMENT lrm_resource (lrm_rsc_op)>
+<!ELEMENT lrm_resource (lrm_rsc_op*)>
 <!ATTLIST lrm_resource
           id            CDATA #REQUIRED
-          class             (ocf|init|heartbeat|stonith) #REQUIRED
+          class             (lsb|ocf|heartbeat|stonith) #REQUIRED
           type              CDATA        #REQUIRED
           provider          CDATA        #IMPLIED>
 
-<!ELEMENT lrm_rsc_op (parameters)>
+<!ELEMENT lrm_rsc_op (parameters?)>
 <!ATTLIST lrm_rsc_op
           id            CDATA #REQUIRED
           operation     CDATA #REQUIRED
           op_status     CDATA #REQUIRED
           rc_code               CDATA #REQUIRED
           call_id               CDATA #REQUIRED
           rsc_state             CDATA #IMPLIED
           transition_key                CDATA #IMPLIED
           transition_magic      CDATA #REQUIRED>
-<!ELEMENT parameters (nvpair*)>
+<!ELEMENT nvpair EMPTY>
+<!ATTLIST nvpair
+          id            CDATA #REQUIRED
+          name          CDATA #REQUIRED
+          value         CDATA #IMPLIED>
+<!ELEMENT parameters EMPTY>
+<!ELEMENT attributes (nvpair*)>
 <!ELEMENT transient_attributes (instance_attributes*)>
-<!ATTLIST transient_attributes
-          id            CDATA #REQUIRED>
+<!ATTLIST transient_attributes id CDATA #IMPLIED>
 
 <!-- ============================================================== -->
 <!-- ============================================================== -->
 
 <!--
  The Transition Graph is an ordered list of synapses, which consist of a
  list of pre-conditions (events) they are waiting for / triggering on
  and a (list of) actions which are initiated when they "fire". The first
  synapse to have a matching input "consumes" the event unless specified
  differently.
  
 -->
 
 <!ELEMENT transition_graph (action_set*,errors*)>
 
 <!-- When all inputs to a synapse are satisfied, the synapse fires the
      actions.
      
      "reset" states whether after having fired once, the synapse resets
      and accepts input again. "no": After having fired, the synapse
      becomes completely inactive. "yes": it completely resets. "greedy":
      The synapse will still 'consume' input, but not fire again.
 -->
 
 <!ELEMENT synapse (inputs,action_set)>
 <!ATTLIST synapse
 	  id	CDATA		#REQUIRED
 	  reset	(no|yes|greedy) 'greedy'
 	  priority CDATA	#IMPLIED>
 
 <!ELEMENT inputs (trigger+)>
 
 <!-- event_spec specifies the event we are looking for.
      This can be anything from "rsc foo started somewhere / on node X",
      "STONITH of node A completed", "DEFAULT" etc... 
 
      If an event is "consumed", no further inputs in other synapses will
      be triggered by it. If "no", the event will pass through,
      triggering us but otherwise completely unaltered. If "marks", we
      simply remember that the event has been accepted somewhere, but
      pass it on.
      
 -->
 <!ELEMENT trigger (rsc_state*,node_state*,pseudo_event*,crm_event*)>
 <!ATTLIST trigger
 	  id		CDATA #REQUIRED
 	  consumes	(no|yes|marks) 'marks'>
 
 
 <!-- STONITH events end up being rsc_ops; remember that we hope to
      simply invoke 'STONITH Resource Agent' and feed it with appropriate
      parameters.
 
   -->
 <!ELEMENT action_set (rsc_op*,pseudo_event*,crm_event*)>
 
 <!-- The resource object inside the rsc_op object differs from the
      resources list only in content, not in syntax.
      - it is pre-processed, ie there's a maximum of one set of
        instance_parameters
      
      on_node is the uname of the node on which to trigger the operation.
 
      The operation is the command passed to the Resource Agent.
 
      "allow_fail" when set to true, the transition isnt aborted when the 
      action fails.  eg. a stop or shutdown isnt fatal when a STONITH is also
      pending for that node.
 
 -->
 
 <!ELEMENT rsc_op (primitive, attributes)>
 <!ATTLIST rsc_op
 	id	      CDATA	#REQUIRED
 	operation     CDATA	#REQUIRED
 	on_node	      CDATA	#REQUIRED
 	on_node_uuid  CDATA	#REQUIRED
 	timeout	      CDATA	#REQUIRED
 	allow_fail    (true|false) 'false'>
 
 <!-- For added flexibility, an action can trigger an event, which is
      then consumed somewhere else. Woah. Cool. 
 -->
 <!ELEMENT pseudo_event (attributes)>
 <!ATTLIST pseudo_event
 	id	      CDATA	#REQUIRED
 	operation     CDATA	#REQUIRED
 	on_node	      CDATA	#REQUIRED
 	on_node_uuid  CDATA	#REQUIRED
 	timeout	      CDATA	#REQUIRED
 	allow_fail    (true|false) 'false'>
 	
 <!-- crm_event: We can instruct a crmd to shutdown (maybe the whole node?),
      sign-out cleanly, or to retrigger the DC election.
 -->
 <!ELEMENT crm_event (attributes)>
 <!ATTLIST crm_event
 	id	      CDATA	#REQUIRED
 	allow_fail    (true|false) 'false'
 	on_node	      CDATA	#REQUIRED
 	on_node_uuid  CDATA	#REQUIRED
 	timeout	      CDATA	#REQUIRED
 	operation (shutdown|signout|signup|election) #REQUIRED>
 
 <!-- ============================================================== -->
 <!-- ============================================================== -->
 
 <!-- not currently used -->
 <!ELEMENT msg_addr EMPTY>
 <!ATTLIST msg_addr
 	part		(src|dst)	#REQUIRED
 	subsystem	(dc|crmd|dcib|cib|pe|te|lrm|admin) #REQUIRED
 	host		CDATA		#IMPLIED>
-
-<!-- ============================================================== -->
-<!-- ============================================================== -->
-<!-- Common elements -->
-
-<!ELEMENT nvpair EMPTY>
-<!-- No, you don't /have/ to give a value. There's a difference between
-     a key not being present and a key not having a value. -->
-<!ATTLIST nvpair
-	  id		CDATA #REQUIRED
-	  name		CDATA #REQUIRED
-	  value		CDATA #IMPLIED>
-
-<!ELEMENT attributes (nvpair*)>
-