man: s/__/@/g

A cosmetic change for automake (though we have to replicate some of
xorg-macros.m4 in manpages.am now), but meson's configure_file() wants
@-delimited strings.

Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>

1 files changed, 14 insertions, 14 deletions

diff --git a/man/Xserver.man b/man/Xserver.man
index 506e5bb70..31ffb8cff 100644
--- a/man/Xserver.man
+++ b/man/Xserver.man
@@ -26,7 +26,7 @@
 .\" $XFree86: xc/programs/Xserver/Xserver.man,v 3.31 2004/01/10 22:27:46 dawes Exp $
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
-.TH XSERVER 1 __xorgversion__
+.TH XSERVER 1 @xorgversion@
 .SH NAME
 Xserver \- X Window System display server
 .SH SYNOPSIS
@@ -73,7 +73,7 @@ should override values specified via other mechanisms.
 The X server runs as the given \fIdisplaynumber\fP, which by default is 0.
 If multiple X servers are to run simultaneously on a host, each must have
 a unique display number.  See the DISPLAY
-NAMES section of the \fIX\fP(__miscmansuffix__) manual page to learn how to
+NAMES section of the \fIX\fP(@miscmansuffix@) manual page to learn how to
 specify which display number clients should try to use.
 .TP 8
 .B \-a \fInumber\fP
@@ -98,7 +98,7 @@ Audit lines are sent as standard error output.
 .B \-auth \fIauthorization-file\fP
 specifies a file which contains a collection of authorization records used
 to authenticate access.  See also the \fIxdm\fP(1) and
-\fIXsecurity\fP(__miscmansuffix__) manual pages.
+\fIXsecurity\fP(@miscmansuffix@) manual pages.
 .TP 8
 .BI \-background\ none
 Asks the driver not to clear the background on startup, if the driver supports that.
@@ -420,7 +420,7 @@ X servers that support the XKEYBOARD (a.k.a. \*qXKB\*q) extension accept the
 following options.  All layout files specified on the command line must be
 located in the XKB base directory or a subdirectory, and specified as the
 relative path from the XKB base directory.  The default XKB base directory is
-.IR __projectroot__/lib/X11/xkb .
+.IR @projectroot@/lib/X11/xkb .
 .TP 8
 .BR [+-]accessx " [ \fItimeout\fP [ \fItimeout_mask\fP [ \fIfeedback\fP [ \fIoptions_mask\fP ] ] ] ]"
 enables(+) or disables(-) AccessX key sequences.
@@ -444,13 +444,13 @@ loads keyboard description in \fIfilename\fP on server startup.
 The X server supports client connections via a platform-dependent subset of
 the following transport types: TCP/IP, Unix Domain sockets,
 and several varieties of SVR4 local connections.  See the DISPLAY
-NAMES section of the \fIX\fP(__miscmansuffix__) manual page to learn how to
+NAMES section of the \fIX\fP(@miscmansuffix@) manual page to learn how to
 specify which transport type clients should try to use.
 .SH GRANTING ACCESS
 The X server implements a platform-dependent subset of the following
 authorization protocols: MIT-MAGIC-COOKIE-1, XDM-AUTHORIZATION-1,
 XDM-AUTHORIZATION-2, SUN-DES-1, and MIT-KERBEROS-5.  See the
-\fIXsecurity\fP(__miscmansuffix__) manual page for information on the
+\fIXsecurity\fP(@miscmansuffix@) manual page for information on the
 operation of these protocols.
 .PP
 Authorization data required by the above protocols is passed to the
@@ -537,7 +537,7 @@ the X server uses when trying to open a font is controlled
 by the \fIfont path\fP.
 .LP
 The default font path is
-__default_font_path__ .
+@default_font_path@ .
 .LP
 A special kind of directory can be specified using the \fBcatalogue\fP:
 prefix. Directories specified this way can contain symlinks pointing to the
@@ -583,22 +583,22 @@ the following font path:
 .I /etc/X\fBn\fP.hosts
 Initial access control list for display number \fBn\fP
 .TP 30
-.IR __datadir__/fonts/X11/misc , __datadir__/fonts/X11/75dpi , __datadir__/fonts/X11/100dpi
+.IR @datadir@/fonts/X11/misc , @datadir@/fonts/X11/75dpi , @datadir@/fonts/X11/100dpi
 Bitmap font directories
 .TP 30
-.IR __datadir__/fonts/X11/TTF , __datadir__/fonts/X11/Type1
+.IR @datadir@/fonts/X11/TTF , @datadir@/fonts/X11/Type1
 Outline font directories
 .TP 30
 .I /tmp/.X11-unix/X\fBn\fP
 Unix domain socket for display number \fBn\fP
 .TP 30
 .I /usr/adm/X\fBn\fPmsgs
-Error log file for display number \fBn\fP if run from \fIinit\fP(__adminmansuffix__)
+Error log file for display number \fBn\fP if run from \fIinit\fP(@adminmansuffix@)
 .TP 30
-.I __projectroot__/lib/X11/xdm/xdm-errors
+.I @projectroot@/lib/X11/xdm/xdm-errors
 Default error log file if the server is run from \fIxdm\fP(1)
 .SH "SEE ALSO"
-General information: \fIX\fP(__miscmansuffix__)
+General information: \fIX\fP(@miscmansuffix@)
 .PP
 Protocols:
 .I "X Window System Protocol,"
@@ -609,9 +609,9 @@ Fonts: \fIbdftopcf\fP(1), \fImkfontdir\fP(1), \fImkfontscale\fP(1),
 \fIxfs\fP(1), \fIxlsfonts\fP(1), \fIxfontsel\fP(1), \fIxfd\fP(1),
 .I "X Logical Font Description Conventions"
 .PP
-Keyboards: \fIxkeyboard-config\fP(__miscmansuffix__)
+Keyboards: \fIxkeyboard-config\fP(@miscmansuffix@)
 .PP
-Security: \fIXsecurity\fP(__miscmansuffix__), \fIxauth\fP(1), \fIXau\fP(1),
+Security: \fIXsecurity\fP(@miscmansuffix@), \fIxauth\fP(1), \fIXau\fP(1),
 \fIxdm\fP(1), \fIxhost\fP(1), \fIxfwp\fP(1),
 .I "Security Extension Specification"
 .PP