diff options
| author | dgp <dgp@users.sourceforge.net> | 2007-06-05 14:11:22 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2007-06-05 14:11:22 (GMT) |
| commit | c1154a9f8c1aca618e8369de987fbe28a0d7f3b9 (patch) | |
| tree | cdc2d358787e46884cf98a0c30d0c35f4d730745 | |
| parent | de5ed00246a3dc6391ba695d126fb94c24bff4f1 (diff) | |
| download | tk-c1154a9f8c1aca618e8369de987fbe28a0d7f3b9.zip tk-c1154a9f8c1aca618e8369de987fbe28a0d7f3b9.tar.gz tk-c1154a9f8c1aca618e8369de987fbe28a0d7f3b9.tar.bz2 | |
merge updates from HEAD
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | doc/photo.n | 7 |
2 files changed, 10 insertions, 4 deletions
@@ -1,3 +1,8 @@ +2007-06-05 Donal K. Fellows <donal.k.fellows@man.ac.uk> + + * doc/photo.n: Clarified the fact that base64 support for the -data + option is not universal. [Bug 1731348] (matzek) + 2007-06-03 Daniel Steffen <das@users.sourceforge.net> * unix/Makefile.in: add datarootdir to silence autoconf-2.6x warning. @@ -6,7 +11,7 @@ * macosx/tkMacOSXMenu.c: add error checking; whitespace cleanup. - * macosx/tkMacOSXDraw.c: comment formatting fixes for Xcode 3.0. + * macosx/tkMacOSXDraw.c: comment formatting fixes for Xcode 3.0 * macosx/tkMacOSXEmbed.c: * macosx/tkMacOSXEntry.c: * macosx/tkMacOSXFont.c: diff --git a/doc/photo.n b/doc/photo.n index 09221b6..4b14c58 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.19 2005/04/06 21:11:54 dkf Exp $ +'\" RCS: @(#) $Id: photo.n,v 1.19.2.1 2007/06/05 14:11:23 dgp Exp $ '\" .so man.macros .TH photo n 4.0 Tk "Tk Built-In Commands" @@ -41,8 +41,9 @@ command. Photos support the following \fIoptions\fR: .TP \fB\-data \fIstring\fR -Specifies the contents of the image as a string. The string can -contain base64 encoded data or binary data. The format of the +Specifies the contents of the image as a string. The string should +contain binary data or, for some formats, base64-encoded data (this is +currently guaranteed to be supported for GIF images). The format of the string must be one of those for which there is an image file format handler that will accept string data. If both the \fB\-data\fR and \fB\-file\fR options are specified, the \fB\-file\fR option takes |