Skip to content

Commit

Permalink
docs: update grass70, grass71 to grass73
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.osgeo.org/grass/grass/trunk@68886 15284696-431f-4ddb-bdfa-cd5b030d7da7
  • Loading branch information
neteler committed Jul 7, 2016
1 parent 8e6b434 commit 4540c0c
Show file tree
Hide file tree
Showing 28 changed files with 80 additions and 80 deletions.
2 changes: 1 addition & 1 deletion .travis/.travis.osx.script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ brew test -v grass-trunk
# brew info grass-trunk

## run tests
## grass71 ./nc_basic_spm_grass7/PERMANENT --exec python -m grass.gunittest.main --location './nc_basic_spm_grass7' --location-type nc
## grass73 ./nc_basic_spm_grass7/PERMANENT --exec python -m grass.gunittest.main --location './nc_basic_spm_grass7' --location-type nc

## uninstall grass-trunk
# brew uninstall grass-trunk
6 changes: 3 additions & 3 deletions CITING
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ For citation choices see below; for citing a particular GRASS GIS module, you ma


Choices for citing the main GRASS GIS software (update YEAR and version number accordingly):
* GRASS Development Team, YEAR. Geographic Resources Analysis Support System (GRASS) Software, Version 7.0. Open Source Geospatial Foundation. http://grass.osgeo.org
* GRASS Development Team, YEAR. Geographic Resources Analysis Support System (GRASS) Software, Version 7.2. Open Source Geospatial Foundation. http://grass.osgeo.org
* GRASS Development Team, YEAR. Geographic Resources Analysis Support System (GRASS) Programmer's Manual. Open Source Geospatial Foundation. Electronic document: http://grass.osgeo.org/programming7


Citing a GRASS GIS Addon (update AUTHOR(S), YEAR, Addon-NAME, and version number accordingly):
* AUTHOR(S), and GRASS Development Team, YEAR Addon-NAME. Geographic Resources Analysis Support System (GRASS) Software, Version 7.0. Open Source Geospatial Foundation. https://grass.osgeo.org/grass70/manuals/addons/Addon-NAME.html
* AUTHOR(S), and GRASS Development Team, YEAR Addon-NAME. Geographic Resources Analysis Support System (GRASS) Software, Version 7.2. Open Source Geospatial Foundation. https://grass.osgeo.org/grass72/manuals/addons/Addon-NAME.html


For other (scientific) references, see
Expand All @@ -19,7 +19,7 @@ For other (scientific) references, see
A BibTeX entry for LaTeX users is:

@Manual{GRASS_GIS_software,
title = {Geographic Resources Analysis Support System (GRASS) Software},
title = {Geographic Resources Analysis Support System (GRASS) Software, Version 7.2},
author = {{GRASS Development Team}},
organization = {Open Source Geospatial Foundation},
address = {USA},
Expand Down
8 changes: 4 additions & 4 deletions INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ GRASS source code is currently distributed in 2 forms:
(*.tar.gz package) of that SVN repository. The SVN snapshot name
contains the date when the snapshot was created (checked out from
the SVN repository), e.g. grass-7.2.svn_src_snapshot_2016_06_11.tar.gz
from https://grass.osgeo.org/grass72/source/snapshot/
from https://grass.osgeo.org/grass73/source/snapshot/
Further instructions at https://trac.osgeo.org/grass/wiki/DownloadSource


Expand Down Expand Up @@ -151,16 +151,16 @@ See also CODE OPTIMIZATION below.

After compilation, the resulting code is stored in the directory
./dist.$ARCH
and the scripts (grass72, ...) in
and the scripts (grass73, ...) in
./bin.$ARCH

To run GRASS, simply start
./bin.$ARCH/grass72
./bin.$ARCH/grass73

or run

make install
grass72
grass73


(E) INSTALLATION ON MACOSX
Expand Down
4 changes: 2 additions & 2 deletions doc/grass_database.html
Original file line number Diff line number Diff line change
Expand Up @@ -221,15 +221,15 @@ <h3>Starting GRASS GIS using command line</h3>
in a given Mapset with only command line interface:

<div class="code"><pre>
grass71 -text ~/grassdata/mylocation/mymapset
grass73 -text ~/grassdata/mylocation/mymapset
</pre></div>

And the following will create the given Location with projection given
by the EPSG code and it will start the default interface
(GUI or command line):

<div class="code"><pre>
grass71 -c EPSG:5514:3 ~/grassdata/mylocation
grass73 -c EPSG:5514:3 ~/grassdata/mylocation
</pre></div>

See <a href="grass7.html"><em>grass</em></a> command manual for more details.
Expand Down
2 changes: 1 addition & 1 deletion general/g.findfile/g.findfile.html
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ <h3>SHELL</h3>

<h3>PYTHON</h3>

See <em><a href="http://grass.osgeo.org/grass71/manuals/libpython/">Python
See <em><a href="http://grass.osgeo.org/grass73/manuals/libpython/">Python
Scripting Library</a></em> for more info.
<p>
Note: The Python tab in the <em>wxGUI</em> can be used for entering the
Expand Down
2 changes: 1 addition & 1 deletion general/g.message/g.message.html
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ <h2>NOTES</h2>

<h3>Usage in Python scripts</h3>

<a href="http://grass.osgeo.org/grass71/manuals/libpython/">GRASS
<a href="http://grass.osgeo.org/grass73/manuals/libpython/">GRASS
Python Scripting Library</a> defines special wrappers
for <em>g.message</em>.

Expand Down
4 changes: 2 additions & 2 deletions grasslib.dox
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ href="http://grass.osgeo.org">http://grass.osgeo.org</a>
- gis: \ref gislib
- raster: \ref rasterlib
- vector: \ref vectorlib
- Temporal GIS API: See http://grass.osgeo.org/grass71/manuals/libpython/temporal_framework.html
- Temporal GIS API: See http://grass.osgeo.org/grass73/manuals/libpython/temporal_framework.html

\section libs Further libraries

Expand Down Expand Up @@ -112,7 +112,7 @@ href="http://grass.osgeo.org">http://grass.osgeo.org</a>

\subsection pythonlibs Python API

- python: See GRASS GIS Python library (http://grass.osgeo.org/grass71/manuals/libpython/)
- python: See GRASS GIS Python library (http://grass.osgeo.org/grass73/manuals/libpython/)

\subsection projlibs Projection Libraries

Expand Down
4 changes: 2 additions & 2 deletions gui/icons/grass.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ Comment[tr]=Coğrafi bilgi sistemi
Comment[uk]=Геоінформаційна система
Comment[uz]=Geografik axborot tizimi
Categories=Education;Science;Geoscience;Geography;
Exec=grass71
Icon=grass71
Exec=grass73
Icon=grass73
Terminal=true
URL=https://grass.osgeo.org/
Keywords=gis;spatial;geospatial;database;remote sensing;hydrology;vector;raster;visualization;maps;wms;wfs;ogc;osgeo;
2 changes: 1 addition & 1 deletion gui/wxpython/README
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ $Date$
If you want to launch wxPython GUI automatically, start GRASS with
`-gui` parameter

$ grass70 -gui
$ grass73 -gui


3 - STARTUP FROM GRASS TERMINAL
Expand Down
2 changes: 1 addition & 1 deletion gui/wxpython/docs/wxGUI.html
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,7 @@ <h3>Starting the graphical user interface</h3>
specifying the <tt>-gui</tt> (or <tt>-wxpython</tt>) switch:

<div class="code"><pre>
grass71 -gui
grass73 -gui
</pre></div>


Expand Down
2 changes: 1 addition & 1 deletion gui/wxpython/xml/menudata.README
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ MENU
- the entries in menudata.xml and module_tree_menudata.xml are autogenerated
via tools/build_modules_xml.py (see ../Makefile)
- Find more info at
https://grass.osgeo.org/grass71/manuals/wxGUI.toolboxes.html
https://grass.osgeo.org/grass73/manuals/wxGUI.toolboxes.html
(../docs/wxgui_sphinx/src/)
- additionally
https://trac.osgeo.org/grass/wiki/wxGUIDevelopment/Toolboxes
2 changes: 1 addition & 1 deletion imagery/i.topo.corr/test_i.topo.corr_synthetic_DEM_NC.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Script to test i.topo.corr with a synthetic map
#
# Use North Carolina location to test:
# grass71 ~/grassdata/nc_spm_08_grass7/user1
# grass73 ~/grassdata/nc_spm_08_grass7/user1

if test "$GISBASE" = ""; then
echo "You must be in GRASS to run this program."
Expand Down
2 changes: 1 addition & 1 deletion lib/gis/parser_wps.c
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ static void wps_print_process_description_begin(int store, int status, const cha
if(abstract)
{
fprintf(stdout,"\t\t<ows:Abstract>");
fprintf(stdout, "http://grass.osgeo.org/grass71/manuals/%s.html", identifier);
fprintf(stdout, "http://grass.osgeo.org/grass73/manuals/%s.html", identifier);
fprintf(stdout, "</ows:Abstract>\n");
}

Expand Down
4 changes: 2 additions & 2 deletions lib/gpde/gpdelib.dox
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ void #N_write_array_2d_to_rast (N_array_2d * array, char *name);

<P>
<b>Example implementation:</b><br>
The GRASS module <a href="http://grass.osgeo.org/grass71/manuals/r.gwflow.html">r.gwflow</a>
The GRASS module <a href="http://grass.osgeo.org/grass73/manuals/r.gwflow.html">r.gwflow</a>
implements numerical calculation program for transient,
confined and unconfined groundwater flow in two dimensions.

Expand Down Expand Up @@ -294,7 +294,7 @@ void #N_write_array_3d_to_rast3d (N_array_3d * array, char *name, int mask);

<P>
<b>Example implementation:</b><br>
The GRASS module <a href="http://grass.itc.it/grass71/manuals/r3.gwflow.html">r3.gwflow</a>
The GRASS module <a href="http://grass.itc.it/grass73/manuals/r3.gwflow.html">r3.gwflow</a>
implements numerical calculation program for transient, confined
groundwater flow in three dimensions.

Expand Down
22 changes: 11 additions & 11 deletions lib/init/README
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
o GRASS text mode startup

"grass71" starts up d.m by default (if not first time user).
"grass71 -text" will start up in text mode.
"grass71 -wxpython" or "grass71 -gui" will start up in wxpython mode.
"grass73" starts up d.m by default (if not first time user).
"grass73 -text" will start up in text mode.
"grass73 -wxpython" or "grass73 -gui" will start up in wxpython mode.

You can use alias "grass71" to "grass71 -text" to use text mode by default.
You can use alias "grass73" to "grass73 -text" to use text mode by default.
Or set env var GRASS_GUI=text.


Expand All @@ -25,26 +25,26 @@ o GRASS non-interactive startup examples
export LOCATION_NAME=loc1
export MAPSET=map1

grass71 - # non-interactive startup using LOCATION location
grass73 - # non-interactive startup using LOCATION location

ex2)
export GISDBASE=/usr/home/grass/usr/data1
export LOCATION_NAME=loc1
export MAPSET=map1

grass71 - # non-interactive startup using
grass73 - # non-interactive startup using
# GISDBASE/LOCATION_NAME/MAPSET location


Also, the first argument of grass71 can override these env vars.
Also, the first argument of grass73 can override these env vars.

ex3)
export LOCATION=/usr/home/grass/usr/data1/loc1/map1
export GISDBASE=/usr/home/grass/usr/data1
export LOCATION_NAME=loc1
export MAPSET=map1

grass71 /usr/home/grass/usr/data2/loc2-1/map1-1
grass73 /usr/home/grass/usr/data2/loc2-1/map1-1
# non-interactive startup using
# /usr/home/grass/usr/data2/loc2-1/map1-1 location

Expand All @@ -53,7 +53,7 @@ o GRASS non-interactive startup examples
export LOCATION_NAME=loc1
export MAPSET=map1

grass71 /usr/home/grass/usr/data2/loc2-1/map1-1
grass73 /usr/home/grass/usr/data2/loc2-1/map1-1
# non-interactive startup using
# /usr/home/grass/usr/data2/loc2-1/map1-1 location

Expand All @@ -63,7 +63,7 @@ o GRASS non-interactive startup examples
export LOCATION_NAME=loc1
export MAPSET=map1

grass71 map1-1 # non-interactive startup using
grass73 map1-1 # non-interactive startup using
# GISDBASE/LOCATION_NAME/map1-1 location

ex6)
Expand All @@ -72,7 +72,7 @@ o GRASS non-interactive startup examples
export LOCATION_NAME=loc1
export MAPSET=map1

grass71 loc2-1/map1-1
grass73 loc2-1/map1-1
# non-interactive startup using
# GISDBASE/loc2-1/map1-1 location

Expand Down
2 changes: 1 addition & 1 deletion lib/init/grass.py
Original file line number Diff line number Diff line change
Expand Up @@ -855,7 +855,7 @@ def set_mapset(gisrc, arg, geofile=None, create_new=False):
l = None

if arg == '-':
# TODO: repair or remove behavior env vars + `grass71 -` (see doc)
# TODO: repair or remove behavior env vars + `grass73 -` (see doc)
# this is broken for some time (before refactoring, e.g. r65235)
# is some code is added, it should be a separate function, probably
# called here
Expand Down
2 changes: 1 addition & 1 deletion lib/init/grass.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ if [ -z "$GRASS_PYTHON" ] ; then
fi
export GRASS_PYTHON

exec "$GRASS_PYTHON" "@BINDIR@/grass71.py" "$@" &
exec "$GRASS_PYTHON" "@BINDIR@/grass73.py" "$@" &
Loading

0 comments on commit 4540c0c

Please sign in to comment.