Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dB12K-0000w4-Ko for pgsql-hackers@arkaria.postgresql.org; Wed, 17 May 2017 15:38:52 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84_2) (envelope-from ) id 1dB12J-0003ot-N1 for pgsql-hackers@arkaria.postgresql.org; Wed, 17 May 2017 15:38:51 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1dB10n-00010a-5z for pgsql-hackers@postgresql.org; Wed, 17 May 2017 15:37:17 +0000 Received: from sss.pgh.pa.us ([66.207.139.130]) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1dB10h-0004u4-Lq for pgsql-hackers@postgresql.org; Wed, 17 May 2017 15:37:15 +0000 Received: from sss1.sss.pgh.pa.us (localhost [127.0.0.1]) by sss.pgh.pa.us (8.14.4/8.14.4) with ESMTP id v4HFb9DI009405; Wed, 17 May 2017 11:37:09 -0400 From: Tom Lane To: Alvaro Herrera cc: pgsql-hackers@postgresql.org Subject: Re: [COMMITTERS] pgsql: Preventive maintenance in advance of pgindent run. In-reply-to: <31076.1495031000@sss.pgh.pa.us> References: <20170517140847.lasiafwmsxgzppm6@alvherre.pgsql> <30659.1495030469@sss.pgh.pa.us> <31076.1495031000@sss.pgh.pa.us> Comments: In-reply-to Tom Lane message dated "Wed, 17 May 2017 10:23:20 -0400" MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0" Content-ID: <9383.1495035412.0@sss.pgh.pa.us> Date: Wed, 17 May 2017 11:37:09 -0400 Message-ID: <9404.1495035429@sss.pgh.pa.us> X-Pg-Spam-Score: -1.9 (-) List-Archive: List-Help: List-ID: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-Mailing-List: pgsql-hackers Precedence: bulk Sender: pgsql-hackers-owner@postgresql.org ------- =_aaaaaaaaaa0 Content-Type: text/plain; charset="us-ascii" Content-ID: <9383.1495035412.1@sss.pgh.pa.us> I wrote: > BTW, I would say that the problem with -p is that somebody failed to > understand the difference between --help and a man page. Concretely, how about the attached? I don't think this looks any worse than the current layout. regards, tom lane ------- =_aaaaaaaaaa0 Content-Type: text/x-diff; name="tighten-usage-printouts.patch"; charset="us-ascii" Content-ID: <9383.1495035412.2@sss.pgh.pa.us> Content-Description: tighten-usage-printouts.patch Content-Transfer-Encoding: quoted-printable diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/= pg_basebackup.c index 866f88a..f2492e4 100644 --- a/src/bin/pg_basebackup/pg_basebackup.c +++ b/src/bin/pg_basebackup/pg_basebackup.c @@ -331,22 +331,17 @@ usage(void) printf(_("\nOptions controlling the output:\n")); printf(_(" -D, --pgdata=3DDIRECTORY receive base backup into directory\n= ")); printf(_(" -F, --format=3Dp|t output format (plain (default), tar)= \n")); - printf(_(" -r, --max-rate=3DRATE maximum transfer rate to transfer da= ta directory\n")); - printf(_(" (in kB/s, or use suffix \"k\" or \"M\"= )\n")); - printf(_(" -R, --write-recovery-conf\n")); - printf(_(" write recovery.conf for replication\n"= )); + printf(_(" -r, --max-rate=3DRATE maximum transfer rate (in kB/s)\n")); + printf(_(" -R, --write-recovery-conf write recovery.conf for replicatio= n\n")); printf(_(" -S, --slot=3DSLOTNAME replication slot to use\n")); printf(_(" --no-slot prevent creation of temporary replicat= ion slot\n")); - printf(_(" -T, --tablespace-mapping=3DOLDDIR=3DNEWDIR\n")); - printf(_(" relocate tablespace in OLDDIR to NEWDI= R\n")); - printf(_(" -X, --wal-method=3Dnone|fetch|stream\n")); - printf(_(" include required WAL files with specif= ied method\n")); + printf(_(" -T, --tablespace-mapping=3DOLDDIR=3DNEWDIR relocate tablespa= ce\n")); + printf(_(" -X, --wal-method=3Dnone|fetch|stream set method for includin= g WAL files\n")); printf(_(" --waldir=3DWALDIR location for the write-ahead log dir= ectory\n")); printf(_(" -z, --gzip compress tar output\n")); printf(_(" -Z, --compress=3D0-9 compress tar output with given compr= ession level\n")); printf(_("\nGeneral options:\n")); - printf(_(" -c, --checkpoint=3Dfast|spread\n")); - printf(_(" set fast or spread checkpointing\n")); + printf(_(" -c, --checkpoint=3Dfast|spread set fast or spread checkpoint= ing\n")); printf(_(" -l, --label=3DLABEL set backup label\n")); printf(_(" -n, --no-clean do not clean up after errors\n")); printf(_(" -N, --no-sync do not wait for changes to be written = safely to disk\n")); @@ -358,8 +353,7 @@ usage(void) printf(_(" -d, --dbname=3DCONNSTR connection string\n")); printf(_(" -h, --host=3DHOSTNAME database server host or socket direc= tory\n")); printf(_(" -p, --port=3DPORT database server port number\n")); - printf(_(" -s, --status-interval=3DINTERVAL\n")); - printf(_(" time between status packets sent to se= rver (in seconds)\n")); + printf(_(" -s, --status-interval=3DSECONDS set time between status pack= ets\n")); printf(_(" -U, --username=3DNAME connect as specified database user\n= ")); printf(_(" -w, --no-password never prompt for password\n")); printf(_(" -W, --password force password prompt (should happen a= utomatically)\n")); diff --git a/src/bin/pg_waldump/pg_waldump.c b/src/bin/pg_waldump/pg_waldum= p.c index 56843a5..e56d7e2 100644 --- a/src/bin/pg_waldump/pg_waldump.c +++ b/src/bin/pg_waldump/pg_waldump.c @@ -689,18 +689,14 @@ usage(void) printf(_(" -e, --end=3DRECPTR stop reading at WAL location RECPTR\= n")); printf(_(" -f, --follow keep retrying after reaching end of WA= L\n")); printf(_(" -n, --limit=3DN number of records to display\n")); - printf(_(" -p, --path=3DPATH directory in which to find log segme= nt files or a\n")); - printf(_(" directory with a ./pg_wal that contain= s such files\n")); - printf(_(" (default: current directory, ./pg_wal,= PGDATA/pg_wal)\n")); + printf(_(" -p, --path=3DPATH directory in which to find log segme= nt files\n")); printf(_(" -r, --rmgr=3DRMGR only show records generated by resou= rce manager RMGR\n")); printf(_(" use --rmgr=3Dlist to list valid resour= ce manager names\n")); printf(_(" -s, --start=3DRECPTR start reading at WAL location RECPTR= \n")); printf(_(" -t, --timeline=3DTLI timeline from which to read log reco= rds\n")); - printf(_(" (default: 1 or the value used in START= SEG)\n")); printf(_(" -V, --version output version information, then exit\= n")); printf(_(" -x, --xid=3DXID only show records with TransactionId= XID\n")); - printf(_(" -z, --stats[=3Drecord] show statistics instead of records\n= ")); - printf(_(" (optionally, show per-record statistic= s)\n")); + printf(_(" -z, --stats[=3Drecord] show statistics or per-record statis= tics, not records\n")); printf(_(" -?, --help show this help, then exit\n")); } =20 ------- =_aaaaaaaaaa0 Content-Type: text/plain Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 -- Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers ------- =_aaaaaaaaaa0--