Merge branch 'master' into richardgv-dev

Merged the documentation changes. Program code unchanged.
2012-10-29 09:53:38 +08:00
parent 40178702ef 239796abc6
commit 9b61999cae
6 changed files with 288 additions and 90 deletions
--- a/src/compton.c
+++ b/src/compton.c
@ -3318,7 +3318,7 @@ usage(void) {
    "  Opacity of window titlebars and borders. (0.1 - 1.0)\n"
    "-G\n"
    "  Don't draw shadows on DND windows\n"
-    "-b daemonize\n"
+    "-b\n"
    "  Daemonize process.\n"
    "-S\n"
    "  Enable synchronous operation (for debugging).\n"