From 09e813c7dadc7d1de5009da05b289f65a3c1e699 Mon Sep 17 00:00:00 2001
From: "donal.k.fellows@manchester.ac.uk" <dkf>
Date: Tue, 17 Dec 2002 15:28:18 +0000
Subject: Doc-fix: [$photo put] knows about solid colours, and not files. [Bug
 640026]

---
 ChangeLog   |  6 ++++++
 doc/photo.n | 15 ++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 31dbeeb..1202dce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-12-17  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
+
+	* doc/photo.n: Fixed documentation of the put subcommand to no
+	longer talk about files and to mention that you can use colour
+	names for working with solid colours.  [Bug 640026]
+
 2002-12-13  Don Porter <dgp@users.sf.net>
 
 	* generic/tkMain.c (Tk_Main):  Call on Tcl*StartupScript*() routines
diff --git a/doc/photo.n b/doc/photo.n
index a756411..54fc053 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.12 2002/06/22 00:37:16 dkf Exp $
+'\" RCS: @(#) $Id: photo.n,v 1.13 2002/12/17 15:28:19 dkf Exp $
 '\" 
 .so man.macros
 .TH photo n 4.0 Tk "Tk Built-In Commands"
@@ -241,12 +241,13 @@ image as a list of three integers between 0 and 255, representing the
 red, green and blue components respectively.
 .TP
 \fIimageName \fBput\fR \fIdata\fR ?\fIoption value(s) ...\fR?
-Sets pixels in \fI imageName\fR to the data specified in
-\fIdata\fR. This command first searches the list of image file
-format handlers for a handler that can interpret the data
-in \fIdata\fR, and then reads the image in \fIfilename\fR into
-\fIimageName\fR (the destination image). The following options
-may be specified:
+Sets pixels in \fI imageName\fR to the data specified in \fIdata\fR.
+This command first searches the list of image file format handlers for
+a handler that can interpret the data in \fIdata\fR, and then reads
+the image encoded within into \fIimageName\fR (the destination image).
+Note that \fIdata\fR may also be a single color name if you wish to
+fill a rectangular region with that color.  The following options may
+be specified:
 .RS
 .TP
 \fB\-format \fIformat-name\fR
-- 
cgit v0.12