# HG changeset patch
# User jwe
# Date 1141403975 0
# Node ID acbcb9f164ca76568b631300f31ae76a54f03b85
# Parent  bcfddf8e23a3ad1133d4d4694138b83c04f0647b
[project @ 2006-03-03 16:39:34 by jwe]

diff --git a/scripts/sparse/sprandn.m b/scripts/sparse/sprandn.m
--- a/scripts/sparse/sprandn.m
+++ b/scripts/sparse/sprandn.m
@@ -16,7 +16,7 @@
 ## If called with a single matrix argument, a random sparse matrix is
 ## generated wherever the matrix @var{S} is non-zero.
 ## @end deftypefn
-## @seealso{sprandn}
+## @seealso{sprand}
 
 ## This program is public domain
 ## Author: Paul Kienzle <pkienzle@users.sf.net>
diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-03  John W. Eaton  <jwe@octave.org>
+
+	* dirfns.cc (Frmdir): Require second arg to be "s".
+
 2006-03-02  John W. Eaton  <jwe@octave.org>
 
 	* dirfns.cc (Fmkdir, Frmdir): Now commands.
diff --git a/src/dirfns.cc b/src/dirfns.cc
--- a/src/dirfns.cc
+++ b/src/dirfns.cc
@@ -373,9 +373,15 @@
 
 	  std::string fulldir = file_ops::tilde_expand (dirname);
 
-	  int status = (nargin == 1)
-	    ? file_ops::rmdir (fulldir, msg)
-	    : file_ops::recursive_rmdir (fulldir, msg);
+	  if (nargin == 2)
+	    {
+	      if (args(1).string_value () == "s")
+		status = file_ops::recursive_rmdir (fulldir, msg);
+	      else
+		error ("rmdir: expecting second argument to be \"s\"");
+	    }
+	  else
+	    status = file_ops::rmdir (fulldir, msg)
 
 	  if (status < 0)
 	    {