Merge 45b88c0 into 93b119b

docs/source/apps/cct.rst

@@ -70,7 +70,7 @@ The following control parameters can appear in any order:
 
     Print version number.
 
-The *+args* arguments are associated with coordinate operation parameters.
+The *+opts* arguments are associated with coordinate operation parameters.
 Usage varies with operation.
 
 .. only:: html

docs/source/apps/cs2cs.rst

@@ -132,12 +132,12 @@ The following control parameters can appear in any order:
 
 .. only:: man
 
-    The *+args* run-line arguments are associated with cartographic
+    The *+opts* run-line arguments are associated with cartographic
     parameters.
 
 .. only:: html
 
-    The *+args* run-line arguments are associated with cartographic
+    The *+opts* run-line arguments are associated with cartographic
     parameters. Usage varies with projection and for a complete description
     consult the :ref:`projection pages <projections>`.
 

docs/source/apps/geod.rst

@@ -7,9 +7,9 @@ geod
 Synopsis
 ********
 
-    **geod** *+ellps=<ellipse>* [ **-afFIlptwW** [ args ] ] [ *+args* ] file[s]
+    **geod** *+ellps=<ellipse>* [ **-afFIlptwW** [ args ] ] [ *+opts[=arg]* ] file[s]
 
-    **invgeod** *+ellps=<ellipse>* [ **-afFIlptwW** [ args ] ] [ *+args* ] file[s]
+    **invgeod** *+ellps=<ellipse>* [ **-afFIlptwW** [ args ] ] [ *+opts[=arg]* ] file[s]
 
 Description
 ***********
@@ -85,7 +85,7 @@ The following command-line options can appear in any order:
     This option causes the azimuthal values to be output as unsigned DMS
     numbers between 0 and 360 degrees. Also note :option:`-f`.
 
-The *+args* command-line options are associated with geodetic
+The *+opts* 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

docs/source/apps/proj.rst

@@ -12,9 +12,9 @@ proj
 
 Synopsis
 ********
-    **proj** [ **-beEfiIlmorsStTvVwW** ] [ args ] ] [ *+args* ] file[s]
+    **proj** [ **-beEfiIlmorsStTvVwW** ] [ args ] ] [ *+opts[=arg]* ] file[s]
 
-    **invproj** [ **-beEfiIlmorsStTvVwW** ] [ args ] ] [ *+args* ] file[s]
+    **invproj** [ **-beEfiIlmorsStTvVwW** ] [ args ] ] [ *+opts[=arg]* ]file[s]
 
 
 Description
@@ -156,7 +156,7 @@ The following control parameters can appear in any order
     the projected point. :option:`-v` is implied with this option.
 
 
-The *+args* run-line arguments are associated with cartographic parameters.
+The *+opts* 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
 *+init=file:id* and the second is always processed after the name of the
@@ -167,7 +167,7 @@ also used for supporting files like datum shift files.
 
 .. only:: html
 
-    Usage of *+args* varies with projection and for a complete description
+    Usage of *+opts* varies with projection and for a complete description
     consult the :ref:`projection pages <projections>`.
 
 

man/man1/cct.1

@@ -97,7 +97,7 @@ 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+opts\fP arguments are associated with coordinate operation parameters.
 Usage varies with operation.
 .sp
 \fBcct\fP is an acronym meaning \fICoordinate Conversion and Transformation\fP\&.

man/man1/cs2cs.1

@@ -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+opts\fP run\-line arguments are associated with cartographic
 parameters.
 .sp
 The \fBcs2cs\fP program requires two coordinate reference system (CRS) definitions. The first (or

man/man1/geod.1

@@ -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+opts[=arg]\fP ] file[s]
 .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+opts[=arg]\fP ] file[s]
 .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+opts\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

man/man1/proj.1

@@ -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+opts[=arg]\fP ] file[s]
 .sp
-\fBinvproj\fP [ \fB\-beEfiIlmorsStTvVwW\fP ] [ args ] ] [ \fI+args\fP ] file[s]
+\fBinvproj\fP [ \fB\-beEfiIlmorsStTvVwW\fP ] [ args ] ] [ \fI+opts[=arg]\fP ] file[s]
 .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+opts\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