forbid cabinet in inner zones

[simgrid.git] / src / surf / xml / simgrid.dtd

diff --git a/src/surf/xml/simgrid.dtd b/src/surf/xml/simgrid.dtd
index 5f1e9c6..0e9eb83 100644 (file)
--- a/src/surf/xml/simgrid.dtd
+++ b/src/surf/xml/simgrid.dtd
@@ -32,8 +32,7 @@ To upgrade your files, use the tool simgrid_update_xml
    - In <cluster>, cannot set the availability nor state traces.
      This was too complex and unused.
 
-   - The DOCTYPE points to the right URL (this file):
-     http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd
+   - The DOCTYPE points to the right URL (this file).
 
    - Kill <gpu>. Was not doing anything.
 
@@ -118,7 +117,7 @@ To upgrade your files, use the tool simgrid_update_xml
 <!-- A zone is either an internal node that contains other zones, 
      or a  leaf containing hosts and other leaf-like elements -->
 <!ELEMENT zone ((prop*),
-          (((AS|zone|include|link|backbone|cabinet|cluster|peer|trace|trace_connect)*,
+          (((AS|zone|include|link|backbone|cluster|peer|trace|trace_connect)*,
             (zoneRoute|ASroute|trace|trace_connect|bypassASroute|bypassZoneRoute)*,
            (trace|trace_connect)*)
           |((include|storage_type|storage|host|cabinet|router|link|backbone|trace|trace_connect|host_link)*,