hal/doc/spec hal-spec.html,1.56,1.57 hal-spec.xml.in,1.37,1.38

Wed Mar 23 17:15:33 PST 2005

Update of /cvs/hal/hal/doc/spec
In directory gabe:/tmp/cvs-serv26125/doc/spec

Modified Files:
	hal-spec.html hal-spec.xml.in 
Log Message:
2005-03-23  David Zeuthen  <davidz at redhat.com>

	Patch from Sergey Udaltsov <sergey.udaltsov at gmail.com>, slightly
	tweaked to be in line with the spec

	* hald/linux2/addons/addon-usb-csr.c: New file

	* fdi/information/10freedesktop/10-wireless-mice.fdi: New file

	* doc/spec/hal-spec.xml.in: Add keyboard_mouse as allowed value for
	battery.type



Index: hal-spec.html
===================================================================
RCS file: /cvs/hal/hal/doc/spec/hal-spec.html,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57

--- hal-spec.html	15 Mar 2005 21:10:06 -0000	1.56
+++ hal-spec.html	24 Mar 2005 01:15:31 -0000	1.57
@@ -2,7 +2,7 @@
 <HTML
 ><HEAD
 ><TITLE
->HAL 0.5.0 Specification</TITLE
+>HAL 0.5.0.cvs20050322b Specification</TITLE
 ><META
 NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.79"></HEAD
@@ -24,7 +24,7 @@
 CLASS="title"
 ><A
 NAME="AEN2"
->HAL 0.5.0 Specification</A
+>HAL 0.5.0.cvs20050322b Specification</A
 ></H1
 ><H3
 CLASS="author"
@@ -51,7 +51,7 @@
 ></DIV
 ><SPAN
 CLASS="releaseinfo"
->Version 0.5.0<BR></SPAN
+>Version 0.5.0.cvs20050322b<BR></SPAN
 ><HR></DIV
 ><DIV
 CLASS="TOC"
@@ -690,7 +690,7 @@
 ></TR
 ><TR
 ><TD
->0.5.0</TD
+>0.5.0.cvs20050322b</TD
 ><TD
 >&nbsp;</TD
 ><TD

Index: hal-spec.xml.in
===================================================================
RCS file: /cvs/hal/hal/doc/spec/hal-spec.xml.in,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- hal-spec.xml.in	10 Mar 2005 20:17:20 -0000	1.37
+++ hal-spec.xml.in	24 Mar 2005 01:15:31 -0000	1.38
@@ -3122,6 +3122,14 @@
 	    </row>
 	    <row>
 	      <entry></entry>
+	      <entry><literal>keyboard_mouse</literal></entry>
+	      <entry></entry>
+	      <entry>
+		The device containing the battery is a combined mouse and keyboard.
+	      </entry>
+	    </row>
+	    <row>
+	      <entry></entry>
 	      <entry><literal>camera</literal></entry>
 	      <entry></entry>
 	      <entry>
@@ -3182,7 +3190,7 @@
             <row>
               <entry><literal>battery.charge_level.rate</literal> (int)</entry>
               <entry></entry>
-              <entry>Yes</entry>
+              <entry>No</entry>
               <entry>
 		The discharge/charge rate measured
 		in <literal>"battery.charge_level.unit"</literal>


