[GRASS-SVN] r55009 - grass/trunk/db/db.connect

[svn_grass at osgeo.org]

Author: neteler
Date: 2013-02-12 02:59:34 -0800 (Tue, 12 Feb 2013)
New Revision: 55009

Modified:
   grass/trunk/db/db.connect/db.connect.html
   grass/trunk/db/db.connect/main.c
Log:
manual and msg wording cosmetics

Modified: grass/trunk/db/db.connect/db.connect.html
===================================================================
--- grass/trunk/db/db.connect/db.connect.html	2013-02-12 10:28:21 UTC (rev 55008)
+++ grass/trunk/db/db.connect/db.connect.html	2013-02-12 10:59:34 UTC (rev 55009)
@@ -3,8 +3,9 @@
 <em>db.connect</em> allows the user to set database connection parameters.
 These parameters are then taken as default values by modules so that the
 user does not need to enter the parameters each time.
+<p>
+The default database backend in GRASS 7 is SQLite.
 
-
 <h2>NOTES</h2>
 
 Values are stored in the mapset's <tt>VAR</tt> file;
@@ -19,27 +20,16 @@
 
 <h2>EXAMPLES</h2>
 
-<h3>DBF</h3>
+<h3>SQLite (default backend)</h3>
 
-Local storage (the dbf/ subdirectory in the mapset must exist or must be
-created by the user):
-<br>
-<div class="code"><pre>
-db.connect driver=dbf database='$GISDBASE/$LOCATION_NAME/$MAPSET/dbf/'
-db.tables -p
-</pre></div>
-
-
-<h3>SQLite</h3>
-
 Local storage:
 <br>
 <div class="code"><pre>
-db.connect driver=sqlite database='$GISDBASE/$LOCATION_NAME/$MAPSET/sqlite/sqlite.db'
+db.connect -d
 db.connect -p
 db.tables -p
 </pre></div>
-<p>The SQLite database is created automatically when used the first time.
+<p>The SQLite database file is created automatically when used the first time.
 
 
 <h3>ODBC</h3>
@@ -101,11 +91,21 @@
 db.tables -p
 </pre></div>
 
+<h3>DBF (not recommended)</h3>
 
+Local storage (the dbf/ subdirectory in the mapset must exist or must be
+created by the user):
+<br>
+<div class="code"><pre>
+db.connect driver=dbf database='$GISDBASE/$LOCATION_NAME/$MAPSET/dbf/'
+db.tables -p
+</pre></div>
+
 <h2>SEE ALSO</h2>
 
 <em>
 <a href="db.columns.html">db.columns</a>,
+<a href="db.copy.html">db.copy</a>,
 <a href="db.drivers.html">db.drivers</a>,
 <a href="db.login.html">db.login</a>,
 <a href="db.tables.html">db.tables</a>,
@@ -116,9 +116,10 @@
 <p>
 <a href="sql.html">GRASS SQL interface</a>
 
-<h2>AUTHOR</h2>
+<h2>AUTHORS</h2>
 
-Radim Blazek, ITC-Irst, Trento, Italy
+Main author: Radim Blazek, ITC-Irst, Trento, Italy<br>
+GRASS 7 improvements: Martin Landa, Markus Metz
 
 <p>
 <i>Last changed: $Date$</i>

Modified: grass/trunk/db/db.connect/main.c
===================================================================
--- grass/trunk/db/db.connect/main.c	2013-02-12 10:28:21 UTC (rev 55008)
+++ grass/trunk/db/db.connect/main.c	2013-02-12 10:59:34 UTC (rev 55009)
@@ -9,7 +9,7 @@
  *               Hamish Bowman <hamish_b yahoo com>
  *               Martin Landa <landa.martin gmail.com> ('d' flag)
  * PURPOSE:      set parameters for connection to database
- * COPYRIGHT:    (C) 2002-2010 by the GRASS Development Team
+ * COPYRIGHT:    (C) 2002-2013 by the GRASS Development Team
  *
  *               This program is free software under the GNU General Public
  *               License (>=v2). Read the file COPYING that comes with GRASS
@@ -66,7 +66,7 @@
     def = G_define_flag();
     def->key = 'd';
     def->label = _("Set from default settings and exit");
-    def->description = _("Overwrite current settings if initialized");
+    def->description = _("Overwrite current settings if already initialized");
     def->guisection = _("Set");
 
     driver = G_define_standard_option(G_OPT_DB_DRIVER);