-d and -u are no longer supported.

diff --git a/doc/invoking.texi b/doc/invoking.texi
index 125fdd2b884cf6ab7d75f0f07279553d340cdfc6..e91bf6998270bf6ba63798c536d4ff6a6ea1629c 100644 (file)
--- a/doc/invoking.texi
+++ b/doc/invoking.texi
@@ -92,18 +92,6 @@ Sets the configuration directory to @var{dir}.  @xref{File locations}.
 Selects the output device with name @var{device}.  If this option is
 given more than once, then all devices mentioned are selected.  This
 option disables all devices besides those mentioned on the command line.
 Selects the output device with name @var{device}.  If this option is
 given more than once, then all devices mentioned are selected.  This
 option disables all devices besides those mentioned on the command line.

-
-@item -d @var{var}[=@var{value}]
-@itemx --define=@var{var}[=@var{value}]
-
-Defines an `environment variable' named @var{var} having the optional
-value @var{value} specified.  @xref{Variable values}.
-
-@item -u @var{var}
-@itemx --undef=@var{var}
-
-Undefines the `environment variable' named @var{var}.  @xref{Variable
-values}.

 @end table
 
 @node Input and output options, Language control options, Configuration Options, Invocation
 @end table
 
 @node Input and output options, Language control options, Configuration Options, Invocation

diff --git a/src/ui/terminal/ChangeLog b/src/ui/terminal/ChangeLog
index be87f7f97ce91d8dc55e0834e0b8228886a10898..9d35ada82d80b33934c4b05abdce419b634123f3 100644 (file)
--- a/src/ui/terminal/ChangeLog
+++ b/src/ui/terminal/ChangeLog
@@ -1,3 +1,8 @@
+Fri Mar 31 10:33:37 2006  Ben Pfaff  <blp@gnu.org>
+
+       * command-line.c: (var pre_syntax_message) -d and -u are no longer
+       supported.
+

 Sat Mar 11 14:18:39 WST 2006 John Darrington <john@darrington.wattle.id.au>
 
        * automake.mk: Moved the pspp binary here.
 Sat Mar 11 14:18:39 WST 2006 John Darrington <john@darrington.wattle.id.au>
 
        * automake.mk: Moved the pspp binary here.

diff --git a/src/ui/terminal/command-line.c b/src/ui/terminal/command-line.c
index 9c5af7c8e406b8682e3bd94ccec1cfe0bec052bc..cf5b660c939d0b91a054f1a08e61bb93da76e65a 100644 (file)
--- a/src/ui/terminal/command-line.c
+++ b/src/ui/terminal/command-line.c
@@ -220,8 +220,6 @@ N_("PSPP, a program for statistical analysis of sample data.\n"
 "                            calculated from broken algorithms\n"
 "  -B, --config-dir=DIR      set configuration directory to DIR\n"
 "  -o, --device=DEVICE       select output driver DEVICE and disable defaults\n"
 "                            calculated from broken algorithms\n"
 "  -B, --config-dir=DIR      set configuration directory to DIR\n"
 "  -o, --device=DEVICE       select output driver DEVICE and disable defaults\n"

-"  -d, --define=VAR[=VALUE]  set environment variable VAR to VALUE, or empty\n"
-"  -u, --undef=VAR           undefine environment variable VAR\n"

 "\nInput and output:\n"
 "  -f, --out-file=FILE       send output to FILE (overwritten)\n"
 "  -p, --pipe                read script from stdin, send output to stdout\n"
 "\nInput and output:\n"
 "  -f, --out-file=FILE       send output to FILE (overwritten)\n"
 "  -p, --pipe                read script from stdin, send output to stdout\n"