From a9768b035f2c47be0908520474073cc68d225d8a Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 19 Jan 2010 23:10:44 +0000 Subject: Updated to: libX11-1.3.3 pixman-0.17.4 --- libX11/man/Compose.man | 52 +++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'libX11/man/Compose.man') diff --git a/libX11/man/Compose.man b/libX11/man/Compose.man index 213d6d44c..db48cc4f4 100644 --- a/libX11/man/Compose.man +++ b/libX11/man/Compose.man @@ -1,29 +1,23 @@ .\" Copyright 2009 Sun Microsystems, Inc. All rights reserved. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a -.\" copy of this software and associated documentation files (the -.\" "Software"), to deal in the Software without restriction, including -.\" without limitation the rights to use, copy, modify, merge, publish, -.\" distribute, and/or sell copies of the Software, and to permit persons -.\" to whom the Software is furnished to do so, provided that the above -.\" copyright notice(s) and this permission notice appear in all copies of -.\" the Software and that both the above copyright notice(s) and this -.\" permission notice appear in supporting documentation. +.\" copy of this software and associated documentation files (the "Software"), +.\" to deal in the Software without restriction, including without limitation +.\" the rights to use, copy, modify, merge, publish, distribute, sublicense, +.\" and/or sell copies of the Software, and to permit persons to whom the +.\" Software is furnished to do so, subject to the following conditions: .\" -.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -.\" OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -.\" HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -.\" INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -.\" FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -.\" NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -.\" WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +.\" The above copyright notice and this permission notice (including the next +.\" paragraph) shall be included in all copies or substantial portions of the +.\" Software. .\" -.\" Except as contained in this notice, the name of a copyright holder -.\" shall not be used in advertising or otherwise to promote the sale, use -.\" or other dealings in this Software without prior written authorization -.\" of the copyright holder. +.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +.\" DEALINGS IN THE SOFTWARE. .\" .\" shorthand for double quote that works everywhere. .ds q \N'34' @@ -56,18 +50,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__//Compose \*q). +.RI \*q __xlocaledir__//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: -- cgit v1.2.3