dictionary: Make dict_get_weight_format() return by value, not pointer.

[pspp] / doc / variables.texi

diff --git a/doc/variables.texi b/doc/variables.texi
index ab6f83daea2d91c815ebc42e5edd106dafd827d1..c1b18edfa600c68923374bc2dd39ac2a76beaf9b 100644 (file)
--- a/doc/variables.texi
+++ b/doc/variables.texi
@@ -21,7 +21,6 @@ There are several utility commands for examining and adjusting variables.
 * DISPLAY::                     Display information about the active dataset.
 * NUMERIC::                     Create new numeric variables.
 * STRING::                      Create new string variables.
-* MODIFY VARS::                 Rename, reorder, and drop variables.
 * RENAME VARIABLES::            Rename variables.
 * SORT VARIABLES::              Reorder variables.
 * DELETE VARIABLES::            Delete variables.
@@ -169,55 +168,6 @@ STRING lastname (A24).
 STRING address (A80).
 @end example
 
-@node MODIFY VARS
-@section MODIFY VARS
-@vindex MODIFY VARS
-
-You can use @cmd{MODIFY VARS} to reorder, rename, or delete variables.
-
-@display
-MODIFY VARS
-        /REORDER=@{FORWARD,BACKWARD@} @{POSITIONAL,ALPHA@} (@var{var_list})@dots{}
-        /RENAME=(@var{old_names}=@var{new_names})@dots{}
-        /@{DROP,KEEP@}=@var{var_list}
-        /MAP
-@end display
-
-At least one subcommand must be specified, and no subcommand may be
-specified more than once.  @subcmd{DROP} and @subcmd{KEEP} may not both
-be specified.
-
-The @subcmd{REORDER} subcommand changes the order of variables in the active
-dataset.  Specify one or more lists of variable names in parentheses.  By
-default, each list of variables is rearranged into the specified order.
-To put the variables into the reverse of the specified order, put
-keyword @subcmd{BACKWARD} before the parentheses.  To put them into alphabetical
-order in the dictionary, specify keyword @subcmd{ALPHA} before the parentheses.
-@subcmd{BACKWARD} and @subcmd{ALPHA} may also be combined.
-
-To rename variables in the active dataset, specify @subcmd{RENAME}, an equals sign
-(@samp{=}), and lists of the old variable names and new variable names
-separated by another equals sign within parentheses.  There must be the
-same number of old and new variable names.  Each old variable is renamed to
-the corresponding new variable name.  Multiple parenthesized groups of
-variables may be specified.
-
-The @subcmd{DROP} subcommand deletes a specified list of variables
-from the active dataset.  @cmd{MODIFY VARS} may not be used to delete
-all variables from the dictionary; use @cmd{NEW FILE} to do that
-(@pxref{NEW FILE}).
-
-The @subcmd{KEEP} subcommand keeps the specified list of variables in the active
-dataset.  Any unlisted variables are deleted from the active dataset.
-
-@subcmd{MAP} is currently ignored.
-
-If either @subcmd{DROP} or @subcmd{KEEP} is specified, the data is read;
-otherwise it is not.
-
-@cmd{MODIFY VARS} may not be specified following @cmd{TEMPORARY}
-(@pxref{TEMPORARY}).
-
 @node RENAME VARIABLES
 @section RENAME VARIABLES
 @vindex RENAME VARIABLES
@@ -343,30 +293,26 @@ dictionary; use @cmd{NEW FILE} to do that (@pxref{NEW FILE}).
 @section VARIABLE LABELS
 @vindex VARIABLE LABELS
 
-In addition to a variable's name, each variable can have a @dfn{label}.
-Whereas the name is limited to certain constraints (@pxref{Attributes}) a variable's
-label has no such constraints.
-Typically, the names are concise, easy to type mnemonics for the variable
-and the labels are longer, more verbose descriptions.
+In addition to a variable's name, each variable can have a
+@dfn{label}.  Whereas a variable name is a concise, easy-to-type
+mnemonic for the variable, a label may be longer and more descriptive.
 
 @display
 VARIABLE LABELS
-        @var{var_list} '@var{var_label}'
-        [ /@var{var_list} '@var{var_label}']
-        .
-        .
-        .
-        [ /@var{var_list} '@var{var_label}']
+        @var{variable} '@var{label}'
+        [@var{variable} '@var{label}']@dots{}
 @end display
 
 @cmd{VARIABLE LABELS} associates explanatory names
 with variables.  This name, called a @dfn{variable label}, is displayed by
 statistical procedures.
 
-To assign a variable label to a group of variables, specify a
-list of variable names and the variable label as a string.
-To assign different labels to different variables in the same command,
-precede the subsequent variable list with a slash (@samp{/}).
+Specify each variable followed by its label as a quoted string.
+Variable-label pairs may be separated by an optional slash @samp{/}.
+
+If a listed variable already has a label, the new one replaces it.
+Specifying an empty string as the label, e.g.@:@samp{''}, removes a
+label.
 
 @node PRINT FORMATS
 @section PRINT FORMATS