[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/getconfig Imakefile, 1.1.10.1.4.3, 1.1.10.1.4.4 cfg.man, 1.1.10.1.4.2, 1.1.10.1.4.3 getconfig.man, 1.1.10.1.4.2, 1.1.10.1.4.3

Keith Packard xorg-commit at pdx.freedesktop.org
Sun Mar 28 19:51:41 PST 2004


Committed by: keithp

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/getconfig
In directory pdx:/tmp/cvs-serv8764/programs/Xserver/hw/xfree86/getconfig

Modified Files:
      Tag: XORG-RELEASE-1-TM
	Imakefile cfg.man getconfig.man 
Log Message:
41. TM fixes for remaining man pages. Also fixes broken
    CVS ident lines in many video driver man pages. (Keith Packard)


Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/getconfig/Imakefile,v
retrieving revision 1.1.10.1.4.3
retrieving revision 1.1.10.1.4.4
diff -u -d -r1.1.10.1.4.3 -r1.1.10.1.4.4
--- a/Imakefile	26 Mar 2004 19:54:39 -0000	1.1.10.1.4.3
+++ b/Imakefile	28 Mar 2004 07:53:43 -0000	1.1.10.1.4.4
@@ -27,10 +27,9 @@
 InstallNamedProg(getconfig.sh,getconfig,$(BINDIR))
 InstallNamedProg(getconfig.pl,getconfig.pl,$(BINDIR))
 
-InstallNonExecFile(xfree86.cfg,$(LIBDIR)/getconfig)
+InstallNonExecFile(xorg.cfg,$(LIBDIR)/getconfig)
 InstallNonExecFile(cfg.sample,$(LIBDIR)/getconfig)
 
-EXTRAMANDEFS = -D__XCONFIGFILE__=$(XCONFIGFILE) -D__XSERVERNAME__=$(XSERVERNAME)
 InstallManPage(getconfig,$(MANDIR))
 InstallGenManPageLong(cfg,$(FILEMANDIR),getconfig,$(FILEMANSUFFIX))
 

Index: cfg.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/getconfig/cfg.man,v
retrieving revision 1.1.10.1.4.2
retrieving revision 1.1.10.1.4.3
diff -u -d -r1.1.10.1.4.2 -r1.1.10.1.4.3
--- a/cfg.man	25 Mar 2004 11:00:52 -0000	1.1.10.1.4.2
+++ b/cfg.man	28 Mar 2004 07:53:43 -0000	1.1.10.1.4.3
@@ -6,10 +6,10 @@
 .SH DESCRIPTION
 .B getconfig
 is a programatic interface that is used by the
-.B __XSERVERNAME__
+.B __xservername__
 server to get configuration information about video hardware when
 operating without an
-.B __XCONFIGFILE__
+.B __xconfigfile__
 file.
 .PP
 This implementation of
@@ -43,10 +43,10 @@
 line of each rule is a perl expression.  It may be any valid perl
 expression whose evaluated (with 'eval') result may be used as the
 argument to a perl 'if' statement.  The second logical line should be
-the name of the __XSERVERNAME__ video driver to use when the rule is true, and
+the name of the __xservername__ video driver to use when the rule is true, and
 subsequent logical lines of each rule, if present, are additional
 configuration output for the video device's
-.B __XCONFIGFILE__
+.B __xconfigfile__
 .B Device
 section.  The driver name and additional lines of configuration information
 are written to standard output when the rule is chosen as the successful
@@ -98,7 +98,7 @@
 .I .cfg
 files located in the search path.  The search path typically specified
 by the
-.B __XSERVERNAME__
+.B __xservername__
 server is:
 .PP
 .RS 4
@@ -113,11 +113,11 @@
 where
 .I <modulepath>
 is the
-.B __XSERVERNAME__
+.B __xservername__
 server's module search path.
 .PP
 .TP 30
-.I __projectroot__/lib/X11/getconfig/xfree86.cfg
+.I __projectroot__/lib/X11/getconfig/xorg.cfg
 Default rules file that gets installed.  This file doesn't contain any
 rules by default.
 .TP 30
@@ -127,11 +127,11 @@
 
 .SH "SEE ALSO"
 getconfig(1),
-__XSERVERNAME__(1),
-__XCONFIGFILE__(__filemansuffix__).
+__xservername__(__appmansuffix__),
+__xconfigfile__(__filemansuffix__).
 
 .SH AUTHORS
-The __XSERVERNAME__ automatic configuration support and the
+The __xservername__ automatic configuration support and the
 .B getconfig
 interface was written by David H. Dawes, with the support of X-Oz
 Technologies for XFree86.

Index: getconfig.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/getconfig/getconfig.man,v
retrieving revision 1.1.10.1.4.2
retrieving revision 1.1.10.1.4.3
diff -u -d -r1.1.10.1.4.2 -r1.1.10.1.4.3
--- a/getconfig.man	25 Mar 2004 11:00:52 -0000	1.1.10.1.4.2
+++ b/getconfig.man	28 Mar 2004 07:53:43 -0000	1.1.10.1.4.3
@@ -1,6 +1,6 @@
 .TH getconfig 1 __vendorversion__
 .SH NAME
-getconfig - get configuration information for the __XSERVERNAME__ server
+getconfig - get configuration information for the __xservername__ server
 .SH SYNOPSIS
 .B getconfig
 .RI [ option
@@ -8,10 +8,10 @@
 .SH DESCRIPTION
 .B getconfig
 is a programatic interface that is used by the
-.B __XSERVERNAME__
+.B __xservername__
 server to get configuration information about video hardware when
 operating without an
-.B __XCONFIGFILE__
+.B __xconfigfile__
 file.
 .PP
 This implementation of
@@ -20,7 +20,7 @@
 rules supplied internally and from meta-configuration files.  The rules
 are in the form of perl expressions.
 .B getconfig
-writes to standard output the __XCONFIGFILE__-style configuration data
+writes to standard output the __xconfigfile__-style configuration data
 specified by the last highest priority rule that evaluates to true.
 Information about the format of the meta-configuration files can be
 found in the getconfig(__filemansuffix__) manual page.
@@ -43,8 +43,9 @@
 .B \-V
 Print out the version information and exit.
 .TP 8
-.BI \-X " __XSERVERNAME__-version"
-Specify the __XSERVERNAME__ version in numeric (integer) form.
+.BI \-X 
+.BI __xservername__-version
+Specify the __xservername__ version in numeric (integer) form.
 .TP 8
 .BI \-b " subsys-id"
 Specify the PCI subsystem ID of the video device.
@@ -67,7 +68,7 @@
 .I .cfg
 files located in the search path.  The search path typically specified
 by the
-.B __XSERVERNAME__
+.B __xservername__
 server is:
 .PP
 .RS 4
@@ -82,16 +83,16 @@
 where
 .I <modulepath>
 is the
-.B __XSERVERNAME__
+.B __xservername__
 server's module search path.
 
 .SH "SEE ALSO"
 getconfig(__filemansuffix__),
-__XSERVERNAME__(1),
-__XCONFIGFILE__(__filemansuffix__).
+__xservername__(__appmansuffix__),
+__xconfigfile__(__filemansuffix__).
 
 .SH AUTHORS
-The __XSERVERNAME__ automatic configuration support and the
+The __xservername__ automatic configuration support and the
 .B getconfig
 interface was written by David H. Dawes, with the support of X-Oz
 Technologies for XFree86.




More information about the xorg-commit-diffs mailing list