[GRASS-SVN] r73729 - grass/branches/releasebranch_7_6/lib/init
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Nov 30 03:44:28 PST 2018
Author: neteler
Date: 2018-11-30 03:44:28 -0800 (Fri, 30 Nov 2018)
New Revision: 73729
Modified:
grass/branches/releasebranch_7_6/lib/init/grass.py
grass/branches/releasebranch_7_6/lib/init/grass7.html
Log:
init: use LOCATION to stand for location name in help (see #2681, backport of trunk r73353)
In the documentation of CLI and --help use simply LOCATION instead of LOCATION_NAME
because LOCATION fits with mapset. LOCATION_NAME versus LOCATION is a legacy which
does not have to be propagated to primary interface. This changes only documentation,
no iterface changes are made.
Modified: grass/branches/releasebranch_7_6/lib/init/grass.py
===================================================================
--- grass/branches/releasebranch_7_6/lib/init/grass.py 2018-11-30 04:09:39 UTC (rev 73728)
+++ grass/branches/releasebranch_7_6/lib/init/grass.py 2018-11-30 11:44:28 UTC (rev 73729)
@@ -290,8 +290,8 @@
$CMD_NAME [-h | --help] [-v | --version]
[-c | -c geofile | -c EPSG:code[:datum_trans] | -c XY]
[-e] [-f] [--text | --gtext | --gui] [--config param]
- [[[GISDBASE/]LOCATION_NAME/]MAPSET]
- $CMD_NAME [FLAG]... GISDBASE/LOCATION_NAME/MAPSET --exec EXECUTABLE [EPARAM]...
+ [[[GISDBASE/]LOCATION/]MAPSET]
+ $CMD_NAME [FLAG]... GISDBASE/LOCATION/MAPSET --exec EXECUTABLE [EPARAM]...
$CMD_NAME --tmp-location [geofile | EPSG | XY] --exec EXECUTABLE [EPARAM]...
{flags}:
@@ -315,11 +315,11 @@
{params}:
GISDBASE {gisdbase}
{gisdbase_detail}
- LOCATION_NAME {location}
+ LOCATION {location}
{location_detail}
MAPSET {mapset}
- GISDBASE/LOCATION_NAME/MAPSET {full_mapset}
+ GISDBASE/LOCATION/MAPSET {full_mapset}
EXECUTABLE {executable}
EPARAM {executable_params}
Modified: grass/branches/releasebranch_7_6/lib/init/grass7.html
===================================================================
--- grass/branches/releasebranch_7_6/lib/init/grass7.html 2018-11-30 04:09:39 UTC (rev 73728)
+++ grass/branches/releasebranch_7_6/lib/init/grass7.html 2018-11-30 11:44:28 UTC (rev 73729)
@@ -5,7 +5,7 @@
<b>grass76</b> [<b>-h</b> | <b>-help</b> | <b>--help</b>] [<b>-v</b> | <b>--version</b>]
[<b>-c</b> | <b>-c geofile</b> | <b>-c EPSG:code[:datum_trans]</b>]
[<b>--text</b> | <b>--gtext</b> | <b>--gui</b>]
- [[[<b><GISDBASE>/</b>]<b><LOCATION_NAME>/</b>]
+ [[[<b><GISDBASE>/</b>]<b><LOCATION>/</b>]
<b><MAPSET></b>]
<h3>Flags:</h3>
@@ -67,11 +67,11 @@
<dd> Initial database directory which should be a fully qualified path
(e.g., <tt>/usr/local/share/grassdata</tt>)
-<dt><b>LOCATION_NAME</b>
+<dt><b>LOCATION</b>
<dd> Initial location directory which is a subdirectory of GISDBASE
<dt><b>MAPSET</b>
-<dd> Initial mapset directory which is a subdirectory of LOCATION_NAME
+<dd> Initial mapset directory which is a subdirectory of LOCATION
</dl>
<i>Note</i>: These parameters must be specified in one of the
@@ -79,8 +79,8 @@
<div class="code"><pre>
MAPSET
- LOCATION_NAME/MAPSET
- GISDBASE/LOCATION_NAME/MAPSET
+ LOCATION/MAPSET
+ GISDBASE/LOCATION/MAPSET
</pre></div>
<h2>DESCRIPTION</h2>
More information about the grass-commit
mailing list