Grab latest from dev

P5/Source/Guidelines/en/DI-PrintDictionaries.xml

@@ -1982,8 +1982,7 @@ derivatives or inflected forms of the entry word, or for compound words, phrases
 collocations, and idioms containing the entry word. </p>
 <p>Related entries can be complex, and may in fact include any of the information to be
 found in a regular entry. Therefore, the <gi>re</gi> element is defined to contain
-the same elements as an <gi>entry</gi> element, with the exception that it may not
-contain any nested <gi>re</gi> elements. </p>
+the same elements as an <gi>entry</gi> element. </p>
 <p>Examples:<q rend="display">
 <hi rend="bold">bevvy</hi>
   <code lang="ipa">(ˈbɛvɪ)</code> <emph>informal</emph> n, pl <hi rend="bold">-vies</hi> <hi rend="bold">1</hi> a drink, esp an

P5/Source/Guidelines/en/ND-NamesDates.xml

@@ -2907,7 +2907,7 @@ Journal r&#xE9;dig&#xE9; par Camille Desmoulins</title>,
           <xi:include href="../../Specs/att.personal.xml"/>
           <xi:include href="../../Specs/model.placeLike.xml"/>
           <xi:include href="../../Specs/att.datable.iso.xml"/>
-          <xi:include href="../../Specs/att.calendarSystem.xml"/>
+          <!--<xi:include href="../../Specs/att.calendarSystem.xml"/>--><!-- Uncomment  this after @calendar is deprecated on att.datable -->
           <xi:include href="../../Specs/att.duration.iso.xml"/>
           <xi:include href="../../Specs/teidata.temporal.iso.xml"/>
           <xi:include href="../../Specs/teidata.duration.iso.xml"/>

P5/Source/Specs/att.ascribed.xml

@@ -34,7 +34,7 @@ $Id$
       <datatype maxOccurs="unbounded"><dataRef key="teidata.pointer"/></datatype>
       <exemplum xml:lang="en">
         <p>In the following example from Hamlet, speeches (<gi>sp</gi>) in the body of the play 
-        are linked to <gi>castItem</gi> elements in the <gi>castList</gi> using the <att>who</att>
+        are linked to <gi>role</gi> elements in the <gi>castList</gi> using the <att>who</att>
         attribute.</p>
         <egXML xmlns="http://www.tei-c.org/ns/Examples" xml:lang="en" valid="feasible" source="#CODR-eg-293">
           <castItem type="role">

P5/Source/Specs/att.deprecated.xml

@@ -34,7 +34,7 @@ $Id$
             <sch:let name="me_phrase" value="if (@ident) then concat('The ', @ident ) else concat('This ', local-name(.), ' of ', ancestor::tei:*[@ident][1]/@ident )"/>
             <sch:assert test="@validUntil cast as xs:date ge current-date()">
               <sch:value-of select="concat( $me_phrase, ' construct is outdated (as of ', @validUntil, '); ODD processors may ignore it, and its use is no longer supported' )"/></sch:assert>
-              <sch:assert role="nonfatal" test="@validUntil cast as xs:date ge $advance_warning_period">
+              <sch:assert role="warning" test="@validUntil cast as xs:date ge $advance_warning_period">
                 <sch:value-of select="concat( $me_phrase, ' construct becomes outdated on ', @validUntil )"/>
               </sch:assert>
           </sch:rule>

P5/Source/Specs/revisionDesc.xml

@@ -30,11 +30,9 @@ $Id$
   </classes>
   <content>
     <alternate>
-      <elementRef key="list"/>
-      <elementRef key="listChange"/>
-
-        <elementRef key="change" minOccurs="1" maxOccurs="unbounded"/>
-
+      <elementRef key="list" minOccurs="1" maxOccurs="unbounded"/>
+      <elementRef key="listChange" minOccurs="1" maxOccurs="unbounded"/>
+      <elementRef key="change" minOccurs="1" maxOccurs="unbounded"/>
     </alternate>
   </content>
   <exemplum xml:lang="en">