[GRASS-SVN] r63166 - in grass/branches/releasebranch_7_0: . vector/v.external.out

[svn_grass at osgeo.org]

Author: neteler
Date: 2014-11-26 13:39:02 -0800 (Wed, 26 Nov 2014)
New Revision: 63166

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/vector/v.external.out/args.c
   grass/branches/releasebranch_7_0/vector/v.external.out/v.external.out.html
Log:
v.external.out: use standardized options (#2409); update manual


Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:60817,61096,61141,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62856,62879,62881,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942,62944-62946,62949,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,
 63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157
   + /grass/trunk:60817,61096,61141,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62856,62879,62881,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942,62944-62946,62949,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,
 63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63165

Modified: grass/branches/releasebranch_7_0/vector/v.external.out/args.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.external.out/args.c	2014-11-26 21:38:15 UTC (rev 63165)
+++ grass/branches/releasebranch_7_0/vector/v.external.out/args.c	2014-11-26 21:39:02 UTC (rev 63166)
@@ -9,7 +9,7 @@
 		struct _options *options, struct _flags *flags)
 {
     options->dsn = G_define_option();
-    options->dsn->key = "directory";
+    options->dsn->key = "output";
     options->dsn->type = TYPE_STRING;
     options->dsn->label = _("Name of output directory or OGR or PostGIS data source");
     options->dsn->description = _("Examples:\n"

Modified: grass/branches/releasebranch_7_0/vector/v.external.out/v.external.out.html
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.external.out/v.external.out.html	2014-11-26 21:38:15 UTC (rev 63165)
+++ grass/branches/releasebranch_7_0/vector/v.external.out/v.external.out.html	2014-11-26 21:39:02 UTC (rev 63166)
@@ -141,7 +141,7 @@
 
 <h3>GRASS native format</h3>
 
-To restore original settings, ie. use GRASS native format, type:
+To restore original settings, ie. use the GRASS native format, type:
 
 <div class="code"><pre>
 v.external.out -r
@@ -152,10 +152,12 @@
 Current settings can be stored to file by specifying <b>output</b> option.
 
 <div class="code"><pre>
-# define output PostGIS database for GRASS calculation results stored as topological elements:
-v.external.out output=PG:dbname=gisdb format=PostgreSQL options=topology=YES output=gisdb_topo.txt
+# define output PostGIS database for GRASS calculation with
+# results stored as topological elements:
+v.external.out output=PG:dbname=gisdb format=PostgreSQL \
+  options=topology=YES savesettings=gisdb_topo.txt
 
-# do some processing in PostGIS Topology
+# ... and do some processing in PostGIS Topology
 </pre></div>
 
 Back to native format:
@@ -166,12 +168,13 @@
 # do some processing in native format
 </pre></div>
 
-Restore previous settings from "gisdb_topo.txt" file by specifying <b>input</b> option.
+Restore previous settings from "gisdb_topo.txt" file by 
+specifying <b>loadsettings</b> option.
 
 <div class="code"><pre>
-v.external.out output=gisdb_topo.txt
+v.external.out loadsettings=gisdb_topo.txt
 
-# do some processing in PostGIS Topology
+# ... and do some processing in PostGIS Topology
 </pre></div>
 
 <h2>REFERENCES</h2>