From e6cd790eca030c1f9fa9a287a501d04fc18adda0 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@gnome.org>
Date: Fri, 12 Sep 2008 01:01:45 +0000
Subject: reword sentence about characters allowed in key names to avoid some

2008-09-12  Vincent Untz  <vuntz@gnome.org>

	* desktop-entry-spec.xml: reword sentence about characters allowed in
	key names to avoid some ambiguity.
	Patch by Simon McVittie <simon.mcvittie@collabora.co.uk>
---
 desktop-entry/ChangeLog              | 6 ++++++
 desktop-entry/desktop-entry-spec.xml | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/desktop-entry/ChangeLog b/desktop-entry/ChangeLog
index 0d30fbd..7113101 100644
--- a/desktop-entry/ChangeLog
+++ b/desktop-entry/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-12  Vincent Untz  <vuntz@gnome.org>
+
+	* desktop-entry-spec.xml: reword sentence about characters allowed in
+	key names to avoid some ambiguity.
+	Patch by Simon McVittie <simon.mcvittie@collabora.co.uk>
+
 2008-03-04  Vincent Untz  <vuntz@gnome.org>
 
 	* desktop-entry-spec.xml: bump version to 1.1-draft, so we can publish
diff --git a/desktop-entry/desktop-entry-spec.xml b/desktop-entry/desktop-entry-spec.xml
index 6ce9a23..34bc154 100644
--- a/desktop-entry/desktop-entry-spec.xml
+++ b/desktop-entry/desktop-entry-spec.xml
@@ -143,8 +143,8 @@
 	<literal>=</literal> sign is the actual delimiter.
       </para>
       <para>
-	Key names must contain only the characters
-	<literal>A-Za-z0-9-</literal>.
+	Only the characters <literal>A-Za-z0-9-</literal> may be used in
+	key names.
       </para>
       <para>
 	As the case is significant, the keys <varname>Name</varname> and
-- 
cgit v1.2.3-70-g09d2