merge XFree86 4.3.0.1 to -CURRENT

1 files changed, 35 insertions, 4 deletions

diff --git a/xclock.man b/xclock.man
index 0019d77..56cf640 100644
--- a/xclock.man
+++ b/xclock.man
@@ -22,14 +22,18 @@
 .\" not be used in advertising or otherwise to promote the sale, use or
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
-.TH XCLOCK 1 "Release 6.4" "X Version 11"
+.\"
+.\" $XFree86: xc/programs/xclock/xclock.man,v 1.13 2002/10/21 13:33:08 alanh Exp $
+.\"
+.TH XCLOCK 1 __xorgversion__
 .SH NAME
 xclock \- analog / digital clock for X
 .SH SYNOPSIS
 .ta 8n
 \fBxclock\fP [ \fB\-help\fP ] [ \fB\-analog\fP ] [ \fB\-digital\fP ]
-[ \fB\-chime\fP ] [ \fB\-hd\fP \fIcolor\fP ]
+[ \fB\-brief\fP ] [ \fB\-chime\fP ] [ \fB\-hd\fP \fIcolor\fP ]
 [ \fB\-hl\fP \fIcolor\fP ] [ \fB\-update\fP \fIseconds\fP ]
+[ \fB\-strftime\fP \fIformat\fP ]
 [ \fB\-padding\fP \fInumber\fP ]
 .SH DESCRIPTION
 The
@@ -52,6 +56,27 @@ and hands should be used.  This is the default.
 \fB\-digital\fP or \fB\-d\fP
 This option indicates that a 24 hour digital clock should be used.
 .TP 8
+\fB\-brief\fP
+This option indicates that the digital clock should only display the hours
+and minutes fields.  The default is to show the full time and date information.
+.TP 8
+\fB\-utime\fP or \fB\-d\fP
+This option indicates that a digital clock should display seconds since
+the Epoch (in format '970012340 seconds since Epoch' instead of a standard
+24-hour time.
+.TP 8
+.B \-strftime \fIformat\fP
+This option allows an strftime(3) format string to be specified for the
+digital clock's display.
+.TP 8
+.B \-twelve
+This option indicates that a digital clock should display the time in
+twelve hour format.
+.TP 8
+.B \-twentyfour
+This option indicates that a digital clock should display the time in
+twenty-four hour format.  This is the default when a digital clock is used.
+.TP 8
 .B \-chime
 This option indicates that the clock should chime 
 once on the half hour and twice on the hour.
@@ -115,6 +140,10 @@ the default is \fIlwhite\fP, otherwise the default is \fIblack\fP.
 Specifies whether or not an analog clock should be used instead of a digital
 one.  The default is True.
 .TP 8
+.B twentyfour (\fPclass\fB Boolean)
+Specifies whether or not a digital clock should display the time in
+twenty-four hour format.  The default is True.
+.TP 8
 .B chime (\fPclass\fB Boolean)
 Specifies whether or not a bell should be rung on the hour and half hour.
 .TP 8
@@ -148,9 +177,11 @@ to get the default host and display number.
 to get the name of a resource file that overrides the global resources
 stored in the RESOURCE_MANAGER property.
 .SH FILES
-<XRoot>/lib/X11/app-defaults/XClock - specifies required resources
+.TP
+.I __apploaddir__/XClock
+specifies required resources
 .SH "SEE ALSO"
-X(1), xrdb(1), time(3C)
+X(__miscmansuffix__), xrdb(1), time(3C)
 .SH BUGS
 .I Xclock
 believes the system clock.