8 files changed, 92 insertions, 65 deletions
diff --git a/man/man1/cct.1 b/man/man1/cct.1
index a6f3894b..bb2168f5 100644
--- a/man/man1/cct.1
+++ b/man/man1/cct.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "CCT" "1" "Feb 14, 2019" "6.0.0" "PROJ.4"
+.TH "CCT" "1" "May 06, 2019" "6.1.0" "PROJ.4"
 .SH NAME
 cct \- Coordinate Conversion and Transformation
 .
@@ -33,7 +33,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .SH SYNOPSIS
 .INDENT 0.0
 .INDENT 3.5
-\fBcct\fP [ \fB\-cIostvz\fP [ args ] ] \fI+opts[=arg]\fP file[s]
+\fBcct\fP [\fB\-cIostvz\fP [args]] \fI+opt[=arg]\fP … file …
 .UNINDENT
 .UNINDENT
 .SH DESCRIPTION
@@ -97,13 +97,13 @@ Repeat for additional information (\fB\-vv\fP, \fB\-vvv\fP, etc.)
 Print version number.
 .UNINDENT
 .sp
-The \fI+args\fP arguments are associated with coordinate operation parameters.
+The \fI+opt\fP arguments are associated with coordinate operation parameters.
 Usage varies with operation.
 .sp
 \fBcct\fP is an acronym meaning \fICoordinate Conversion and Transformation\fP\&.
 .sp
 The acronym refers to definitions given in the OGC 08\-015r2/ISO\-19111
-standard "Geographical Information \-\- Spatial Referencing by Coordinates",
+standard “Geographical Information – Spatial Referencing by Coordinates”,
 which defines two different classes of \fIcoordinate operations\fP:
 .sp
 \fICoordinate Conversions\fP, which are coordinate operations where input
@@ -228,18 +228,18 @@ $ echo 12 56 100 2018.0 auxiliary data | cct +proj=merc
 .UNINDENT
 .SH BACKGROUND
 .sp
-\fBcct\fP also refers to Carl Christian Tscherning (1942\-\-2014),
+\fBcct\fP also refers to Carl Christian Tscherning (1942–2014),
 professor of Geodesy at the University of Copenhagen, mentor and advisor
 for a generation of Danish geodesists, colleague and collaborator for
 two generations of global geodesists, Secretary General for the
-International Association of Geodesy, IAG (1995\-\-2007), fellow of the
+International Association of Geodesy, IAG (1995–2007), fellow of the
 American Geophysical Union (1991), recipient of the IAG Levallois Medal
 (2007), the European Geosciences Union Vening Meinesz Medal (2008), and
 of numerous other honours.
 .sp
 \fIcct\fP, or Christian, as he was known to most of us, was recognized for his
 good mood, his sharp wit, his tireless work, and his great commitment to
-the development of geodesy \-\- both through his scientific contributions,
+the development of geodesy – both through his scientific contributions,
 comprising more than 250 publications, and by his mentoring and teaching
 of the next generations of geodesists.
 .sp
diff --git a/man/man1/cs2cs.1 b/man/man1/cs2cs.1
index 5dd037a5..87c2e9f4 100644
--- a/man/man1/cs2cs.1
+++ b/man/man1/cs2cs.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "CS2CS" "1" "Feb 14, 2019" "6.0.0" "PROJ.4"
+.TH "CS2CS" "1" "May 06, 2019" "6.1.0" "PROJ.4"
 .SH NAME
 cs2cs \- Cartographic coordinate system filter
 .
@@ -33,14 +33,14 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .SH SYNOPSIS
 .INDENT 0.0
 .INDENT 3.5
-\fBcs2cs\fP [ \fB\-eEfIlrstvwW\fP [ args ] ] [ \fI+opts[=arg]\fP ] [ +to [\fI+opts[=arg]\fP] ] file[s]
+\fBcs2cs\fP [\fB\-eEfIlrstvwW\fP [args]] [\fI+opt[=arg]\fP …] [+to \fI+opt[=arg]\fP …] file …
 .UNINDENT
 .UNINDENT
 .sp
 or
 .INDENT 0.0
 .INDENT 3.5
-\fBcs2cs\fP [ \fB\-eEfIlrstvwW\fP [ args ] ] {source_crs} +to {target_crs} file[s]
+\fBcs2cs\fP [\fB\-eEfIlrstvwW\fP [args]] {source_crs} +to {target_crs} file …
 .sp
 where {source_crs} or {target_crs} is a PROJ string, a WKT string or a AUTHORITY:CODE
 (where AUTHORITY is the name of a CRS authority and CODE the code of a CRS
@@ -54,7 +54,7 @@ New in version 6.0.0.
 or
 .INDENT 0.0
 .INDENT 3.5
-\fBcs2cs\fP [ \fB\-eEfIlrstvwW\fP [ args ] ] {source_crs} {target_crs}
+\fBcs2cs\fP [\fB\-eEfIlrstvwW\fP [args]] {source_crs} {target_crs}
 .UNINDENT
 .UNINDENT
 .sp
@@ -174,7 +174,7 @@ Causes a listing of cartographic control parameters tested for and used by
 the program to be printed prior to input data.
 .UNINDENT
 .sp
-The \fI+args\fP run\-line arguments are associated with cartographic
+The \fI+opt\fP run\-line arguments are associated with cartographic
 parameters.
 .sp
 The \fBcs2cs\fP program requires two coordinate reference system (CRS) definitions. The first (or
diff --git a/man/man1/geod.1 b/man/man1/geod.1
index 8e2186ed..cf0277e2 100644
--- a/man/man1/geod.1
+++ b/man/man1/geod.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "GEOD" "1" "Feb 14, 2019" "6.0.0" "PROJ.4"
+.TH "GEOD" "1" "May 06, 2019" "6.1.0" "PROJ.4"
 .SH NAME
 geod \- Geodesic computations
 .
@@ -33,9 +33,9 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .SH SYNOPSIS
 .INDENT 0.0
 .INDENT 3.5
-\fBgeod\fP \fI+ellps=<ellipse>\fP [ \fB\-afFIlptwW\fP [ args ] ] [ \fI+args\fP ] file[s]
+\fBgeod\fP \fI+ellps=<ellipse>\fP [\fB\-afFIlptwW\fP [args]] [\fI+opt[=arg]\fP …] file …
 .sp
-\fBinvgeod\fP \fI+ellps=<ellipse>\fP [ \fB\-afFIlptwW\fP [ args ] ] [ \fI+args\fP ] file[s]
+\fBinvgeod\fP \fI+ellps=<ellipse>\fP [\fB\-afFIlptwW\fP [args]] [\fI+opt[=arg]\fP …] file …
 .UNINDENT
 .UNINDENT
 .SH DESCRIPTION
@@ -116,7 +116,7 @@ This option causes the azimuthal values to be output as unsigned DMS
 numbers between 0 and 360 degrees. Also note \fI\%\-f\fP\&.
 .UNINDENT
 .sp
-The \fI+args\fP command\-line options are associated with geodetic
+The \fI+opt\fP command\-line options are associated with geodetic
 parameters for specifying the ellipsoidal or sphere to use.
 controls. The options are processed in left to right order
 from the command line. Reentry of an option is ignored with
@@ -143,12 +143,12 @@ azimuthal data must be in decimal degrees or DMS format and
 input distance data must be in units consistent with the ellipsoid
 major axis or sphere radius units. The latitude must lie
 in the range [\-90d,90d]. Output geographic coordinates will be
-in DMS (if the \fI\%\-f\fP switch is not employed) to 0.001" with trailing,
+in DMS (if the \fI\%\-f\fP switch is not employed) to 0.001” with trailing,
 zero\-valued minute\-second fields deleted. Output distance
 data will be in the same units as the ellipsoid or sphere
 radius.
 .sp
-The Earth\(aqs ellipsoidal figure may be selected in the same manner
+The Earth’s ellipsoidal figure may be selected in the same manner
 as program \fBproj\fP by using \fI+ellps=\fP, \fI+a=\fP, \fI+es=\fP, etc.
 .sp
 \fBgeod\fP may also be used to determine intermediate points along
@@ -201,7 +201,7 @@ where the first two values are the azimuth from Boston to Portland,
 the back azimuth from Portland to Boston followed by the distance.
 .sp
 An example of forward geodesic use is to use the Boston location
-and determine Portland\(aqs location by azimuth and distance:
+and determine Portland’s location by azimuth and distance:
 .INDENT 0.0
 .INDENT 3.5
 .sp
diff --git a/man/man1/gie.1 b/man/man1/gie.1
index c0247cae..13f12e24 100644
--- a/man/man1/gie.1
+++ b/man/man1/gie.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "GIE" "1" "Feb 14, 2019" "6.0.0" "PROJ.4"
+.TH "GIE" "1" "May 06, 2019" "6.1.0" "PROJ.4"
 .SH NAME
 gie \- The Geospatial Integrity Investigation Environment
 .
@@ -209,7 +209,7 @@ Many coordinates can be expected for one \fI\%operation\fP\&. For each
 See \fI\%operation\fP for an example.
 .sp
 In addition to expecting a coordinate it is also possible to expect a
-PROJ error code in case an operation can\(aqt be created. This is useful when
+PROJ error code in case an operation can’t be created. This is useful when
 testing that errors are caught and handled correctly. Below is an example of
 that tests that the pipeline operator fails correctly when a non\-invertible
 pipeline is constructed.
@@ -226,7 +226,7 @@ expect      failure pjd_err_malformed_pipeline
 .UNINDENT
 .UNINDENT
 .sp
-See \fBgie \-l\fP for a list of error codes that can be expected.
+See \fI\%gie \-\-list\fP for a list of error codes that can be expected.
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -267,7 +267,7 @@ units.
 Do a roundtrip test of an operation. \fI\%roundtrip\fP needs a
 \fI\%operation\fP and a \fI\%accept\fP command
 to function. The accepted coordinate is passed to the operation first in
-it\(aqs forward mode, then the output from the forward operation is passed
+it’s forward mode, then the output from the forward operation is passed
 back to the inverse operation. This procedure is done \fBn\fP times. If the
 resulting coordinate is within the set tolerance of the initial coordinate,
 the test is passed.
@@ -343,7 +343,7 @@ expect 12 55 0 0
 .UNINDENT
 .UNINDENT
 .sp
-The default direction is "forward".
+The default direction is “forward”.
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -366,7 +366,7 @@ expect    173                 \-45
 .UNINDENT
 .UNINDENT
 .sp
-See \fBgie \-l\fP for a list of error codes that can be ignored.
+See \fI\%gie \-\-list\fP for a list of error codes that can be ignored.
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -440,21 +440,21 @@ expect  0   110579.9
 .UNINDENT
 .SH BACKGROUND
 .sp
-More importantly than being an acronym for "Geospatial Integrity Investigation
-Environment", gie were also the initials, user id, and USGS email address of
-Gerald Ian Evenden (1935\-\-2016), the geospatial visionary, who, already in the
+More importantly than being an acronym for “Geospatial Integrity Investigation
+Environment”, gie were also the initials, user id, and USGS email address of
+Gerald Ian Evenden (1935–2016), the geospatial visionary, who, already in the
 1980s, started what was to become the PROJ of today.
 .sp
-Gerald\(aqs clear vision was that map projections are \fIjust special functions\fP\&.
+Gerald’s clear vision was that map projections are \fIjust special functions\fP\&.
 Some of them rather complex, most of them of two variables, but all of them
 \fIjust special functions\fP, and not particularly more special than the \fBsin()\fP,
 \fBcos()\fP, \fBtan()\fP, and \fBhypot()\fP already available in the C standard library.
 .sp
 And hence, according to Gerald, \fIthey should not be particularly much harder
-to use\fP, for a programmer, than the \fBsin()\fP\(aqs, \fBtan()\fP\(aqs and
-\fBhypot()\fP\(aqs so readily available.
+to use\fP, for a programmer, than the \fBsin()\fP’s, \fBtan()\fP’s and
+\fBhypot()\fP’s so readily available.
 .sp
-Gerald\(aqs ingenuity also showed in the implementation of the vision, where
+Gerald’s ingenuity also showed in the implementation of the vision, where
 he devised a comprehensive, yet simple, system of key\-value pairs for
 parameterising a map projection, and the highly flexible \fBPJ\fP struct, storing
 run\-time compiled versions of those key\-value pairs, hence making a map
@@ -463,15 +463,15 @@ call like \fBhypot(x,y)\fP\&.
 .sp
 While today, we may have more formally well defined metadata systems (most
 prominent the OGC WKT2 representation), nothing comes close being as easily
-readable ("human compatible") as Gerald\(aqs key\-value system. This system in
-particular, and the PROJ system in general, was Gerald\(aqs great gift to anyone
+readable (“human compatible”) as Gerald’s key\-value system. This system in
+particular, and the PROJ system in general, was Gerald’s great gift to anyone
 using and/or communicating about geodata.
 .sp
 It is only reasonable to name a program, keeping an eye on the
 integrity of the PROJ system, in honour of Gerald.
 .sp
 So in honour, and hopefully also in the spirit, of Gerald Ian Evenden
-(1935\-\-2016), this is the Geospatial Integrity Investigation Environment.
+(1935–2016), this is the Geospatial Integrity Investigation Environment.
 .SH SEE ALSO
 .sp
 \fBproj(1)\fP, \fBcs2cs(1)\fP, \fBcct(1)\fP, \fBgeod(1)\fP
diff --git a/man/man1/proj.1 b/man/man1/proj.1
index e49fb97a..5973c30c 100644
--- a/man/man1/proj.1
+++ b/man/man1/proj.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "PROJ" "1" "Feb 14, 2019" "6.0.0" "PROJ.4"
+.TH "PROJ" "1" "May 06, 2019" "6.1.0" "PROJ.4"
 .SH NAME
 proj \- Cartographic projection filter
 .
@@ -33,9 +33,9 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .SH SYNOPSIS
 .INDENT 0.0
 .INDENT 3.5
-\fBproj\fP [ \fB\-beEfiIlmorsStTvVwW\fP ] [ args ] ] [ \fI+args\fP ] file[s]
+\fBproj\fP [\fB\-beEfiIlmorsStTvVwW\fP] [args]] [\fI+opt[=arg]\fP …] file …
 .sp
-\fBinvproj\fP [ \fB\-beEfiIlmorsStTvVwW\fP ] [ args ] ] [ \fI+args\fP ] file[s]
+\fBinvproj\fP [\fB\-beEfiIlmorsStTvVwW\fP] [args]] [\fI+opt[=arg]\fP …] file …
 .UNINDENT
 .UNINDENT
 .SH DESCRIPTION
@@ -197,7 +197,7 @@ This option causes an expanded annotated listing of the characteristics of
 the projected point. \fI\%\-v\fP is implied with this option.
 .UNINDENT
 .sp
-The \fI+args\fP run\-line arguments are associated with cartographic parameters.
+The \fI+opt\fP run\-line arguments are associated with cartographic parameters.
 Additional projection control parameters may be contained in two auxiliary
 control files: the first is optionally referenced with the
 \fI+init=file:id\fP and the second is always processed after the name of the
@@ -216,7 +216,7 @@ portions of the input line are appended to the output line.
 Input geographic data (longitude and latitude) must be in DMS format and input
 cartesian data must be in units consistent with the ellipsoid major axis or
 sphere radius units. Output geographic coordinates will be in DMS (if the
-\fB\-w\fP switch is not employed) and precise to 0.001" with trailing, zero\-valued
+\fB\-w\fP switch is not employed) and precise to 0.001” with trailing, zero\-valued
 minute\-second fields deleted.
 .SH EXAMPLE
 .sp
diff --git a/man/man1/projinfo.1 b/man/man1/projinfo.1
index eb15ebc4..29017cb2 100644
--- a/man/man1/projinfo.1
+++ b/man/man1/projinfo.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "PROJINFO" "1" "Feb 14, 2019" "6.0.0" "PROJ.4"
+.TH "PROJINFO" "1" "May 06, 2019" "6.1.0" "PROJ.4"
 .SH NAME
 projinfo \- Geodetic object and coordinate operation queries
 .
@@ -36,26 +36,39 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .nf
 \fBprojinfo\fP
 .in +2
-[\-o formats] [\-k crs|operation] [\-\-summary] [\-q]
-[[\-\-area name_or_code] | [\-\-bbox west_long,south_lat,east_long,north_lat]]
-[\-\-spatial\-test contains|intersects]
-[\-\-crs\-extent\-use none|both|intersection|smallest]
-[\-\-grid\-check none|discard_missing|sort] [\-\-show\-superseded]
-[\-\-pivot\-crs none|{auth:code[,auth:code]*}]
-[\-\-boundcrs\-to\-wgs84]
-[\-\-main\-db\-path path] [\-\-aux\-db\-path path]*
-[\-\-identify]
-[\-\-c\-ify] [\-\-single\-line]
+[\-o formats] [\-k crs|operation|ellipsoid] [–summary] [\-q]
+[[–area name_or_code] | [–bbox west_long,south_lat,east_long,north_lat]]
+[–spatial\-test contains|intersects]
+[–crs\-extent\-use none|both|intersection|smallest]
+[–grid\-check none|discard_missing|sort] [–show\-superseded]
+[–pivot\-crs always|if_no_direct_transformation|never|{auth:code[,auth:code]*}]
+[–boundcrs\-to\-wgs84]
+[–main\-db\-path path] [–aux\-db\-path path]*
+[–identify]
+[–c\-ify] [–single\-line]
 {object_definition} | (\-s {srs_def} \-t {srs_def})
 
 .in -2
 .fi
 .sp
 .sp
-where {object_definition} or {object_definition} is a PROJ string, a
-WKT string, an object name or a AUTHORITY:CODE
-(where AUTHORITY is the name of a CRS authority and CODE the code of a CRS
-found in the proj.db database).
+where {object_definition} or {srs_def} is
+.INDENT 0.0
+.IP \(bu 2
+a proj\-string,
+.IP \(bu 2
+a WKT string,
+.IP \(bu 2
+an object code (like “EPSG:4326”, “urn:ogc:def:crs:EPSG::4326”,
+“urn:ogc:def:coordinateOperation:EPSG::1671”),
+.IP \(bu 2
+a OGC URN combining references for compound coordinate reference systems
+(e.g “\fI\%urn:ogc:def:crs,crs:EPSG::2393,crs:EPSG::5717\fP” or custom abbreviated
+syntax “EPSG:2393+5717”),
+.IP \(bu 2
+a OGC URN combining references for concatenated operations
+(e.g. “\fI\%urn:ogc:def:coordinateOperation,coordinateOperation:EPSG::3895,coordinateOperation:EPSG::1618\fP”)
+.UNINDENT
 .UNINDENT
 .UNINDENT
 .SH DESCRIPTION
@@ -80,16 +93,16 @@ Except \fBall\fP and \fBdefault\fP, other formats can be preceded by \fB\-\fP to
 .UNINDENT
 .INDENT 0.0
 .TP
-.B \-k crs|operation
+.B \-k crs|operation|ellipsoid
 When used to query a single object with a AUTHORITY:CODE, determines the (k)ind of the object
-in case there are CRS or coordinate operations with the same CODE.
+in case there are CRS, coordinate operations or ellipsoids with the same CODE.
 The default is crs.
 .UNINDENT
 .INDENT 0.0
 .TP
 .B \-\-summary
 When listing coordinate operations available between 2 CRS, return the
-result in a summary format, mentionning only the name of the coordinate
+result in a summary format, mentioning only the name of the coordinate
 operation, its accuracy and its area of use.
 .sp
 \fBNOTE:\fP
@@ -112,7 +125,7 @@ potentially compatible of being piped in other utilities.
 .B \-\-area name_or_code
 Specify an area of interest to restrict the results when researching
 coordinate operations between 2 CRS. The area of interest can be specified either
-as a name (e.g "Denmark \- onshore") or a AUTHORITY:CODE (EPSG:3237)
+as a name (e.g “Denmark \- onshore”) or a AUTHORITY:CODE (EPSG:3237)
 This option is exclusive of \fI\%\-\-bbox\fP\&.
 .sp
 \fBNOTE:\fP
@@ -145,7 +158,7 @@ only used for coordinate operation computation
 .B \-\-spatial\-test contains|intersects
 Specify how the area of use of coordinate operations found in the database
 are compared to the area of use specified explicitly with \fI\%\-\-area\fP or \fI\%\-\-bbox\fP,
-or derivedi implictly from the area of use of the source and target CRS.
+or derived implicitly from the area of use of the source and target CRS.
 By default, projinfo will only keep coordinate operations whose are of use
 is strictly within the area of interest (\fBcontains\fP strategy).
 If using the \fBintersects\fP strategy, the spatial test is relaxed, and any
@@ -223,12 +236,15 @@ only used for coordinate operation computation
 .UNINDENT
 .INDENT 0.0
 .TP
-.B \-\-pivot\-crs none|{auth:code[,auth:code]*}
+.B \-\-pivot\-crs always|if_no_direct_transformation|never|{auth:code[,auth:code]*}
 Determine if intermediate (pivot) CRS can be used when researching coordinate
 operation between 2 CRS. A typical example is the WGS84 pivot. By default,
-projinfo will consider any potential pivot. If using the \fBnone\fP strategy,
+projinfo will consider any potential pivot if there is no direct transformation
+( \fBif_no_direct_transformation\fP). If using the \fBnever\fP strategy,
 only direct transformations between the source and target CRS will be
-used. It is also possible to restrict the pivot CRS to consider by specifying
+used. If using the \fBalways\fP strategy, intermediate CRS will be considered
+even if there are direct transformations.
+It is also possible to restrict the pivot CRS to consider by specifying
 one or several CRS by their AUTHORITY:CODE.
 .sp
 \fBNOTE:\fP
@@ -263,6 +279,17 @@ The option may be repeated to specify several auxiliary databases.
 .UNINDENT
 .INDENT 0.0
 .TP
+.B \-\-identify
+When used with an object definition, this queries the PROJ database to find
+known objects, typically CRS, that are close or identical to the object.
+Each candidate object is associated with an approximate likelihood percentage.
+This is useful when used with a WKT string that lacks a EPSG identifier,
+such as ESRI WKT1. This might also be used with PROJ strings.
+For example, \fI+proj=utm +zone=31 +datum=WGS84 +type=crs\fP will be identified
+with a likelihood of 70% to EPSG:32631
+.UNINDENT
+.INDENT 0.0
+.TP
 .B \-\-c\-ify
 For developers only. Modify the string output of the utility so that it
 is easy to put those strings in C/C++ code
diff --git a/man/man3/geodesic.3 b/man/man3/geodesic.3
index 2e754c4f..84511cbe 100644
--- a/man/man3/geodesic.3
+++ b/man/man3/geodesic.3
@@ -1,6 +1,6 @@
 .\" @(#)geodesic.3
 .\"
-.TH GEODESIC 3 "2018/09/15 Rel. 5.2.0"
+.TH GEODESIC 3 "2018/09/15 Rel. 6.1.0"
 .ad b
 .hy 1
 .SH NAME
diff --git a/man/man3/pj_init.3 b/man/man3/pj_init.3
index ab77d42a..048075b6 100644
--- a/man/man3/pj_init.3
+++ b/man/man3/pj_init.3
@@ -1,6 +1,6 @@
 .\" @(#)pj_init.3 - 5.2.0
 .\"
-.TH PJ_INIT 3 "2018/09/5 Rel. 5.2.0"
+.TH PJ_INIT 3 "2018/09/5 Rel. 6.1.0"
 .ad b
 .hy 1
 .SH NAME