summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--COPYING25
-rw-r--r--mkfontscale.man11
2 files changed, 23 insertions, 13 deletions
diff --git a/COPYING b/COPYING
index 7f33cbf..31965e8 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,19 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright (c) 2002-2003 by Juliusz Chroboczek
-Please submit updated COPYING files to the Xorg bugzilla:
+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, 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:
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
-
-http://lists.freedesktop.org/mailman/listinfo/xorg
+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.
diff --git a/mkfontscale.man b/mkfontscale.man
index 6cb3b9f..3a2ca95 100644
--- a/mkfontscale.man
+++ b/mkfontscale.man
@@ -66,6 +66,7 @@ ignore scalable fonts. By default, scalable fonts are read. If
is set, this flag has the side effect of enabling the reading of
.B fonts.scale
files.
+.TP
.BI \-o " filename"
send program output to
.IR filename ;
@@ -82,7 +83,7 @@ output is written to standard output.
.TP
.BI \-x " suffix"
exclude all files with the specified
-.I suffix
+.IR suffix .
.TP
.BI \-a " encoding"
add
@@ -118,6 +119,8 @@ writing the "encodings.dir" file. The default is to convert relative
encoding directories to absolute directories by prepending the current
directory. The positioning of this options is significant, as this
option only applies to subsequent
+.B \-e
+options.
.TP
.B \-n
do not scan for fonts, do not write font directory files. This option
@@ -146,8 +149,8 @@ is equivalent to
.SH AUTHOR
The version of
.B mkfontscale
-included in this X.Org Foundataion release
-was originally written by Juliusz Chroboczek <jch@xfree86.org> for the XFree86
-project. The functionality of this program was inspired by the
+included in this X.Org Foundataion release was originally written by
+Juliusz Chroboczek <jch@freedesktop.org> for the XFree86 project. The
+functionality of this program was inspired by the
.B ttmkfdir
utility by Joerg Pommnitz.