summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornijtmans <nijtmans>2008-11-05 22:58:29 (GMT)
committernijtmans <nijtmans>2008-11-05 22:58:29 (GMT)
commite0977490442f27f40657b3b80d060d8b832b4158 (patch)
tree6aa9478b6f3a703c707559849b15f439dbba03ac
parent2d48ae8ff78acce1c21210e9e27220ad5e22e877 (diff)
downloadtk-e0977490442f27f40657b3b80d060d8b832b4158.zip
tk-e0977490442f27f40657b3b80d060d8b832b4158.tar.gz
tk-e0977490442f27f40657b3b80d060d8b832b4158.tar.bz2
fix [Bug 1866774 ] Remove X10 references from docs
-rw-r--r--ChangeLog2
-rw-r--r--doc/GetBitmap.34
-rw-r--r--doc/GetCursor.34
3 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 716ad80..d7a13d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@
* generic/tkImgBmap.c:
* generic/tkBitmap.c: remove unneccessary type cast
* generic/tkIntDecls.h: (regenerated)
+ * doc/GetCursor.3: fix documentation about obsolete X10 bitmaps
+ * doc/GetBitmap.3: [Bug 1866774] Remove X10 references from docs
2008-11-03 Jan Nijtmans <nijtmans@users.sf.net>
diff --git a/doc/GetBitmap.3 b/doc/GetBitmap.3
index 9042313..84f729d 100644
--- a/doc/GetBitmap.3
+++ b/doc/GetBitmap.3
@@ -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: GetBitmap.3,v 1.15 2008/06/30 22:57:01 dkf Exp $
+'\" RCS: @(#) $Id: GetBitmap.3,v 1.16 2008/11/05 22:58:30 nijtmans Exp $
'\"
.so man.macros
.TH Tk_AllocBitmapFromObj 3 8.1 Tk "Tk Library Procedures"
@@ -83,7 +83,7 @@ of the following forms:
.TP 20
\fB@\fIfileName\fR
\fIFileName\fR must be the name of a file containing a bitmap
-description in the standard X11 or X10 format.
+description in the standard X11 format.
.TP 20
\fIname\fR
\fIName\fR must be the name of a bitmap defined previously with
diff --git a/doc/GetCursor.3 b/doc/GetCursor.3
index ae3fb4e..f4833e7 100644
--- a/doc/GetCursor.3
+++ b/doc/GetCursor.3
@@ -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: GetCursor.3,v 1.14 2008/06/30 22:57:01 dkf Exp $
+'\" RCS: @(#) $Id: GetCursor.3,v 1.15 2008/11/05 22:58:29 nijtmans Exp $
'\"
.so man.macros
.TH Tk_AllocCursorFromObj 3 8.1 Tk "Tk Library Procedures"
@@ -119,7 +119,7 @@ in preference to black and white cursors.
\fB@\fIsourceName\0maskName\0fgColor\0bgColor\fR
In this form, \fIsourceName\fR and \fImaskName\fR are the names of
files describing cursors for the cursor's source bits and mask.
-Each file must be in standard X11 or X10 cursor format.
+Each file must be in standard X11 cursor format.
\fIFgColor\fR and \fIbgColor\fR
indicate the colors to use for the
cursor, in any of the forms acceptable to \fBTk_GetColor\fR. This