manual: refer in topics also to keyword index; g.version: more keywords + citation

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@64583 15284696-431f-4ddb-bdfa-cd5b030d7da7

general/g.version/g.version.html

@@ -38,7 +38,7 @@ print gcore.version()
 <div class="code"><pre>
 g.version 
 
-GRASS 7.0.0svn (2014)
+GRASS 7.1.svn (2015)
 </pre></div>
 
 <h3>GIS Library info</h3>
@@ -46,28 +46,37 @@ GRASS 7.0.0svn (2014)
 <div class="code"><pre>
 g.version -r
 
-GRASS 7.0.0svn (2014)
-libgis Revision: 63222 
-libgis Date: 2014-11-28 10:04:17 +0100 (Fri, 28 Nov 2014) 
+GRASS 7.1.svn (2015)
+libgis Revision: 63930 
+libgis Date: 2015-01-02 12:22:21 +0100 (Fri, 02 Jan 2015)
 </pre></div>
 
 <h3>Full info in shell script style</h3>
 <div class="code"><pre>
 g.version -rge
 
-version=7.0.0svn
-date=2014
-revision=63285M
-build_date=2014-12-03
+version=7.1.svn
+date=2015
+revision=64567
+build_date=2015-01-11
 build_platform=x86_64-unknown-linux-gnu
-libgis_revision=63222 
-libgis_date="2014-11-28 10:04:17 +0100 (Fri, 28 Nov 2014) "
+libgis_revision=63930 
+libgis_date="2015-01-02 12:22:21 +0100 (Fri, 02 Jan 2015) "
 proj4=4.8.0
-gdal=1.10.1
+gdal=1.11.1
 geos=3.4.2
-sqlite=3.8.7
+sqlite=3.8.8
 </pre></div>
 
+<h2>Citing GRASS GIS</h2>
+
+The GRASS Development Team has invested significant time and effort
+in creating GRASS GIS, please cite it when using it for data analysis.
+
+The GRASS GIS <a href="http://grass.osgeo.org/download/software/">Web site</a>
+offers citations in different styles.
+<!-- TODO: g.version should offer this right away -->
+
 <h2>AUTHORS</h2>
 
 Michael Shapiro, 

general/g.version/main.c

@@ -60,7 +60,11 @@ int main(int argc, char *argv[])
     module = G_define_module();
     G_add_keyword(_("general"));
     G_add_keyword(_("support"));
-    module->label = _("Displays GRASS version info.");
+    G_add_keyword(_("citing"));
+    G_add_keyword(_("copyright"));
+    G_add_keyword(_("version"));
+    G_add_keyword(_("license"));
+    module->label = _("Displays GRASS GIS version info.");
     module->description = _("Optionally also prints build or copyright information.");
 
     copyright = G_define_flag();

man/build_html.py

@@ -82,7 +82,7 @@ r"""<!-- the files grass${grass_version_major}.html & helptext.html file live in
     <tr>
       <td width="33%" valign="top" class="box"><h3>&nbsp;Quick Introduction</h3>
       <ul>
-       <li class="box"><a href="helptext.html">How to start with GRASS</a></li>
+       <li class="box"><a href="helptext.html">How to start with GRASS GIS</a></li>
        <li class="box"><span>Index of <a href="topics.html">topics</a> and <a href="keywords.html">keywords</a></span></li>
       </ul>
       <p>
@@ -306,6 +306,8 @@ r"""
 <hr class="header">
 
 <h2>Topic: ${keyword}</h2>
+<i>Note: see also the corresponding keyword <a href="keywords.html#${keyword}">${keyword}</a> for additional references.</i>
+<p>
 <table>
 """)
 #"