Merge lp:~colin-king/powerd/lp-1231455 into lp:powerd

[Colin Ian King]

Minor tidy up and corrections to powerd cli help (LP: #1231455)

Minor clean up of powerd-cli, fixes my quibbles in LP: #1231455

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:114
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~colin-king/powerd/lp-1231455/+merge/208844/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/powerd-ci/140/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/powerd-trusty-armhf-ci/10
        deb: http://jenkins.qa.ubuntu.com/job/powerd-trusty-armhf-ci/10/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/powerd-ci/140/rebuild

review: Needs Fixing (continuous-integration)

[Seth Forshee (sforshee)]

+1

I actually started to do a big rewrite of cli while on a flight last month which would have ultimately resulted in cleaning up the help text, but I never got around to finishing it. Guess I should find time to do that sometime, becasue atm it's a bit of a mess.

review: Approve

[Seth Forshee (sforshee)]

review: Approve

=== modified file 'cli/powerd-cli.c'
--- cli/powerd-cli.c	2013-09-24 14:49:49 +0000
+++ cli/powerd-cli.c	2014-02-28 15:44:52 +0000
@@ -962,28 +962,28 @@
     printf("active - request the active state, prevent the system from\n"\
            "\tsuspending. This does not modify the screen state.\n");
     printf("active-nc - same as active, but relies on powerd to cleanup\n"\
-            "\tthe request. This is only for testing and will immediately"\
+            "\tthe request. This is only for testing and will immediately\n"\
             "exit, causing the request to be dropped.\n");
-    printf("autobrightness <enable|disable> - enable or disable autobrightness\n");
-    printf("brightness <brightness> - set user screen brightness\n");
+    printf("autobrightness <enable|disable> - enable or disable autobrightness.\n");
+    printf("brightness <brightness> - set user screen brightness.\n");
     printf("brightness-params - get brightness parameters (min, max, etc.)\n");
-    printf("clear-sys <cookie> - clear a System state request given a cookie\n");
-    printf("clear-disp <cookie> - clear a Display state request given a cookie\n");
-    printf("client-test - test powerd registration / ack API\n");
+    printf("clear-sys <cookie> - clear a System state request given a cookie.\n");
+    printf("clear-disp <cookie> - clear a Display state request given a cookie.\n");
+    printf("client-test - test powerd registration / ack API.\n");
     printf("display <on|dc> [bright] [proximity] [disableab]\n"\
            "\tMake a display state request with the input parameters.\n"\
            "\tThe first argument represents the state of the display:\n"\
-           "\tOn, Off, or Don't Care (dc).\n"\
+           "\tOn (on) or Don't Care (dc),\n"\
            "\tThe final optional arguments respectively:\n"\
            "\t * make the screen bright [bright]\n"\
            "\t * enable the proximity sensor [proximity]\n"\
            "\t * disable autobrightness [disableab]\n");
-    printf("help - display this usage information\n");
-    printf("list - list outstanding requests\n");
-    printf("listen - listen for signals from powerd. This runs a\n"\
-           "\tgmainloop and must be manually killed.\n");
-    printf("stats - print request statistics\n");
-    printf("test - runs tests\n");
+    printf("help\t- display this usage information.\n");
+    printf("list\t- list outstanding requests.\n");
+    printf("listen\t- listen for signals from powerd. This runs a\n"\
+           "\t  gmainloop and must be manually killed.\n");
+    printf("stats\t- print request statistics.\n");
+    printf("test\t- runs tests.\n");
 }
 
 static void