From aebbce3f122d93abe36564fa49a8710f16d7d7d1 Mon Sep 17 00:00:00 2001
From: Ben Kibbey <bjk@luxsci.net>
Date: Sat, 10 Apr 2010 20:35:00 -0400
Subject: [PATCH] Version 2.12.

---
 debian/changelog |  6 ++++++
 doc/COMMANDS     |  8 ++++----
 po/pwmd.pot      | 40 ++++++++++++++++++++--------------------
 3 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6318ac57..c2b68b2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pwmd (2.12-1) testing; urgency=low
+
+  * New upstream. 
+
+ -- Ben Kibbey <bjk@luxsci.net>  Fri, 09 Apr 2010 19:07:11 -0400
+
 pwmd (2.11-1) testing; urgency=low
 
   * New upstream.
diff --git a/doc/COMMANDS b/doc/COMMANDS
index 382458a7..ca57727e 100644
--- a/doc/COMMANDS
+++ b/doc/COMMANDS
@@ -49,7 +49,7 @@ CACHETIMEOUT <filename> <seconds>
 
 
 LIST [[!]element[<TAB>[!]element[...]]]
-    If no element path is given then a list of newline separated root elements
+    If no element path is given then a newline separated list of root elements
     is returned with the data response. If given, then all reachable elements
     for the specified element path is returned. Each element in the path is
     prefixed with the literal '!' character when the element contains no
@@ -69,7 +69,7 @@ STORE [!]element[[<TAB>[!]element[...]]<TAB>[content]]
     last TAB then the content for the last specified element will be removed
     or empty if creating a new element.
     
-    The only restriction of element names is that they not contain whitespace
+    The only restriction of an element name is that it not contain whitespace
     or begin with the literal element character '!' unless specifying a
     literal element. There is no whitespace between the TAB delimited
     elements. It is recommended that the value be base 64 encoded to prevent
@@ -131,8 +131,8 @@ ATTR SET|GET|DELETE|LIST [<attribute>] [!]<arg1> [!][arg2]
 
     The "_name" attribute (case sensitive) cannot be removed with ATTR DELETE
     if the element path is the root element. Although it can be SET to change
-    the root element name but only if the destination element name doesn't
-    exist. Use the RENAME command for that instead.
+    the element name but only if the destination element name doesn't exist.
+    Use the RENAME command for that instead.
 
     Also see THE TARGET ATTRIBUTE below.
 
diff --git a/po/pwmd.pot b/po/pwmd.pot
index 462c6628..3ef23a6e 100644
--- a/po/pwmd.pot
+++ b/po/pwmd.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: bjk@luxsci.net\n"
-"POT-Creation-Date: 2010-03-20 09:35-0400\n"
+"POT-Creation-Date: 2010-04-10 20:34-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -185,60 +185,60 @@ msgstr ""
 msgid "%s. Maybe disabling pinentry (-P) will help?"
 msgstr ""
 
-#: src/pwmd.c:1034
+#: src/pwmd.c:1043
 #, c-format
 msgid "%s: Invalid characters in filename"
 msgstr ""
 
-#: src/pwmd.c:1066
+#: src/pwmd.c:1075
 #, c-format
 msgid "Adding '%s' to the file cache ..."
 msgstr ""
 
-#: src/pwmd.c:1114
+#: src/pwmd.c:1123
 #, c-format
 msgid "File '%s' now cached"
 msgstr ""
 
-#: src/pwmd.c:1153
+#: src/pwmd.c:1162
 #, c-format
 msgid "new connection: tid=%p, fd=%i"
 msgstr ""
 
-#: src/pwmd.c:1374
+#: src/pwmd.c:1383
 #, c-format
 msgid "%s started for user %s"
 msgstr ""
 
-#: src/pwmd.c:1375
+#: src/pwmd.c:1384
 #, c-format
 msgid "Listening on %s"
 msgstr ""
 
-#: src/pwmd.c:1424
+#: src/pwmd.c:1433
 #, c-format
 msgid "caught signal %i (%s)"
 msgstr ""
 
-#: src/pwmd.c:1437
+#: src/pwmd.c:1446
 msgid "clearing file cache"
 msgstr ""
 
-#: src/pwmd.c:1465
+#: src/pwmd.c:1474
 msgid "waiting for all clients to disconnect"
 msgstr ""
 
-#: src/pwmd.c:1471
+#: src/pwmd.c:1480
 #, c-format
 msgid "%i clients remain"
 msgstr ""
 
-#: src/pwmd.c:1644
+#: src/pwmd.c:1653
 #, c-format
 msgid "Converting version 1 data file '%s' to version 2 ..."
 msgstr ""
 
-#: src/pwmd.c:1811
+#: src/pwmd.c:1820
 #, c-format
 msgid ""
 "%s\n"
@@ -249,36 +249,36 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/pwmd.c:1866
+#: src/pwmd.c:1875
 msgid "invalid iteration count"
 msgstr ""
 
-#: src/pwmd.c:1949
+#: src/pwmd.c:1958
 #, c-format
 msgid "%s: socket_path not defined"
 msgstr ""
 
-#: src/pwmd.c:1955
+#: src/pwmd.c:1964
 #, c-format
 msgid "%s: data_directory not defined"
 msgstr ""
 
-#: src/pwmd.c:2016
+#: src/pwmd.c:2025
 msgid "Done. Daemonizing..."
 msgstr ""
 
-#: src/pwmd.c:2016
+#: src/pwmd.c:2025
 msgid "Done. Waiting for connections..."
 msgstr ""
 
-#: src/pwmd.c:2043
+#: src/pwmd.c:2052
 #, c-format
 msgid ""
 "Either there is another pwmd running or '%s' is a \n"
 "stale socket. Please remove it manually."
 msgstr ""
 
-#: src/pwmd.c:2120
+#: src/pwmd.c:2129
 msgid "pwmd exiting normally"
 msgstr ""
 
-- 
2.11.4.GIT