Use the real name of the DPMS extension in messages & man page

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

2 files changed, 11 insertions, 8 deletions

diff --git a/man/xset.man b/man/xset.man
index e9f1c5e..92c641e 100644
--- a/man/xset.man
+++ b/man/xset.man
@@ -38,6 +38,7 @@ xset - user preference utility for X
 [+dpms] [-dpms]
 .br
 	[dpms \fIstandby\fP [\fI suspend\fP [\fI off\fP]]]
+.br
 	[dpms force {standby|suspend|off|on}]
 .br
 [fp=\fIpathlist\fP]
@@ -61,6 +62,7 @@ xset - user preference utility for X
 [r {on|off}] [r rate \fIdelay\fP [\fIrate\fP]]
 .br
 [s [\fIlength\fP [\fIperiod\fP]]] [s {blank|noblank}]
+.br
 [s {expose|noexpose}] [s {on|off}] [s default] [s activate] [s reset]
 .br
 [q]
@@ -120,14 +122,15 @@ the volume to the nearest value that the hardware can support.
 .PP
 .TP 8
 .B \-dpms
-The \fB\-dpms\fP option disables DPMS (Energy Star) features.
+The \fB\-dpms\fP option disables Display Power Management Signaling (DPMS) features.
 .TP 8
 .B +dpms
-The \fB+dpms\fP option enables DPMS (Energy Star) features.
+The \fB+dpms\fP option enables Display Power Management Signaling (DPMS) features.
 .TP 8
 .B dpms \fIflags...\fP
-The \fBdpms\fP option allows the DPMS (Energy Star) parameters to be
-set.  The option can take up to three numerical values, or the `force'
+The \fBdpms\fP option allows the Display Power Management Signaling (DPMS)
+parameters to be set.
+The option can take up to three numerical values, or the `force'
 flag followed by a DPMS state.  The `force' flags forces the server
 to immediately switch to the DPMS state specified.  The DPMS state can
 be one of `standby', `suspend', `off', or `on'.  When numerical values are
diff --git a/xset.c b/xset.c
index 95da41b..5879166 100644
--- a/xset.c
+++ b/xset.c
@@ -1451,7 +1451,7 @@ query(Display *dpy)
 	BOOL onoff;
 	CARD16 state;
 
-	printf("DPMS (Energy Star):\n");
+	printf("DPMS (Display Power Management Signaling):\n");
 	if (DPMSQueryExtension(dpy, &dummy, &dummy)) {
 	    if (DPMSCapable(dpy)) {
 		DPMSGetTimeouts(dpy, &standby, &suspend, &off);
@@ -1604,9 +1604,9 @@ usage(const char *fmt, ...)
             "    To set keyclick volume:\n"
             "\t c [0-100]        c on\n"
 #ifdef DPMSExtension
-            "    To control Energy Star (DPMS) features:\n"
-            "\t-dpms      Energy Star features off\n"
-            "\t+dpms      Energy Star features on\n"
+            "    To control Display Power Management Signaling (DPMS) features:\n"
+            "\t-dpms      DPMS features off\n"
+            "\t+dpms      DPMS features on\n"
             "\t dpms [standby [suspend [off]]]     \n"
             "\t      force standby \n"
             "\t      force suspend \n"