summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatthoyts <patthoyts@users.sourceforge.net>2008-07-26 16:19:03 (GMT)
committerpatthoyts <patthoyts@users.sourceforge.net>2008-07-26 16:19:03 (GMT)
commit1ed107a6e561cb329e268c10817cb222f0e7ca28 (patch)
tree60bc173935d31a5beb8211c0b6b6f69f0dd9c4b3
parentcd201a745af23cce1d4e8c78aaed0a39b5760788 (diff)
downloadtk-1ed107a6e561cb329e268c10817cb222f0e7ca28.zip
tk-1ed107a6e561cb329e268c10817cb222f0e7ca28.tar.gz
tk-1ed107a6e561cb329e268c10817cb222f0e7ca28.tar.bz2
bug #1686012: Direct user to the font manual for the -font option
-rw-r--r--ChangeLog2
-rw-r--r--doc/options.n5
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c5a2ce5..f6cbfa6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2008-07-26 Pat Thoyts <patthoyts@users.sourceforge.net>
+ * doc/options.n: Direct to the font manual for -font [Bug 1686012]
+
* win/tkWinWindow.c: Check for 0x prefix in sprintf %p. Bug [2026405]
2008-07-22 Daniel Steffen <das@users.sourceforge.net>
diff --git a/doc/options.n b/doc/options.n
index 83b5f1f..60a6e40 100644
--- a/doc/options.n
+++ b/doc/options.n
@@ -5,7 +5,7 @@
'\" See the file "license.terms" for information on usage and redistribution
'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
'\"
-'\" RCS: @(#) $Id: options.n,v 1.15 2007/12/13 15:23:43 dgp Exp $
+'\" RCS: @(#) $Id: options.n,v 1.15.2.1 2008/07/26 16:19:04 patthoyts Exp $
'\"
.so man.macros
.TH options n 4.4 Tk "Tk Built-In Commands"
@@ -122,7 +122,8 @@ requests when it has a selection. The default is usually for widgets
to export selections.
.OP \-font font Font
Specifies the font to use when drawing text inside the widget.
-The value may have any of the forms accepted by \fBTk_GetFont\fR.
+The value may have any of the forms described in the \fBfont\fR manual
+page under \fBFONT DESCRIPTION\fR.
.OP "\-foreground or \-fg" foreground Foreground
Specifies the normal foreground color to use when displaying the widget.
.OP \-highlightbackground highlightBackground HighlightBackground