[PATCH:libX11] Add %S substitutions to Compose man page

Alan Coopersmith alan.coopersmith at sun.com
Thu Jan 14 08:32:16 PST 2010


Commit 9df349a7894725f9469b106af645f57f7f3f9af3 added support for %S
in Compose file include statements - this documents it in the Compose
file man page.

Also changes the existing substitution documentation to list format
instead of a paragraph format to allow easier adding of %S.

Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>
---
 man/Compose.man |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/man/Compose.man b/man/Compose.man
index 213d6d4..d539071 100644
--- a/man/Compose.man
+++ b/man/Compose.man
@@ -56,18 +56,24 @@ instruction.  This allows local modifications to be made to existing compose
 files without including all of the content directly.  For example, the
 system's iso8859-1 compose file can be included with a line like this:
 .RS 4
-.BI "include \*q" __xlocaledir__/iso8859-1/Compose \*q
+.BI "include \*q" %S/iso8859-1/Compose \*q
 .RE
 .PP
-There are two substitutions that can be made in the file name of the
-include instruction.
+There are several substitutions that can be made in the file name of the
+include instruction:
+.TP 4
 .I %H
 expands to the user's home directory (the
 .B $HOME
-environment variable), and
+environment variable)
+.TP 4
 .I %L
 expands to the name of the locale specific Compose file (i.e.,
-.RI \*q __xlocaledir__/<localename>/Compose \*q).
+.RI \*q __xlocaledir__/<localename>/Compose \*q)
+.TP 4
+.I %S
+expands to the name of the system directory for Compose files (i.e.,
+.RI \*q __xlocaledir__ \*q)
 .PP
 For example, you can include in your compose file the default Compose file
 by using:
-- 
1.5.6.5



More information about the xorg-devel mailing list