summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--doc/photo.n11
2 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 14fdffd..74e77c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-01 Donal K. Fellows <dkf@users.sf.net>
+
+ * doc/photo.n: Correctly documented what the [$ph data] command
+ produces without the -format option.
+
2011-08-16 Jan Nijtmans <nijtmans@users.sf.net>
* win/tkWinDialog.c: [Bug 3388350] mingw64 compiler warnings
diff --git a/doc/photo.n b/doc/photo.n
index 101d2ca..c14abe3 100644
--- a/doc/photo.n
+++ b/doc/photo.n
@@ -210,9 +210,14 @@ the specified color.
Specifies the name of the image file format handler to be used.
Specifically, this subcommand searches
for the first handler whose name matches an initial substring of
-\fIformat-name\fR and which has the capability to read this image data.
-If this option is not given, this subcommand uses the first
-handler that has the capability to read the image data.
+\fIformat-name\fR and which has the capability to write a string
+containing this image data.
+If this option is not given, this subcommand uses a format that
+consists of a list (one element per row) of lists (one element per
+pixel/column) of colors in
+.QW \fB#\fIrrggbb\fR
+format (where \fIrr\fR is a pair of hexadecimal digits for the red
+channel, \fIgg\fR for green, and \fIbb\fR for blue).
.TP
\fB\-from \fIx1 y1 x2 y2\fR
Specifies a rectangular region of \fIimageName\fR to be returned.