3ca0349
--- xterm-226/xterm.man.man-page_paths	2007-06-13 23:19:59.000000000 +0200
3ca0349
+++ xterm-226/xterm.man	2007-06-21 16:06:15.000000000 +0200
3ca0349
@@ -679,7 +679,7 @@ xterm -e /bin/bash -l -c "my command her
69b28ac
 .RE
69b28ac
 .IP
69b28ac
 Finally, \fB-ls\fP is not completely ignored,
69b28ac
-because \fIxterm\ -ls\ -e\fP does write a \fI/etc/wtmp\fP entry
69b28ac
+because \fIxterm\ -ls\ -e\fP does write a \fI/var/log/wtmp\fP entry
69b28ac
 (if configured to do so),
69b28ac
 whereas \fIxterm\ -e\fP does not.
69b28ac
 .TP 8
3ca0349
@@ -1575,17 +1575,17 @@ Since X11R6, bitmap fonts have been scal
69b28ac
 The font server claims to provide the bold font that \fIxterm\fP requests,
69b28ac
 but the result is not always readable.
69b28ac
 XFree86 provides a feature which can be used to suppress the scaling.
69b28ac
-In the X server's configuration file (e.g., "/etc/X11/XFree86"), you
69b28ac
+In the X server's configuration file (e.g., __xorgcfgdir__/__xorgcfgfil__), you
69b28ac
 can add ":unscaled" to the end of the directory specification for the
69b28ac
 "misc" fonts, which comprise the fixed-pitch fonts that are used by \fIxterm\fP.
69b28ac
 For example
69b28ac
 .RS
69b28ac
-	FontPath	"/usr/lib/X11/fonts/misc/"
69b28ac
+	FontPath	"__fontpath__"
69b28ac
 .RE
69b28ac
 .IP
69b28ac
 would become
69b28ac
 .RS
69b28ac
-	FontPath	"/usr/lib/X11/fonts/misc/:unscaled"
69b28ac
+	FontPath	"__fontpath__/misc/:unscaled"
69b28ac
 .RE
69b28ac
 .IP
69b28ac
 Depending on your configuration, the font server may have its own configuration
3ca0349
@@ -4596,10 +4596,10 @@ may be defined to a nonstandard location
69b28ac
 .SH FILES
69b28ac
 The actual pathnames given may differ on your system.
69b28ac
 .TP 5
69b28ac
-\fI/etc/utmp\fP
69b28ac
+\fI/var/run/utmp\fP
69b28ac
 the system logfile, which records user logins.
69b28ac
 .TP 5
69b28ac
-\fI/etc/wtmp\fP
69b28ac
+\fI/var/log/wtmp\fP
69b28ac
 the system logfile, which records user logins and logouts.
69b28ac
 .TP 5
69b28ac
 .I __apploaddir__/XTerm
3ca0349
--- xterm-226/minstall.sh.man-page_paths	2007-05-25 00:10:42.000000000 +0200
3ca0349
+++ xterm-226/minstall.sh	2007-06-21 16:29:57.000000000 +0200
3ca0349
@@ -26,10 +26,17 @@ MY_MANSECT=$suffix
3ca0349
 X_MANSECT=`man X 2>&1 | tr '\012' '\020' | sed -e 's/^[^0123456789]*\([^) ][^) ]*\).*/\1/'`
3ca0349
 test -z "$X_MANSECT" && X_MANSECT=$suffix
69b28ac
 
69b28ac
+fontpath=/usr/share/X11/fonts
69b28ac
+xorgcfgdir=/etc/X11
69b28ac
+xorgcfgfil=xorg.conf
3ca0349
+X_MANSECT=7
4715263
 sed	-e 's%__vendorversion__%"X Window System"%' \
69b28ac
 	-e s%__apploaddir__%$APPS_DIR% \
3ca0349
 	-e s%__mansuffix__%$MY_MANSECT%g \
3ca0349
 	-e s%__miscmansuffix__%$X_MANSECT%g \
3ca0349
+ 	-e s%__fontpath__%$fontpath%g \
3ca0349
+ 	-e s%__xorgcfgdir__%$xorgcfgdir%g \
3ca0349
+ 	-e s%__xorgcfgfil__%$xorgcfgfil%g \
69b28ac
 	$OLD_FILE >$NEW_FILE
69b28ac
 
69b28ac
 echo "$MINSTALL $OLD_FILE $END_FILE"