summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatthoyts <patthoyts@users.sourceforge.net>2010-01-08 00:36:56 (GMT)
committerpatthoyts <patthoyts@users.sourceforge.net>2010-01-08 00:36:56 (GMT)
commit10c0567193f3270ad1b08ba7973106659a100a84 (patch)
tree2e0cee564f548cb714725f1e06904f24cf8bfefa
parent14ce825dcd0062ad80540787437ee9decddd4ba1 (diff)
downloadtk-10c0567193f3270ad1b08ba7973106659a100a84.zip
tk-10c0567193f3270ad1b08ba7973106659a100a84.tar.gz
tk-10c0567193f3270ad1b08ba7973106659a100a84.tar.bz2
[Bug 2927569] Backported documentation fix for image put -to
-rw-r--r--ChangeLog6
-rw-r--r--doc/photo.n6
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ce22a68..cb7f208 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-08 Pat Thoyts <patthoyts@users.sourceforge.net>
+
+ * doc/photo.n: [Bug 2927569] Multiple edits have peverted the
+ original meaning of the phrase 'image file data' to reference
+ a filename option that does not exist.
+
2010-01-07 Donal K. Fellows <dkf@users.sf.net>
* generic/tkTextDisp.c (AsyncUpdateLineMetrics): [Bug 2677890]: Fix
diff --git a/doc/photo.n b/doc/photo.n
index 16a11bd..1adf772 100644
--- a/doc/photo.n
+++ b/doc/photo.n
@@ -9,7 +9,7 @@
'\" Department of Computer Science,
'\" Australian National University.
'\"
-'\" RCS: @(#) $Id: photo.n,v 1.22 2007/12/13 15:23:43 dgp Exp $
+'\" RCS: @(#) $Id: photo.n,v 1.22.2.1 2010/01/08 00:36:56 patthoyts Exp $
'\"
.so man.macros
.TH photo n 4.0 Tk "Tk Built-In Commands"
@@ -257,8 +257,8 @@ format handler to read the data.
.TP
\fB\-to \fIx1 y1\fR ?\fIx2 y2\fR?
Specifies the coordinates of the top-left corner (\fIx1\fR,\fIy1\fR)
-of the region of \fIimageName\fR into which data from \fIfilename\fR
-are to be read. The default is (0,0). If \fIx2\fR,\fIy2\fR is given
+of the region of \fIimageName\fR into which the image data will be
+copied. The default position is (0,0). If \fIx2\fR,\fIy2\fR is given
and \fIdata\fR is not large enough to cover the rectangle specified by
this option, the image data extracted will be tiled so it covers the
entire destination rectangle. Note that if \fIdata\fR specifies a