From 72435b7315ecb4943d0c8cf4ffb04fbba695ca1d Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Mon, 17 Apr 2006 02:13:12 +0000 Subject: [PATCH] Consistently write "file name" as two words, in accordance with the GNU standards. --- doc/ChangeLog | 5 +++++ doc/configuring.texi | 18 +++++++++--------- doc/data-io.texi | 24 ++++++++++++------------ doc/files.texi | 18 +++++++++--------- doc/regression.texi | 4 ++-- doc/transformation.texi | 2 +- doc/utilities.texi | 12 ++++++------ 7 files changed, 44 insertions(+), 39 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 47a0d957..61cdd47a 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,8 @@ +Sun Apr 16 19:12:26 2006 Ben Pfaff + + Consistently write "file name" as two words, in accordance with + the GNU standards. + Wed Feb 15 21:53:12 2006 Ben Pfaff * data-file-format.texi: Fix values for "measure" in Auxiliary diff --git a/doc/configuring.texi b/doc/configuring.texi index 386f6dd5..0bb05d2c 100644 --- a/doc/configuring.texi +++ b/doc/configuring.texi @@ -580,10 +580,10 @@ acceptable to PostScript printers and other interpreters. The available options are listed below. @table @code -@item output-file=@var{filename} +@item output-file=@var{file-name} -File to which output should be sent. This can be an ordinary filename -(i.e., @code{"pspp.ps"}), a pipe filename (i.e., @code{"|lpr"}), or +File to which output should be sent. This can be an ordinary file name +(i.e., @code{"pspp.ps"}), a pipe (i.e., @code{"|lpr"}), or stdout (@code{"-"}). Default: @code{"pspp.ps"}. @item headers=@var{boolean} @@ -665,10 +665,10 @@ terminal or output to printers. The ASCII driver has class name The available options are listed below. @table @code -@item output-file=@var{filename} +@item output-file=@var{file-name} -File to which output should be sent. This can be an ordinary filename -(e.g., @code{"pspp.txt"}), a pipe filename (e.g., @code{"|lpr"}), or +File to which output should be sent. This can be an ordinary file name +(e.g., @code{"pspp.txt"}), a pipe (e.g., @code{"|lpr"}), or stdout (@code{"-"}). Default: @code{"pspp.list"}. @item paginate=@var{boolean} @@ -800,10 +800,10 @@ future, further work may be done on improving the output appearance. There are is only one option: @table @code -@item output-file=@var{filename} +@item output-file=@var{file-name} -File to which output should be sent. This can be an ordinary filename -(i.e., @code{"pspp.ps"}), a pipe filename (i.e., @code{"|lpr"}), or +File to which output should be sent. This can be an ordinary file name +(i.e., @code{"pspp.ps"}), a pipe (i.e., @code{"|lpr"}), or stdout (@code{"-"}). Default: @code{"pspp.html"}. @end table diff --git a/doc/data-io.texi b/doc/data-io.texi index 93f07156..07e01e60 100644 --- a/doc/data-io.texi +++ b/doc/data-io.texi @@ -138,7 +138,7 @@ Each form of @cmd{DATA LIST} is described in detail below. @display DATA LIST [FIXED] @{TABLE,NOTABLE@} - FILE='filename' + FILE='file-name' RECORDS=record_count END=end_var /[line_no] var_spec@dots{} @@ -153,7 +153,7 @@ positions on each line of single-line or multiline records. The keyword FIXED is optional. The FILE subcommand must be used if input is to be taken from an -external file. It may be used to specify a filename as a string or a +external file. It may be used to specify a file name as a string or a file handle (@pxref{File Handles}). If the FILE subcommand is not used, then input is assumed to be specified within the command file using @cmd{BEGIN DATA}@dots{}@cmd{END DATA} (@pxref{BEGIN DATA}). @@ -346,7 +346,7 @@ This example shows keywords abbreviated to their first 3 letters. DATA LIST FREE [(@{TAB,'c'@}, @dots{})] [@{NOTABLE,TABLE@}] - FILE='filename' + FILE='file-name' END=end_var /var_spec@dots{} @@ -398,7 +398,7 @@ on field width apply, but they are honored on output. DATA LIST LIST [(@{TAB,'c'@}, @dots{})] [@{NOTABLE,TABLE@}] - FILE='filename' + FILE='file-name' END=end_var /var_spec@dots{} @@ -442,13 +442,13 @@ the current input program. @xref{INPUT PROGRAM}. @display For text files: FILE HANDLE handle_name - /NAME='filename' + /NAME='file-name' [/MODE=CHARACTER] /TABWIDTH=tab_width For binary files with fixed-length records: FILE HANDLE handle_name - /NAME='filename' + /NAME='file-name' /MODE=IMAGE [/LRECL=rec_len] @@ -694,7 +694,7 @@ cannot fit on a single line, then a multi-line format will be used. @display MATRIX DATA /VARIABLES=var_list - /FILE='filename' + /FILE='file-name' /FORMAT=@{LIST,FREE@} @{LOWER,UPPER,FULL@} @{DIAGONAL,NODIAGONAL@} /SPLIT=@{new_var,var_list@} /FACTORS=var_list @@ -805,7 +805,7 @@ NEW FILE. @display PRINT - OUTFILE='filename' + OUTFILE='file-name' RECORDS=n_lines @{NOTABLE,TABLE@} /[line_no] arg@dots{} @@ -868,7 +868,7 @@ again extend the line to that length. @display PRINT EJECT - OUTFILE='filename' + OUTFILE='file-name' RECORDS=n_lines @{NOTABLE,TABLE@} /[line_no] arg@dots{} @@ -890,7 +890,7 @@ written, the current page in the listing file is ejected. @vindex PRINT SPACE @display -PRINT SPACE OUTFILE='filename' n_lines. +PRINT SPACE OUTFILE='file-name' n_lines. @end display @cmd{PRINT SPACE} prints one or more blank lines to an output file. @@ -940,7 +940,7 @@ file. Instead, it will re-read the same line multiple times. REPEATING DATA /STARTS=start-end /OCCURS=n_occurs - /FILE='filename' + /FILE='file-name' /LENGTH=length /CONTINUED[=cont_start-cont_end] /ID=id_start-id_end=id_var @@ -1020,7 +1020,7 @@ structure (@pxref{LOOP}). Use @cmd{DATA LIST} before, not after, @display WRITE - OUTFILE='filename' + OUTFILE='file-name' RECORDS=n_lines @{NOTABLE,TABLE@} /[line_no] arg@dots{} diff --git a/doc/files.texi b/doc/files.texi index 816a61ed..479fc067 100644 --- a/doc/files.texi +++ b/doc/files.texi @@ -21,7 +21,7 @@ portable files. @vindex APPLY DICTIONARY @display -APPLY DICTIONARY FROM=@{'filename',file_handle@}. +APPLY DICTIONARY FROM=@{'file-name',file_handle@}. @end display @cmd{APPLY DICTIONARY} applies the variable labels, value labels, @@ -68,7 +68,7 @@ file. The system file is not modified. @display EXPORT - /OUTFILE='filename' + /OUTFILE='file-name' /UNSELECTED=@{RETAIN,DELETE@} /DIGITS=n /DROP=var_list @@ -114,7 +114,7 @@ The MAP subcommand is currently ignored. @display GET - /FILE=@{'filename',file_handle@} + /FILE=@{'file-name',file_handle@} /DROP=var_list /KEEP=var_list /RENAME=(src_names=target_names)@dots{} @@ -162,7 +162,7 @@ extension. @display IMPORT - /FILE='filename' + /FILE='file-name' /TYPE=@{COMM,TAPE@} /DROP=var_list /KEEP=var_list @@ -194,7 +194,7 @@ extension. @display MATCH FILES - /@{FILE,TABLE@}=@{*,'filename'@} + /@{FILE,TABLE@}=@{*,'file-name'@} /DROP=var_list /KEEP=var_list /RENAME=(src_names=target_names)@dots{} @@ -265,7 +265,7 @@ extension. @display SAVE - /OUTFILE=@{'filename',file_handle@} + /OUTFILE=@{'file-name',file_handle@} /UNSELECTED=@{RETAIN,DELETE@} /@{COMPRESSED,UNCOMPRESSED@} /PERMISSIONS=@{WRITEABLE,READONLY@} @@ -334,7 +334,7 @@ The NAMES and MAP subcommands are currently ignored. @vindex SYSFILE INFO @display -SYSFILE INFO FILE='filename'. +SYSFILE INFO FILE='file-name'. @end display @cmd{SYSFILE INFO} reads the dictionary in a system file and @@ -351,7 +351,7 @@ a system file and displays information on its dictionary. @display EXPORT - /OUTFILE='filename' + /OUTFILE='file-name' /DIGITS=n /DROP=var_list /KEEP=var_list @@ -384,7 +384,7 @@ the data is read by a procedure or procedure-like command. @display XSAVE - /OUTFILE='filename' + /OUTFILE='file-name' /@{COMPRESSED,UNCOMPRESSED@} /PERMISSIONS=@{WRITEABLE,READONLY@} /DROP=var_list diff --git a/doc/regression.texi b/doc/regression.texi index 4929d5a4..055e2a0f 100644 --- a/doc/regression.texi +++ b/doc/regression.texi @@ -44,7 +44,7 @@ REGRESSION /VARIABLES=var_list /DEPENDENT=var_list /STATISTICS=@{ALL, DEFAULTS, R, COEFF, ANOVA, BCOV@} - /EXPORT (filename) + /EXPORT ('file-name') @end display The @cmd{REGRESSION} procedure reads the active file and outputs @@ -82,7 +82,7 @@ corresponding new value of the dependent variable. The generated program will also contain functions that return prediction and confidence intervals related to those new estimates. PSPP will write the program to the -'filename' given by the user, and write declarations of functions +'file-name' given by the user, and write declarations of functions to a file called pspp_model_reg.h. The user can then compile the C program and use it as part of another program. This subcommand is a PSPP extension. diff --git a/doc/transformation.texi b/doc/transformation.texi index 0fff3bf9..327f6739 100644 --- a/doc/transformation.texi +++ b/doc/transformation.texi @@ -23,7 +23,7 @@ as a rule. @display AGGREGATE - OUTFILE=@{*,'filename',file_handle@} + OUTFILE=@{*,'file-name',file_handle@} /PRESORTED /DOCUMENT /MISSING=COLUMNWISE diff --git a/doc/utilities.texi b/doc/utilities.texi index 3c688292..54ae7b3b 100644 --- a/doc/utilities.texi +++ b/doc/utilities.texi @@ -184,8 +184,8 @@ This command cannot be used if the SAFER setting is active. @display Two possible syntaxes: - INCLUDE 'filename'. - @@filename. + INCLUDE 'file-name'. + @@file-name. @end display @cmd{INCLUDE} causes the PSPP command processor to read an @@ -205,7 +205,7 @@ memory. @display PERMISSIONS - FILE='filename' + FILE='file-name' /PERMISSIONS = @{READONLY,WRITEABLE@}. @end display @@ -270,12 +270,12 @@ SET (output driver options) /HEADERS=@{NO,YES,BLANK@} /LENGTH=@{NONE,length_in_lines@} - /LISTING=@{ON,OFF,filename@} + /LISTING=@{ON,OFF,'file-name'@} /MORE=@{ON,OFF@} /WIDTH=@{NARROW,WIDTH,n_characters@} (logging) - /JOURNAL=@{ON,OFF@} [filename] + /JOURNAL=@{ON,OFF@} ['file-name'] (system files) /COMPRESSION=@{ON,OFF@} @@ -504,7 +504,7 @@ The HOST command. @item The PERMISSIONS command. @item -Pipe filenames (filenames beginning or ending with @samp{|}). +Pipes (file names beginning or ending with @samp{|}). @end itemize Be aware that this setting does not guarantee safety (commands can still -- 2.30.2