From: Osier Yang <jyang@redhat.com>
Date: Wed, 23 Jan 2013 11:04:33 +0000 (+0800)
Subject: eng: Remove the duplicate definition
X-Git-Tag: v1.0.2-rc2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9d9cc5eae388a6b14fc40a5a402cfe1d6e56c9e;p=thirdparty%2Flibvirt.git

eng: Remove the duplicate definition

The RE for data type "name" storagepool.rng uses is same with
"genericName" in basictypes.rng.
---

diff --git a/docs/schemas/storagepool.rng b/docs/schemas/storagepool.rng
index 983f664176..165e27643f 100644
--- a/docs/schemas/storagepool.rng
+++ b/docs/schemas/storagepool.rng
@@ -144,7 +144,7 @@
 
   <define name='commonmetadata'>
     <element name='name'>
-      <ref name='name'/>
+      <ref name='genericName'/>
     </element>
     <optional>
       <element name='uuid'>
@@ -230,7 +230,7 @@
       <attribute name='path'>
         <choice>
           <ref name='absFilePath'/>
-          <ref name='name'/>
+          <ref name='genericName'/>
         </choice>
       </attribute>
       <choice>
@@ -519,12 +519,6 @@
     </element>
   </define>
 
-  <define name='name'>
-    <data type='string'>
-      <param name="pattern">[a-zA-Z0-9_\+\-]+</param>
-    </data>
-  </define>
-
   <define name="PortNumber">
     <data type="short">
       <param name="minInclusive">-1</param>