Correct some uses of e.g. and i.e. in message strings and documentation
authorJohn Naylor
Thu, 14 Jul 2022 02:38:06 +0000 (09:38 +0700)
committerJohn Naylor
Thu, 21 Jul 2022 05:22:51 +0000 (12:22 +0700)
E.g. means "for example" and i.e. means "that is". Fix a couple uses
that don't match the intended meaning.

Kyotaro Horiguchi

Reviewed by Junwang Zhao and Aleksander Alekseev, with one addition by me
Discussion: https://www.postgresql.org/message-id/flat/20220713.180943.589079824955875739.horikyota.ntt%40gmail.com

This is a backpatch of 82785effc0 to v15

doc/src/sgml/ecpg.sgml
src/bin/pg_upgrade/check.c

index 999b7ca0ae81b30795e68d9d8e1a192aace51440..bb81b03287c100ca9475039917137607b3a8ad47 100644 (file)
@@ -8276,7 +8276,7 @@ EXEC SQL CLOSE DATABASE;
       FREE cursor_name
       
        
-        Due to the differences how ECPG works compared to Informix's ESQL/C (i.e., which steps
+        Due to differences in how ECPG works compared to Informix's ESQL/C (namely, which steps
         are purely grammar transformations and which steps rely on the underlying run-time library)
         there is no FREE cursor_name statement in ECPG. This is because in ECPG,
         DECLARE CURSOR doesn't translate to a function call into
index 2b3fafd94d43616dd8e76e506ac9caa27c77c29a..d9e764be62c8eb1d34a8233a5e8d023bce98d175 100644 (file)
@@ -540,7 +540,7 @@ create_script_for_old_cluster_deletion(char **deletion_script_file_name)
    if (path_is_prefix_of_path(old_cluster_pgdata, new_cluster_pgdata))
    {
        pg_log(PG_WARNING,
-              "\nWARNING:  new data directory should not be inside the old data directory, e.g. %s\n", old_cluster_pgdata);
+              "\nWARNING:  new data directory should not be inside the old data directory, i.e. %s\n", old_cluster_pgdata);
 
        /* Unlink file in case it is left over from a previous run. */
        unlink(*deletion_script_file_name);
@@ -564,7 +564,7 @@ create_script_for_old_cluster_deletion(char **deletion_script_file_name)
        {
            /* reproduce warning from CREATE TABLESPACE that is in the log */
            pg_log(PG_WARNING,
-                  "\nWARNING:  user-defined tablespace locations should not be inside the data directory, e.g. %s\n", old_tablespace_dir);
+                  "\nWARNING:  user-defined tablespace locations should not be inside the data directory, i.e. %s\n", old_tablespace_dir);
 
            /* Unlink file in case it is left over from a previous run. */
            unlink(*deletion_script_file_name);