# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1287815375 14400
# Node ID a81994607ca01a9f92e324629e5f126bd762bf87
# Parent  69b2f237060e9209e6334add5a177a85752a3de2
document textscan and textread

diff -r 69b2f237060e -r a81994607ca0 doc/ChangeLog
--- a/doc/ChangeLog	Sat Oct 23 02:22:56 2010 -0400
+++ b/doc/ChangeLog	Sat Oct 23 02:29:35 2010 -0400
@@ -1,3 +1,8 @@
+2010-10-23  John W. Eaton  <jwe@octave.org>
+
+	* interpreter/io.txi (Simple File I/O): Document textscan and
+	textread.
+
 2010-10-23  Ben Abbott  <bpabbott@mac.com>
 
 	* interpreter/strings.txi: Add @DOCSTRING(strread).
diff -r 69b2f237060e -r a81994607ca0 doc/interpreter/io.txi
--- a/doc/interpreter/io.txi	Sat Oct 23 02:22:56 2010 -0400
+++ b/doc/interpreter/io.txi	Sat Oct 23 02:29:35 2010 -0400
@@ -219,6 +219,10 @@
 
 @DOCSTRING(csvread)
 
+@DOCSTRING(textread)
+
+@DOCSTRING(textscan)
+
 @menu
 * Saving Data on Unexpected Exits::
 @end menu
diff -r 69b2f237060e -r a81994607ca0 scripts/ChangeLog
--- a/scripts/ChangeLog	Sat Oct 23 02:22:56 2010 -0400
+++ b/scripts/ChangeLog	Sat Oct 23 02:29:35 2010 -0400
@@ -1,3 +1,7 @@
+2010-10-23  John W. Eaton  <jwe@octave.org>
+
+	* io/strread.m: Docstring fixes.
+
 2010-10-23  John W. Eaton  <jwe@octave.org>
 
 	* io/is_valid_file_id.m: Ensure that FID is a scalar before
diff -r 69b2f237060e -r a81994607ca0 scripts/io/strread.m
--- a/scripts/io/strread.m	Sat Oct 23 02:22:56 2010 -0400
+++ b/scripts/io/strread.m	Sat Oct 23 02:29:35 2010 -0400
@@ -69,9 +69,11 @@
 ## [@var{a}, @var{b}, @var{c}] = strread (@var{str}, "%s %s %f");
 ## @end example
 ##
-## The behaviour of @code{strread} can be changed via properties @var{prop}
-## @itemize @code
-## @item "commentstyle":
+## The behaviour of @code{strread} can be changed via property-value
+## pairs.  The following properties are recognized:
+##
+## @table @code
+## @item "commentstyle"
 ## Parts of @var{str} are considered comments and will be skipped.
 ## @var{value} is the comment style and can be any of the following.
 ## @itemize