From 388502750e934ec0a091cf21090256bddaab9576 Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard@redhat.com>
Date: Fri, 25 Jul 2008 06:37:20 +0000
Subject: [PATCH] * docs/libvirt.rng: patch from John Levon fixing various
 patterns Daniel

---
 ChangeLog        |  4 ++++
 docs/libvirt.rng | 10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4120cd68ba..ed46fec135 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jul 25 08:36:18 CEST 2008 Daniel Veillard <veillard@redhat.com>
+
+	* docs/libvirt.rng: patch from John Levon fixing various patterns
+
 Thu Jul 24 09:26:51 CEST 2008 Daniel Veillard <veillard@redhat.com>
 
 	* src/qemu_driver.c: another patch from Guido Günther checking
diff --git a/docs/libvirt.rng b/docs/libvirt.rng
index 761e4cc395..9a0e24f3af 100644
--- a/docs/libvirt.rng
+++ b/docs/libvirt.rng
@@ -840,7 +840,7 @@
   </define>
   <define name='domainName'>
     <data type='string'>
-      <param name="pattern">[A-Za-z0-9_.:/\+\-&amp;-]+</param>
+      <param name="pattern">[A-Za-z0-9_\.\+\-&amp;:/]+</param>
     </data>
   </define>
   <define name='genericName'>
@@ -860,22 +860,22 @@
   </define>
   <define name='filePath'>
     <data type='string'>
-      <param name="pattern">[a-zA-Z0-9_\+\-%./&amp;]+</param>
+      <param name="pattern">[a-zA-Z0-9_\.\+\-&amp;/%]+</param>
     </data>
   </define>
   <define name='absFilePath'>
     <data type='string'>
-      <param name="pattern">/[a-zA-Z0-9_\+\-%./&amp;]+</param>
+      <param name="pattern">/[a-zA-Z0-9_\.\+\-&amp;/%]+</param>
     </data>
   </define>
   <define name='devicePath'>
     <data type='string'>
-      <param name="pattern">/[a-zA-Z0-9_\+\-%/]+</param>
+      <param name="pattern">/[a-zA-Z0-9_\+\-/%]+</param>
     </data>
   </define>
   <define name='deviceName'>
     <data type='string'>
-      <param name="pattern">[a-zA-Z0-9_\-:./]+</param>
+      <param name="pattern">[a-zA-Z0-9_\.\-:/]+</param>
     </data>
   </define>
   <define name='addrMAC'>