Improve pg_dump/pg_dumpall help synopses and terminology

Increase consistency of --help and man page synopses between pg_dump
and pg_dumpall.  These should now be very similar, as pg_dumpall can
now also produce non-text dump output.  But actually, they had drifted
further apart.

- Use verb "export" consistently, instead of "dump" or "extract".
- Use "SQL script" instead of just "script" or "text file".
- Maintain consistent distinction between SQL script and other
  formats/archives (which is relevant for pg_restore).

Reviewed-by: Robert Treat 
Discussion: https://www.postgresql.org/message-id/flat/3f71d8a7-095b-4829-9b0b-fce09e9866b3%40eisentraut.org

diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml
index 1e06bd33bdcd1fb2cc0806b3e2fa20b56f3b0439..0d9270116549a549f36ffc5e2b9149d3f0c242ef 100644 (file)
--- a/doc/src/sgml/ref/pg_dump.sgml
+++ b/doc/src/sgml/ref/pg_dump.sgml
@@ -18,7 +18,7 @@ PostgreSQL documentation
   pg_dump
 
   
-   extract a PostgreSQL database into a script file or other archive file
+   export a PostgreSQL database as an SQL script or to other formats
   
  
 

diff --git a/doc/src/sgml/ref/pg_dumpall.sgml b/doc/src/sgml/ref/pg_dumpall.sgml
index 43f384ed16a9cb040b34a8dc33db5bf1fb35e02b..8ca68da5a556068b6fb25bd07d1d05015822e199 100644 (file)
--- a/doc/src/sgml/ref/pg_dumpall.sgml
+++ b/doc/src/sgml/ref/pg_dumpall.sgml
@@ -16,7 +16,10 @@ PostgreSQL documentation
 
  
   pg_dumpall
-  extract a PostgreSQL database cluster using a specified dump format
+
+  
+   export a PostgreSQL database cluster as an SQL script or to other formats
+  
  
 
  
@@ -33,7 +36,7 @@ PostgreSQL documentation
   
    pg_dumpall is a utility for writing out
    (dumping) all PostgreSQL databases
-   of a cluster into an archive.  The archive contains
+   of a cluster into an SQL script file or an archive.  The output contains
    SQL commands that can be used as input to 
    linkend="app-psql"/> to restore the databases.  It does this by
    calling  for each database in the cluster.


diff --git a/doc/src/sgml/ref/pg_restore.sgml b/doc/src/sgml/ref/pg_restore.sgml

index 8c88b07dcc8657c500db4b7eb862457f08caef30..b649bd3a5ae0f43624a1411cb9df4280c9366c78 100644 (file)

--- a/doc/src/sgml/ref/pg_restore.sgml
+++ b/doc/src/sgml/ref/pg_restore.sgml
@@ -18,8 +18,8 @@ PostgreSQL documentation
   pg_restore
 
   
-   restore a PostgreSQL database or cluster
-   from an archive created by pg_dump or
+   restore PostgreSQL databases from archives
+   created by pg_dump or
    pg_dumpall
   
  


diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c

index a8f0309e8fc1e49e8054c30aa3594f37fb8ca846..db944ec22307187bc140f76281aa89f80574ce1a 100644 (file)

--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -1235,7 +1235,7 @@ main(int argc, char **argv)
 static void
 help(const char *progname)
 {
-   printf(_("%s dumps a database as a text file or to other formats.\n\n"), progname);
+   printf(_("%s exports a PostgreSQL database as an SQL script or to other formats.\n\n"), progname);
    printf(_("Usage:\n"));
    printf(_("  %s [OPTION]... [DBNAME]\n"), progname);
 


diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c

index b1f388cb391609f1a48b5801c4ce7e96f88d7d7c..3cbcad65c5fb5fd78f2af0eb7f20023252f7f4d3 100644 (file)

--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -699,7 +699,7 @@ main(int argc, char *argv[])
 static void
 help(void)
 {
-   printf(_("%s extracts a PostgreSQL database cluster based on specified dump format.\n\n"), progname);
+   printf(_("%s exports a PostgreSQL database cluster as an SQL script or to other formats.\n\n"), progname);
    printf(_("Usage:\n"));
    printf(_("  %s [OPTION]...\n"), progname);
 

diff --git a/doc/src/sgml/ref/pg_restore.sgml b/doc/src/sgml/ref/pg_restore.sgml
index 8c88b07dcc8657c500db4b7eb862457f08caef30..b649bd3a5ae0f43624a1411cb9df4280c9366c78 100644 (file)
--- a/doc/src/sgml/ref/pg_restore.sgml
+++ b/doc/src/sgml/ref/pg_restore.sgml
@@ -18,8 +18,8 @@ PostgreSQL documentation
   pg_restore
 
   
-   restore a PostgreSQL database or cluster
-   from an archive created by pg_dump or
+   restore PostgreSQL databases from archives
+   created by pg_dump or
    pg_dumpall
   
  

diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index a8f0309e8fc1e49e8054c30aa3594f37fb8ca846..db944ec22307187bc140f76281aa89f80574ce1a 100644 (file)
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -1235,7 +1235,7 @@ main(int argc, char **argv)
 static void
 help(const char *progname)
 {
-   printf(_("%s dumps a database as a text file or to other formats.\n\n"), progname);
+   printf(_("%s exports a PostgreSQL database as an SQL script or to other formats.\n\n"), progname);
    printf(_("Usage:\n"));
    printf(_("  %s [OPTION]... [DBNAME]\n"), progname);
 

diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
index b1f388cb391609f1a48b5801c4ce7e96f88d7d7c..3cbcad65c5fb5fd78f2af0eb7f20023252f7f4d3 100644 (file)
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -699,7 +699,7 @@ main(int argc, char *argv[])
 static void
 help(void)
 {
-   printf(_("%s extracts a PostgreSQL database cluster based on specified dump format.\n\n"), progname);
+   printf(_("%s exports a PostgreSQL database cluster as an SQL script or to other formats.\n\n"), progname);
    printf(_("Usage:\n"));
    printf(_("  %s [OPTION]...\n"), progname);