[GRASS-SVN] r67399 - in grass/branches/releasebranch_7_0: display/d.grid general/g.parser lib/gmath

[svn_grass at osgeo.org]

Author: neteler
Date: 2015-12-27 12:16:15 -0800 (Sun, 27 Dec 2015)
New Revision: 67399

Modified:
   grass/branches/releasebranch_7_0/display/d.grid/main.c
   grass/branches/releasebranch_7_0/general/g.parser/g.parser.html
   grass/branches/releasebranch_7_0/lib/gmath/la.c
Log:
minor syncs to trunk

Modified: grass/branches/releasebranch_7_0/display/d.grid/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.grid/main.c	2015-12-27 20:12:11 UTC (rev 67398)
+++ grass/branches/releasebranch_7_0/display/d.grid/main.c	2015-12-27 20:16:15 UTC (rev 67399)
@@ -50,6 +50,7 @@
     module = G_define_module();
     G_add_keyword(_("display"));
     G_add_keyword(_("cartography"));
+    G_add_keyword(_("graticule"));
     module->description =
 	_("Overlays a user-specified grid "
 	  "in the active display frame on the graphics monitor.");

Modified: grass/branches/releasebranch_7_0/general/g.parser/g.parser.html
===================================================================
--- grass/branches/releasebranch_7_0/general/g.parser/g.parser.html	2015-12-27 20:12:11 UTC (rev 67398)
+++ grass/branches/releasebranch_7_0/general/g.parser/g.parser.html	2015-12-27 20:16:15 UTC (rev 67399)
@@ -527,6 +527,8 @@
 </em>
 
 <p>
+Overview table: <a href="https://grass.osgeo.org/grass71/manuals/parser_standard_options.html">Parser standard options</a>
+<p>
 <a href="http://trac.osgeo.org/grass/wiki/Submitting/Python">Submitting rules for Python</a>
 
 <p>

Modified: grass/branches/releasebranch_7_0/lib/gmath/la.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gmath/la.c	2015-12-27 20:12:11 UTC (rev 67398)
+++ grass/branches/releasebranch_7_0/lib/gmath/la.c	2015-12-27 20:16:15 UTC (rev 67399)
@@ -1368,7 +1368,7 @@
     }
 
     if (v1->type != out->type) {
-        G_warning (_("Output vector is of incorrect type"));
+        G_warning (_("Output vector is not the same type as others"));
         return NULL;
     }