sync g.remove and g.rename manuals with trunk

git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@63623 15284696-431f-4ddb-bdfa-cd5b030d7da7

general/g.remove/g.remove.html

@@ -9,23 +9,23 @@ then nothing is removed, instead the list of selected file names is printed to
 
 Delete <tt>map1</tt> and <tt>map2</tt> raster maps in the current mapset:
 <div class="code"><pre>
-g.remove -f type=rast name=tmp1,tmp2
+g.remove -f type=raster name=tmp1,tmp2
 </pre></div>
 
 Delete all raster and vector maps starting with "<tt>tmp_</tt>" in the current
 mapset:
 <div class="code"><pre>
 # show matching raster and vector maps but do not delete yet (as verification)
-g.remove type=rast,vect pattern="tmp_*"
+g.remove type=raster,vector pattern="tmp_*"
 
 # actually delete the matching raster and vector maps
-g.remove -f type=rast,vect pattern="tmp_*"
+g.remove -f type=raster,vector pattern="tmp_*"
 </pre></div>
 
 Delete all vector maps starting with "<tt>stream_</tt>" in the current mapset,
 but exclude those ending with "<tt>_final</tt>":
 <div class="code"><pre>
-g.remove -f type=vect pattern="stream_*" exclude="*_final"
+g.remove -f type=vector pattern="stream_*" exclude="*_final"
 </pre></div>
 
 <h2>AUTHOR</h2>

general/g.rename/g.rename.html

@@ -14,22 +14,20 @@ in the current mapset.  The file element <em>old</em> is
 then renamed to <em>new</em>.
 
 <p>
-Users can also simply type <em>g.rename -help</em> without
+Users can also simply type <em>g.rename --help</em> without
 arguments on the command line, to receive a menu of
 existing data base element types and files from which to
 choose for possible renaming:
 
-<div class="code">
-<pre>
-     rast   rast file(s) to be renamed
-  oldvect   oldvect file(s) to be renamed (GRASS 5.0)
-     vect   vect file(s) to be renamed	  (GRASS >5.1)
-     icon   icon file(s) to be renamed
-   labels   labels file(s) to be renamed
-    sites   sites file(s) to be renamed
-   region   region file(s) to be renamed
-    group   group file(s) to be renamed
-   3dview   3dview file(s) to be renamed
+<div class="code"><pre>
+       raster   raster map(s) to be renamed
+    raster_3d   3D raster map(s) to be renamed
+       vector   vector map(s) to be renamed
+    oldvector   old  (GRASS 5.0) vector map(s) to be renamed
+  asciivector   ASCII vector map(s) to be renamed
+       labels   paint label file(s) to be renamed
+       region   region definition(s) to be renamed
+        group   imagery group(s) to be renamed
 </pre></div>
 
 
@@ -42,7 +40,7 @@ also are renamed.
 <p>
 If the user attempts to rename a file to itself by setting
 the <em>new</em> file name equal to the <em>old</em> file
-name (e.g., <b>g.rename rast=soils,soils</b>),
+name (e.g., <b>g.rename raster=soils,soils</b>),
 <em>g.rename</em> will not execute the rename, but instead
 state that no rename is needed.  However, <em>g.rename</em>
 
@@ -58,13 +56,13 @@ the intended name.
 
 <div class="code"><pre>
 # rename raster map
-g.rename rast=oldrast,newrast
+g.rename raster=oldrast,newrast
 
 # rename vector map
-g.rename vect=oldvect,newvect
+g.rename vector=oldvect,newvect
 
 # combined renaming
-g.rename rast=oldrast,newrast vect=oldvect,newvect
+g.rename raster=oldrast,newrast vector=oldvect,newvect
 </pre></div>
 
 <h2>SEE ALSO</h2>