merge

doc/class/XmlType.html

@@ -44,8 +44,9 @@
   <p>Manages XML types
 Not supported:</p><ul>
 <li>Attribute nodes</li>
-<li>Real replace of child elements (to much overhead). Currently, the new element is inserted after the &#39;replaced&#39; element, and then it is deleted.
-*</li>
+<li>Real replace of child elements (to much overhead). Currently, the new element is inserted after the &#39;replaced&#39; element, and then it is deleted.</li>
+<li>Namespaces (*NS)</li>
+<li>Browser specific methods (webkit-* operations)</li>
 </ul>
 
 </div>
@@ -122,7 +123,6 @@ Use it in order to check whether this is an xml-type or something else.</p>
       </a>
     </span>
     <span class='desc'>
-      If possible set the replace manager in the content. 
     </span>
   </li>
   <li>
@@ -208,17 +208,7 @@ Use it in order to check whether this is an xml-type or something else.</p>
 <b>execute</b><span>()</span>
       <br>
     </p>
-    <div class='docstring'>
-  <p>If possible set the replace manager in the content.</p>
-</div>
-<div class='tags'>
-  <h3>See also:</h3>
-  <ul class='see'>
-    <li>
-      <a href='WordType.setReplaceManager'>WordType.setReplaceManager</a>
-    </li>
-  </ul>
-</div>
+    
   </div>
   <div class='method_details'>
     <p class='signature' id='getParent-dynamic'>
@@ -258,7 +248,11 @@ This result can be send to other clients.</p>
 </div>
     </div>
     <div id='footer'>
+<<<<<<< HEAD
   October 06, 14 10:34:33 by
+=======
+  October 02, 14 15:16:56 by
+>>>>>>> XML-Support
   <a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
     Codo
   </a>