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

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-04-17 02:08:54 -0700 (Fri, 17 Apr 2015)
New Revision: 65084

Modified:
   grass/trunk/db/db.connect/db.connect.html
Log:
db.connect: update manual to use `db.login host= port=`


Modified: grass/trunk/db/db.connect/db.connect.html
===================================================================
--- grass/trunk/db/db.connect/db.connect.html	2015-04-17 08:16:50 UTC (rev 65083)
+++ grass/trunk/db/db.connect/db.connect.html	2015-04-17 09:08:54 UTC (rev 65084)
@@ -32,69 +32,70 @@
 <p>The SQLite database file is created automatically when used the first time.
 
 
-<h3>ODBC</h3>
+<h3>PostgreSQL (local connection)</h3>
 
-Network storage, database tables stored in database "mydb"
+Local storage, database tables stored in database "mydb"
 (may require the use of <em><a href=db.login.html>db.login</a></em>):
-<br> 
+<br>
 <div class="code"><pre>
-db.connect driver=odbc database=mydb
-db.login user=myname [pass=secret]
+db.connect driver=pg database=mydb
+db.login user=myname pass=secret
 db.connect -p
 db.tables -p
 </pre></div>
 
 
-<h3>PostgreSQL</h3>
+<h3>PostgreSQL (network connection)</h3>
 
 Network storage, database tables stored in database "mydb"
 (may require the use of <em><a href=db.login.html>db.login</a></em>):
 <br>
 <div class="code"><pre>
-db.connect driver=pg database="host=myserver.itc.it,dbname=mydb"
-db.login user=myname [pass=secret]
+db.connect driver=pg database=mydb
+db.login user=myname pass=secret host=myserver.com port=6666
 db.connect -p
 db.tables -p
 </pre></div>
 
 
-<h3>PostgreSQL with different port</h3>
+<h3>MySQL (local connection)</h3>
 
-Network storage, database tables stored in database "mydb"
-(may require the use of <em><a href=db.login.html>db.login</a></em>):
+Local storage, database tables stored in database "mydb" (may require
+the use of <em><a href=db.login.html>db.login</a></em>):
 <br>
 <div class="code"><pre>
-db.connect driver=pg database="host=myserver.itc.it,dbname=mydb,port=6666"
-db.login user=myname [pass=secret]
+db.connect driver=mysql database=mydb
+db.login user=myname pass=secret
 db.connect -p
 db.tables -p
 </pre></div>
 
 
-<h3>MySQL (local connection)</h3>
+<h3>MySQL (network connection)</h3>
 
-Local storage (<em><a href=db.login.html>db.login</a></em> may not be needed):
+Network storage, database tables stored in database "mydb"
+(may require the use of <em><a href=db.login.html>db.login</a></em>):
 <br>
 <div class="code"><pre>
 db.connect driver=mysql database=mydb
-db.login user=myname [pass=secret]
+db.login user=myname pass=secret host=myserver.com
 db.connect -p
 db.tables -p
 </pre></div>
 
+<h3>ODBC</h3>
 
-<h3>MySQL (external server)</h3>
-
 Network storage, database tables stored in database "mydb"
 (may require the use of <em><a href=db.login.html>db.login</a></em>):
-<br>
+<br> 
 <div class="code"><pre>
-db.connect driver=mysql database="host=myserver.itc.it,dbname=mydb"
-db.login user=myname [pass=secret]
+db.connect driver=odbc database=mydb
+db.login user=myname pass=secret
 db.connect -p
 db.tables -p
 </pre></div>
 
+
 <h3>DBF (local, not recommended)</h3>
 
 Local storage (the dbf/ subdirectory in the mapset must exist or must be