diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2019-03-27 07:33:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-27 07:33:03 +0100 |
| commit | 05e2e52c1338fd42e7443e5998ad43a7fb9982b1 (patch) | |
| tree | d5f3e8171dd620baace05ea4517837c089b867f5 /src | |
| parent | 4c5476f1581d2760030a4b24478fa885a3d4d7b6 (diff) | |
| parent | a10fbc25dc954c2be85d4d1bab448e56a9ce4b55 (diff) | |
| download | PROJ-05e2e52c1338fd42e7443e5998ad43a7fb9982b1.tar.gz PROJ-05e2e52c1338fd42e7443e5998ad43a7fb9982b1.zip | |
Merge pull request #1374 from OSGeo/backport-1349-on-6.0
Backport #1349 on 6.0: Doc: Be consistent in use of +opts
Diffstat (limited to 'src')
| -rw-r--r-- | src/apps/cs2cs.cpp | 4 | ||||
| -rw-r--r-- | src/apps/geod.cpp | 2 | ||||
| -rw-r--r-- | src/apps/proj.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/apps/cs2cs.cpp b/src/apps/cs2cs.cpp index c68572fa..55b38bbc 100644 --- a/src/apps/cs2cs.cpp +++ b/src/apps/cs2cs.cpp @@ -68,8 +68,8 @@ static const char *oform = static char oform_buffer[16]; /* buffer for oform when using -d */ static const char *oterr = "*\t*"; /* output line for unprojectable input */ static const char *usage = - "%s\nusage: %s [ -dDeEfIlrstvwW [args] ] [ +opts[=arg] ]\n" - " [+to [+opts[=arg] [ files ]\n"; + "%s\nusage: %s [-dDeEfIlrstvwW [args]] [+opt[=arg] ...]\n" + " [+to +opt[=arg] ...] [file ...]\n"; static double (*informat)(const char *, char **); /* input data deformatter function */ diff --git a/src/apps/geod.cpp b/src/apps/geod.cpp index 7225856e..b46188d3 100644 --- a/src/apps/geod.cpp +++ b/src/apps/geod.cpp @@ -22,7 +22,7 @@ static const char *osform = "%.3f"; /* output format for S */ static char pline[50]; /* work string */ static const char *usage = -"%s\nusage: %s [ -afFIlptwW [args] ] [ +opts[=arg] ] [ files ]\n"; +"%s\nusage: %s [-afFIlptwW [args]] [+opt[=arg] ...] [file ...]\n"; static void printLL(double p, double l) { diff --git a/src/apps/proj.cpp b/src/apps/proj.cpp index 298a44e8..b5865831 100644 --- a/src/apps/proj.cpp +++ b/src/apps/proj.cpp @@ -46,7 +46,7 @@ static char oform_buffer[16]; /* Buffer for oform when using -d */ static const char *oterr = "*\t*", /* output line for unprojectable input */ - *usage = "%s\nusage: %s [ -bdeEfiIlmorsStTvVwW [args] ] [ +opts[=arg] ] [ files ]\n"; + *usage = "%s\nusage: %s [-bdeEfiIlmorsStTvVwW [args]] [+opt[=arg] ...] [file ...]\n"; static PJ_FACTORS facs; |