Merging XORG-CURRENT into trunkXORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGECOMPOSITEWRAP

3 files changed, 4 insertions, 4 deletions

diff --git a/bdftruncate.man b/bdftruncate.man
index f7a11c7..55cc0b7 100644
--- a/bdftruncate.man
+++ b/bdftruncate.man
@@ -1,4 +1,4 @@
-.TH bdftruncate 1 __vendorversion__ XFree86
+.TH bdftruncate __appmansuffix__ __vendorversion__
 .SH NAME
 bdftruncate \- generate truncated BDF font from ISO 10646-1-encoded BDF font
 .SH SYNOPSIS
diff --git a/ucs2any.c b/ucs2any.c
index fbd2e03..dc9543f 100644
--- a/ucs2any.c
+++ b/ucs2any.c
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-/* $XFree86: xc/fonts/util/ucs2any.c,v 1.1 2003/09/21 10:54:14 herrb Exp $ */
+/* $XFree86$ */
 /*
  * This utility allows you to generate from an ISO10646-1 encoded
  * BDF font other BDF fonts in any possible encoding. This way, you can
diff --git a/ucs2any.man b/ucs2any.man
index 66cdb39..2454f5d 100644
--- a/ucs2any.man
+++ b/ucs2any.man
@@ -1,4 +1,4 @@
-.TH ucs2any 1 __vendorversion__ XFree86
+.TH ucs2any __appmansuffix__ __vendorversion__
 .SH NAME
 ucs2any \- generate BDF fonts containing subsets of ISO 10646-1 codepoints
 .SH SYNOPSIS
@@ -60,7 +60,7 @@ will generate the files
 and
 .IR 6x13-iso8859-2.bdf .
 .SH FUTURE DIRECTIONS
-Hopefully a future XFree86 release will have a facility similar to
+Hopefully a future release will have a facility similar to
 .B ucs2any
 built into the server, and reencode ISO 10646-1 on the fly, because
 storing the same fonts in many different encodings is clearly a waste of