Merge branch 'master' of https://dvcs.projects.maemo.org/git/ContextKit

Conflicts:

	spec/context.xml
	spec/context.xsd

2 files changed, 68 insertions, 87 deletions

diff --git a/spec/context.xml b/spec/context.xml
index 52d6d4a0..7207d33e 100644
--- a/spec/context.xml
+++ b/spec/context.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<provider bus="session" service="org.freedesktop.ContextKit.IMAGINARY" xmlns="http://contextkit.freedesktop.org/Provider" >
- <doc>
+<properties xmlns="http://contextkit.freedesktop.org/Provider">
+  <doc>
 Core Context Properties
 =======================
 
@@ -11,127 +11,109 @@ platform.
 change for some time still.  Only the ones explicitly marked as stable
 should be used for now.
 
- </doc>
- <root>
-   <node name="Context">
-     <node name="Screen">
-       <doc>
+  </doc>
+  <node name="Context">
+    <node name="Screen">
+      <doc>
 Display screens
 ---------------
 
 These properties talk about the display screens of the device.
-       </doc>
-       <key name="TopEdge">
-	 <choice>
-	   <const string="top"/>
-	   <const string="bottom"/>
-	   <const string="left"/>
-	   <const string="right"/>
-	 </choice>
-         <doc>
+      </doc>
+      <key name="TopEdge" type="STRING">
+        <doc>
 The edge of the main display screen where the user expects
 the top-most UI elements to be.  Possible values are the
 strings "top", "bottom", "left", and "right", which refer to
 the edges of the screen in its normal orientation as defined
 by the graphics hardware.  _(stable)_
-         </doc>
-       </key>
-       <key name="IsCovered">
-	 <bool/>
-	 <doc>
+        </doc>
+      </key>
+      <key name="IsCovered" type="TRUTH">
+	<doc>
 Whether or not the main display screen is covered and can
 not be seen by the user.  This might mean that the device is
 laying face down on a table, or that its lid is closed if it
 has one.  _(stable)_
-	 </doc>
-       </key>
-     </node>
-     <node name="Location">
-       <doc>
+	</doc>
+      </key>
+    </node>
+    <node name="Location">
+      <doc>
 Location
 --------
 
 Information about the geographic location of the device.
-       </doc>
-       <key name="Streets">
-	 <repeat><string/></repeat>
-	 <doc>
+      </doc>
+      <key name="Streets" type="STRING">
+	<doc>
 The names of the nearby streets, as a list of strings.  The list might
 be empty when the current location is not near any street, or there
 might be more than one name in the list, when we are at an
 intersection.
-	 </doc>
-       </key>
-       <key name="City">
-	 <string/>
-	 <doc>
+	</doc>
+      </key>
+      <key name="City" type="STRING">
+	<doc>
 The name of the current city in the users language, as a string.
-	 </doc>
-       </key>
-       <key name="State">
-	 <string/>
-	 <doc>
+	</doc>
+      </key>
+      <key name="State" type="STRING">
+	<doc>
 The name of the current state in the users language, as a string.
-	 </doc>
-       </key>
-       <key name="StateCode">
-	 <string/>
-	 <doc>
+	</doc>
+      </key>
+      <key name="StateCode" type="STRING">
+	<doc>
 The ISO 3166-2 code of the current state, as a string.  See
 link:http://en.wikipedia.org/wiki/ISO_3166-2[here] for more
 information.  This value of this property includes the IS3166-1
 alpha-2 prefix, as is usual for ISO 3166-2 codes.
-	 </doc>
-       </key>
-       <key name="Country">
-	 <string/>
-	 <doc>
+	</doc>
+      </key>
+      <key name="Country" type="STRING">
+	<doc>
 The name of the current country in the users language, as a string.
-	 </doc>
-       </key>
-       <key name="CountryCode">
-	 <string/>
-	 <doc>
+	</doc>
+      </key>
+      <key name="CountryCode" type="STRING">
+	<doc>
 The ISO 3166-1 alpha-2 code of the current country, as a string.  See
 link:http://en.wikipedia.org/wiki/ISO_3166-1[here] for more
 information.
-	 </doc>
-       </key>
-       <key name="Continent">
-	 <string/>
-	 <doc>
+	</doc>
+      </key>
+      <key name="Continent" type="STRING">
+	<doc>
 The name of the current continent, as a string.
-	 </doc>
-       </key>
-       <key name="Planet">
-	 <string/>
-	 <doc>
+	</doc>
+      </key>
+      <key name="Planet" type="STRING">
+	<doc>
 The name of the current planet (or dwarf planet), as a string.
-	 </doc>
-       </key>
-     </node>
-     <node name="Connectivity">
-       <doc>
+	</doc>
+      </key>
+    </node>
+    <node name="Connectivity">
+      <doc>
 Network connectivity
 --------------------
 
 Information about the network connectivity of the device.
-       </doc>
-     </node>
-     <node name="Situation">
-       <doc>
+      </doc>
+    </node>
+    <node name="Situation">
+      <doc>
 Situations
 ----------
 
 Information about the _situation_ the device is in.
-       </doc>
-       <key name="IsDark">
-	 <bool/>
-	 <doc>
+      </doc>
+      <key name="IsDark" type="TRUTH">
+	<doc>
 Whether or not it is dark.
-	 </doc>
-       </key>
-     </node>
-   </node>
- </root>
-</provider>
+	</doc>
+      </key>
+    </node>
+  </node>
+</properties>
diff --git a/spec/context.xsd b/spec/context.xsd
index 132a9423..86e16007 100644
--- a/spec/context.xsd
+++ b/spec/context.xsd
@@ -1,7 +1,6 @@
 <schema targetNamespace="http://contextkit.freedesktop.org/Provider"
-  xmlns="http://www.w3.org/2001/XMLSchema"
-  xmlns:provider="http://contextkit.freedesktop.org/Provider"
->
+	xmlns="http://www.w3.org/2001/XMLSchema"
+	xmlns:provider="http://contextkit.freedesktop.org/Provider">
   <annotation>
     <documentation>
       Documentation for ContextKit Provider schema.