Merge lp:~bregma/compiz/lp-1475508 into lp:compiz/0.9.12

[Stephen M. Webb]

Fixed the Compiz manpage and --help message to agree with the actual command-line options supported.

Fixed the Compiz manpage and --help message to agree with the actual command-line options supported.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3961
http://jenkins.qa.ubuntu.com/job/compiz-ci/64/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-wily-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-wily-armhf-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-wily-i386-ci/9

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

review: Approve (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

+1

review: Approve

=== modified file 'debian/compiz.1'
--- debian/compiz.1	2012-06-19 11:22:48 +0000
+++ debian/compiz.1	2015-07-17 19:31:01 +0000
@@ -1,4 +1,4 @@
-.TH COMPIZ 1 "September 29, 2006"
+.TH COMPIZ 1 2015-07-17 Compiz
 
 .SH NAME
 compiz \- OpenGL window and compositing manager
@@ -7,17 +7,15 @@
 .B compiz
 .RI [ options ]
 .RI [ plugins ]
+
 .SH DESCRIPTION
 .B compiz
-is a compositing window-manager using OpenGL for rendering.
+is a compositing window manager using OpenGL for rendering.
 
 .SH OPTIONS
 .TP
-.B \-\-help
-Show summary of options.
-.TP
-.B \-v, \-\-version
-Show version of program.
+.B \-\-debug
+Enable debug mode.
 .TP
 .BI "\-\-display " DISPLAY
 Manage the display called
@@ -26,39 +24,34 @@
 .I $DISPLAY
 environment variable.
 .TP
-.BI "\-\-refresh\-rate " RATE
-Set the default refresh rate.
-.TP
-.BI \-\-fast\-filter
-Use a fast texture filter.
-.TP
-.BI \-\-indirect\-rendering
-Force an indirect rendering context. Use this when running compiz on AIGLX.
-.TP
-.BI \-\-strict\-binding
-Enable strict binding of textures. Use this when running compiz on AIGLX.
-.TP
-.BI \-\-use\-cow
-Make use of the composite overlay window.
-.TP
-.BI \-\-replace
-Replace any existing window managers on the given X display.
-.TP
-.BI \-\-sm\-disable
-Disable the session management.
+.B \-\-help
+Shows a summary of options and exit.
+.TP
+.B \-\-keep\-desktop\-hints
+Retains existing desktop hints.
+.TP
+.B \-\-no\-auto\-add\-ccp
+Do not automatically load the Compiz config plugin (ccp).
+.TP
+.B \-\-replace
+Replaces any existing window managers on the given X display.
+.TP
+.B \-\-send\-startup\-message
+Sends a message to all connected X clientd once startup is complete.
+.TP
+.B \-\-sm\-disable
+Disables session management.
 .TP
 .BI "\-\-sm\-client\-id " ID
-Use the given
+Uses the given
 .I ID
 as the client ID for session management.
 .TP
-.BI "\-\-bg\-image " IMAGE
-Use
-.I IMAGE
-as background image.
+.B \-\-sync
+Makes all X calls synchronous.
+.TP
+.B \-\-version
+Prints the version of the program and exits.
 
 .SH AUTHOR
 compiz was written by David Reveman <[e-mail]> and others.
-.PP
-This manual page was written by Thierry Reding <[e-mail]>,
-for the Debian project (but may be used by others).

=== modified file 'src/main.cpp'
--- src/main.cpp	2015-04-23 20:07:35 +0000
+++ src/main.cpp	2015-07-17 19:31:01 +0000
@@ -48,16 +48,17 @@
 {
     printf ("Usage: %s [OPTIONS] [PLUGINS ...]\n"
             "Options:\n"
-            "  --replace             Replace any existing window managers\n"
-            "  --display DISPLAY     Connect to X display DISPLAY (instead of $DISPLAY)\n"
-            "  --sm-disable          Disable session management\n"
-            "  --sm-client-id ID     Session management client ID\n"
-            "  --keep-desktop-hints  Retain existing desktop hints\n"
-            "  --no-auto-add-ccp     Do not automatically load the ccp plugin\n"
-            "  --sync                Make all X calls synchronous\n"
-            "  --debug               Enable debug mode\n"
-            "  --version             Show the program version\n"
-            "  --help                Show this summary\n"
+            "  --debug                 Enable debug mode\n"
+            "  --display DISPLAY       Connect to X display DISPLAY (instead of $DISPLAY)\n"
+            "  --help                  Show this summary\n"
+            "  --keep-desktop-hints    Retain existing desktop hints\n"
+            "  --no-auto-add-ccp       Do not automatically load the ccp plugin\n"
+            "  --replace               Replace any existing window managers\n"
+            "  --send-startup-message  Sends a message to connected clients on startup completion.\n"
+            "  --sm-client-id ID       Session management client ID\n"
+            "  --sm-disable            Disable session management\n"
+            "  --sync                  Make all X calls synchronous\n"
+            "  --version               Show the program version\n"
             , programName);
 }