X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=doc%2Ffiles.texi;h=6f723213ef52447f957f414a37981dd3aaac0fd2;hb=6a42f0b711d699333fda01a076b8a27275fc4492;hp=3321390edf6dd76d09617111e82db679edf93623;hpb=1fc3af93c0ba6cbaf7ef09edc979096b6f16dd6f;p=pspp

diff --git a/doc/files.texi b/doc/files.texi
index 3321390edf..6f723213ef 100644
--- a/doc/files.texi
+++ b/doc/files.texi
@@ -164,12 +164,13 @@ data is read later, when a procedure is executed.
 
 @display
 MATCH FILES
-        /BY var_list
         /@{FILE,TABLE@}=@{*,'filename'@}
         /DROP=var_list
         /KEEP=var_list
         /RENAME=(src_names=target_names)@dots{}
         /IN=var_name
+
+        /BY var_list
         /FIRST=var_name
         /LAST=var_name
         /MAP
@@ -185,7 +186,7 @@ variables.  The results of the merge become the new active file.
 The BY subcommand specifies a list of variables that are used to match
 records from each of the system files.  Variables specified must exist
 in all the files specified on FILE and TABLE.  BY should usually be
-specified.  If TABLE is used then BY is required.
+specified.  If TABLE or IN is used then BY is required.
 
 Specify FILE with a system file as a file name string or file handle
 (@pxref{FILE HANDLE}), or with an asterisk (@samp{*}) to
@@ -203,15 +204,22 @@ It is incorrect to have records with duplicate BY values in table lookup
 files.
 
 Any number of FILE and TABLE subcommands may be specified.  Each
-instance of FILE or TABLE can be followed by DROP, KEEP, and/or RENAME
-subcommands.  These take the same form as the corresponding subcommands
-of @cmd{GET} (@pxref{GET}), and perform the same functions.
+instance of FILE or TABLE can be followed by any sequence of DROP,
+KEEP, or RENAME subcommands.  These have the same form and meaning as
+the corresponding subcommands of @cmd{GET} (@pxref{GET}), but apply
+only to variables in the given file.
+
+Each FILE or TABLE may optionally be followed by an IN subcommand,
+which creates a numeric variable with the specified name and format
+F1.0.  The IN variable takes value 1 in a case if the given file
+contributed a row to the merged file, 0 otherwise.  The DROP, KEEP,
+and RENAME subcommands do not affect IN variables.
 
 Variables belonging to files that are not present for the current case
 are set to the system-missing value for numeric variables or spaces for
 string variables.
 
-IN, FIRST, LAST, and MAP are currently not used.
+FIRST, LAST, and MAP are currently ignored.
 
 @cmd{MATCH FILES} may not be specified following @cmd{TEMPORARY}
 (@pxref{TEMPORARY}) if the active file is used as an input source.
@@ -226,6 +234,7 @@ SAVE
         /@{COMPRESSED,UNCOMPRESSED@}
         /DROP=var_list
         /KEEP=var_list
+        /VERSION=version
         /RENAME=(src_names=target_names)@dots{}
 @end display
 
@@ -233,7 +242,7 @@ The @cmd{SAVE} procedure causes the dictionary and data in the active
 file to
 be written to a system file.
 
-FILE is the only required subcommand.  Specify the system
+OUTFILE is the only required subcommand.  Specify the system
 file to be written as a string file name or a file handle (@pxref{FILE
 HANDLE}).
 
@@ -264,6 +273,12 @@ each may be present any number of times.  @cmd{SAVE} never modifies
 the active file.  DROP, KEEP, and RENAME only affect the system file
 written to disk.
 
+The VERSION subcommand specifies the version of the file format. Valid
+versions are '3' and '3x'.  Version 3x system files are identical to
+version 3 files, except that variable names greater than 8 bytes will
+be truncated.  The default version is 3.  The VERSION subcommand is
+optional.  There is no need ever to use it.
+
 @cmd{SAVE} causes the data to be read.  It is a procedure.
 
 @node SYSFILE INFO, XSAVE, SAVE, System and Portable Files
@@ -288,7 +303,7 @@ a system file and displays information on its dictionary.
 
 @display
 XSAVE
-        /FILE='filename'
+        /OUTFILE='filename'
         /@{COMPRESSED,UNCOMPRESSED@}
         /DROP=var_list
         /KEEP=var_list