# HG changeset patch
# User jwe
# Date 1129579912 0
# Node ID 9e3efbc3070a25c6881b8ac831b23f20d9082094
# Parent  3b3e8b7f0800da62a4890136bbacacaa1eb14544
[project @ 2005-10-17 20:11:52 by jwe]

diff -r 3b3e8b7f0800 -r 9e3efbc3070a ChangeLog
--- a/ChangeLog	Mon Oct 17 15:31:08 2005 +0000
+++ b/ChangeLog	Mon Oct 17 20:11:52 2005 +0000
@@ -1,3 +1,11 @@
+2005-10-17  Paul Kienzle <pkienzle@users.sf.net>
+
+	* octave.test/system/system.exp: rmdir no longer prints a
+	message if the directory does not exist.
+
+	* octave.test/system/mk-rm-dir-1.m: mkdir/rmdir return 1
+	on success and 0 on failure.
+
 2005-10-17  John W. Eaton  <jwe@octave.org>
 
 	* configure.in (F77_FFLOAT_STORE_FLAG):
diff -r 3b3e8b7f0800 -r 9e3efbc3070a src/ChangeLog
--- a/src/ChangeLog	Mon Oct 17 15:31:08 2005 +0000
+++ b/src/ChangeLog	Mon Oct 17 20:11:52 2005 +0000
@@ -1,3 +1,7 @@
+2005-10-17  Keith Goodman  <kwgoodman@gmail.com>
+
+	* DLD-FUNCTIONS/sort.cc: Doc string fix.
+	
 2005-10-17  John W. Eaton  <jwe@octave.org>
 
 	* oct-conf.h.in (OCTAVE_CONF_F77_FLOAT_STORE_FLAG): Substitute
diff -r 3b3e8b7f0800 -r 9e3efbc3070a src/DLD-FUNCTIONS/sort.cc
--- a/src/DLD-FUNCTIONS/sort.cc	Mon Oct 17 15:31:08 2005 +0000
+++ b/src/DLD-FUNCTIONS/sort.cc	Mon Oct 17 20:11:52 2005 +0000
@@ -683,9 +683,8 @@
 @deftypefnx {Loadable Function} {[@var{s}, @var{i}] =} sort (@var{x}, @var{dim})\n\
 @deftypefnx {Loadable Function} {[@var{s}, @var{i}] =} sort (@var{x}, @var{mode})\n\
 @deftypefnx {Loadable Function} {[@var{s}, @var{i}] =} sort (@var{x}, @var{dim}, @var{mode})\n\
-Return a copy of @var{x} with the elements elements arranged in\n\
-increasing order.  For matrices, @code{sort} orders the elements in each\n\
-column.\n\
+Return a copy of @var{x} with the elements arranged in increasing\n\
+order.  For matrices, @code{sort} orders the elements in each column.\n\
 \n\
 For example,\n\
 \n\
@@ -723,7 +722,7 @@
 in the order that appeared in the original list.\n\
 \n\
 The @code{sort} function may also be used to sort strings and cell arrays\n\
-of strings, it which case the dictionary order of the strings is used.\n\
+of strings, in which case the dictionary order of the strings is used.\n\
 \n\
 The algorithm used in @code{sort} is optimized for the sorting of partially\n\
 ordered lists.\n\
diff -r 3b3e8b7f0800 -r 9e3efbc3070a test/octave.test/system/mk-rm-dir-1.m
--- a/test/octave.test/system/mk-rm-dir-1.m	Mon Oct 17 15:31:08 2005 +0000
+++ b/test/octave.test/system/mk-rm-dir-1.m	Mon Oct 17 20:11:52 2005 +0000
@@ -3,4 +3,4 @@
 [s2, e2] = stat (nm);
 e3 = rmdir (nm);
 [s4, e4] = stat (nm);
-(! e1 && strcmp (s2.modestr(1), "d") && ! e3 && e4 < 0)
+(e1 && strcmp (s2.modestr(1), "d") && e3 && e4 < 0)
diff -r 3b3e8b7f0800 -r 9e3efbc3070a test/octave.test/system/system.exp
--- a/test/octave.test/system/system.exp	Mon Oct 17 15:31:08 2005 +0000
+++ b/test/octave.test/system/system.exp	Mon Oct 17 20:11:52 2005 +0000
@@ -208,7 +208,7 @@
 do_test rmdir-1.m
 
 set test rmdir-2
-set prog_output "\n... rmdir:.*"
+set prog_output "ans = 0"
 do_test rmdir-2.m
 
 set test umask-1