=== modified file 'DBUS-API'
--- DBUS-API	2011-09-18 16:00:55 +0000
+++ DBUS-API	2011-09-18 16:04:23 +0000
@@ -87,6 +87,7 @@
    | Created (d)             | s    | Read       | N/A                 |
    | Enabled (e)             | b    | Read/Write | N/A                 |
    | Expires (f)             | s    | Read       | N/A                 |
+   | ExtendedTimeout (a)     | t    | Read/Write | extended_timeout    |
    | Fingerprint             | s    | Read       | fingerprint         |
    | Host                    | s    | Read/Write | host                |
    | Interval (a)            | t    | Read/Write | interval            |
@@ -97,7 +98,6 @@
    | ObjectPath              | o    | Read       | N/A                 |
    | Secret (j)              | ay   | Write      | secret (or secfile) |
    | Timeout (a)             | t    | Read/Write | timeout             |
-   | ExtendedTimeout (a)     | t    | Read/Write | extended_timeout    |
    
    a) Represented as milliseconds.
    
@@ -114,18 +114,18 @@
    f) The date and time this client will be disabled, as an RFC 3339
       string, or an empty string if this has not happened.
    
-   g) The time of the last approval request, as an RFC 3339 string, or
-      an empty string if this has not happened.
-   
-   h) The last time a checker was successful, as an RFC 3339 string,
-      or an empty string if this has not happened.  Setting this
-      property is equivalent to calling CheckedOK(), i.e. the current
-      time is set, regardless of the string sent.  Please always use
-      an empty string when setting this property, to allow for
-      possible future expansion.
-   
-   i) The last time this client was enabled, as an RFC 3339 string, or
-      an empty string if this has not happened.
+   g) The date and time of the last approval request, as an RFC 3339
+      string, or an empty string if this has not happened.
+   
+   h) The date and time a checker was last successful, as an RFC 3339
+      string, or an empty string if this has not happened.  Setting
+      this property is equivalent to calling CheckedOK(), i.e. the
+      current time is set, regardless of the string sent.  Please
+      always use an empty string when setting this property, to allow
+      for possible future expansion.
+   
+   i) The date and time this client was last enabled, as an RFC 3339
+      string, or an empty string if this has not happened.
    
    j) A raw byte array, not hexadecimal digits.
 

=== modified file 'debian/control'
--- debian/control	2011-03-17 18:13:40 +0000
+++ debian/control	2011-09-18 15:03:26 +0000
@@ -18,7 +18,7 @@
 	python-avahi, python-gobject, avahi-daemon, adduser,
 	python-urwid, python (>=2.7) | python-argparse
 Recommends: fping
-Description: a server giving encrypted passwords to Mandos clients
+Description: server giving encrypted passwords to Mandos clients
  This is the server part of the Mandos system, which allows
  computers to have encrypted root file systems and at the
  same time be capable of remote and/or unattended reboots.

=== modified file 'mandos'
--- mandos	2011-09-18 14:28:47 +0000
+++ mandos	2011-09-18 15:59:05 +0000
@@ -299,7 +299,7 @@
                                       until this client is disabled
     extended_timeout:   extra long timeout when password has been sent
     runtime_expansions: Allowed attributes for runtime expansion.
-    expire:     datetime.datetime(); time (UTC) when a client will be
+    expires:    datetime.datetime(); time (UTC) when a client will be
                 disabled, or None
     """