[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force X.Org X11 SVN commit: r113 - in trunk/debian: . local



Author: dnusinow
Date: 2005-05-16 22:37:32 -0500 (Mon, 16 May 2005)
New Revision: 113

Modified:
   trunk/debian/changelog
   trunk/debian/local/dexconf.1
Log:
Merge changes from xfree tree to local/dexconf.1

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-05-17 03:34:54 UTC (rev 112)
+++ trunk/debian/changelog	2005-05-17 03:37:32 UTC (rev 113)
@@ -23,6 +23,7 @@
         - validate-posix-sh
       - Merge changes from xfree tree to local directory:
         - dexconf
+        - dexconf.1
 
     - Re-add jisx0208.1983-0.enc.gz to MANIFEST.all's list of font encodings
       until I know more about why it was removed.

Modified: trunk/debian/local/dexconf.1
===================================================================
--- trunk/debian/local/dexconf.1	2005-05-17 03:34:54 UTC (rev 112)
+++ trunk/debian/local/dexconf.1	2005-05-17 03:37:32 UTC (rev 113)
@@ -18,7 +18,16 @@
 .\" the Debian operating system, in /usr/share/common-licenses/GPL;  if
 .\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
 .\" Suite 330, Boston, MA 02111-1307 USA
-.TH dexconf 1 "2004\-08\-21" "Debian Project"
+.\"
+.\" We need the URL macro from groff's www macro package, but also want
+.\" things to work all right for people who don't have it.  So we define
+.\" our own URL macro and let the www macro package override it if it's
+.\" available.
+.de URL
+\\$2 \(laURL: \\$1 \(ra\\$3
+..
+.if \n[.g] .mso www.tmac
+.TH dexconf 1 "2004\-10\-31" "Debian Project"
 .SH NAME
 dexconf \- generate XFree86 X server configuration file from debconf data
 .SH SYNOPSIS
@@ -98,19 +107,19 @@
 If not set,
 .I /tmp
 is used as the parent of the scratch directory.
-.SH OUTPUT FILES
+.SH "OUTPUT FILES"
 .TP
 .I /etc/X11/XF86Config\-4
-Configuration file for the XFree86
+is the configuration file for the XFree86
 .RI 4. x
 X server.
 .SH DIAGNOSTICS
 .B dexconf
-produces several diagnostic messages if it encounters an error condition.
+produces diagnostic messages upon encountering various error conditions.
 These messages are prefixed with the name of the command and a colon; for
 example:
 .RS
-.B "dexconf: error encountered"
+.BI "dexconf: " message
 .RE
 A list of diagnostic messages currently issued by
 .B dexconf
@@ -122,9 +131,10 @@
 .BR \-f ,
 .B \-\-format
 option.
-See the \(oqHISTORY\(cq section below.
+See the \(lqHISTORY\(rq section below.
 .TP
-.BI "cannot create temporary work directory; " dirname " does not exist or is not a directory"
+.BI "cannot create temporary work directory; " dirname " does not exist or is\
+\& not a directory"
 .B
 dexconf
 was unable to create a scratch directory to work in because the parent
@@ -137,7 +147,8 @@
 .B TMPDIR
 environment variable to the name of an existing directory.
 .TP
-.BI "cannot create temporary work directory in " dirname "; directory not writable"
+.BI "cannot create temporary work directory in " dirname "; directory not\
+\& writable"
 .B dexconf
 had insufficient permissions to create a directory in
 .IR dirname .
@@ -281,10 +292,19 @@
 .I /dev/tty
 might not work either.
 It may be best to use a temporary file or known location.
+.SH BUGS
+See
+.URL "http://bugs.debian.org/xserver\-common"; "the Debian Bug Tracking System" .
+If you wish to report a bug in
+.BR dexconf ,
+please see
+.I /usr/share/doc/debian/bug\-reporting.txt
+or the
+.BR reportbug (1)
+command.
 .SH AUTHOR
 .B dexconf
-was written by Branden Robinson for Progeny Linux Systems, Inc., and the
-Debian Project.
+was written by Branden Robinson with sponsorship from Progeny Linux Systems.
 .SH "SEE ALSO"
 .BR XF86Config\-4 (5x),
 .BR xf86cfg (1x),
@@ -293,12 +313,4 @@
 .PP
 .IR "Debian X Window System Frequently Asked Questions" :
 /usr/share/doc/xfree86\-common/FAQ.xhtml
-.\" OPERANDS
-.\" INPUT FILES
-.\" STDIN
-.\" STDOUT
-.\" STDERR
-.\" EXTENDED DESCRIPTION
-.\" CONSEQUENCES OF ERRORS
-.\" APPLICATION USAGE
-.\" EXAMPLES
+.\" vim:set et tw=80:



Reply to: