gtk.h wrapper: Added *_set_realized and set_mapped

[pspp] / doc / combining.texi

diff --git a/doc/combining.texi b/doc/combining.texi
index 3b4eb902e049eeae669752b7a5cd2c6299d70b96..ee2934a2b29cc4a1dd5b2512104c2342dce8ffba 100644 (file)
--- a/doc/combining.texi
+++ b/doc/combining.texi
@@ -315,14 +315,14 @@ case in the master file:
 @itemize @bullet
 @item
 When a match is found, then the values of the variables present in the
 @itemize @bullet
 @item
 When a match is found, then the values of the variables present in the

-transaction file replace those variable's values in the new active
+transaction file replace those variables' values in the new active

 file.  If there are matching cases in more than more transaction file,
 @pspp{} applies the replacements from the first transaction file, then
 from the second transaction file, and so on.  Similarly, if a single
 transaction file has cases with duplicate @subcmd{BY} values, then those are
 applied in order to the master file.
 
 file.  If there are matching cases in more than more transaction file,
 @pspp{} applies the replacements from the first transaction file, then
 from the second transaction file, and so on.  Similarly, if a single
 transaction file has cases with duplicate @subcmd{BY} values, then those are
 applied in order to the master file.
 

-When a variable in a transaction file has a missing value or a string
+When a variable in a transaction file has a missing value or when a string

 variable's value is all blanks, that value is never used to update the
 master file.
 
 variable's value is all blanks, that value is never used to update the
 master file.