浏览代码

clean up manual pages of timestamp modules (merge https://trac.osgeo.org/grass/changeset/69206 from trunk)

git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@69208 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 8 年之前
父节点
当前提交
ff84a2e09e

+ 12 - 4
raster/r.timestamp/r.timestamp.html

@@ -96,29 +96,37 @@ the map consists of a single date or two dates (ie start and end
 dates).
 dates).
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-    r.timestamp map=soils
+r.timestamp map=soils
 </pre></div>
 </pre></div>
 
 
 Sets the timestamp for "soils" to the single date "15 sep 1987".
 Sets the timestamp for "soils" to the single date "15 sep 1987".
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-    r.timestamp map=soils date='15 sep 1987'
+r.timestamp map=soils date='15 sep 1987'
 </pre></div>
 </pre></div>
 
 
 Sets the timestamp for "soils" to have the start date "15 sep 1987"
 Sets the timestamp for "soils" to have the start date "15 sep 1987"
 and the end date "20 feb 1988".
 and the end date "20 feb 1988".
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-    r.timestamp map=soils date='15 sep 1987/20 feb 1988'
+r.timestamp map=soils date='15 sep 1987/20 feb 1988'
+</pre></div>
+
+Sets the timestamp for "soils" to have the start date "18 feb 2005
+10:30:00" and the end date "20 jul 2007 20:30:00".
+
+<div class="code"><pre>
+r.timestamp map=soils date='18 feb 2005 10:30:00/20 jul 2007 20:30:00'
 </pre></div>
 </pre></div>
 
 
 Removes the timestamp for the "soils" raster map.
 Removes the timestamp for the "soils" raster map.
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-    r.timestamp map=soils date=none
+r.timestamp map=soils date=none
 </pre></div>
 </pre></div>
 
 
 <h2>KNOWN ISSUES</h2>
 <h2>KNOWN ISSUES</h2>
+
 Spaces in the timestamp value are required.
 Spaces in the timestamp value are required.
 
 
 <h2>SEE ALSO</h2>
 <h2>SEE ALSO</h2>

+ 3 - 2
raster3d/r3.timestamp/main.c

@@ -41,11 +41,12 @@ int main(int argc, char *argv[])
 
 
     module = G_define_module();
     module = G_define_module();
     G_add_keyword(_("raster3d"));
     G_add_keyword(_("raster3d"));
+    G_add_keyword(_("metadata"));
     G_add_keyword(_("timestamp"));
     G_add_keyword(_("timestamp"));
     G_add_keyword(_("time"));
     G_add_keyword(_("time"));
     G_add_keyword(_("voxel"));
     G_add_keyword(_("voxel"));
-    module->description =
-	_("Print/add/remove a timestamp for a 3D raster map");
+    module->label = _("Modifies a timestamp for a 3D raster map.");
+    module->description = _("Print/add/remove a timestamp for a 3D raster map.");
 
 
     map = G_define_standard_option(G_OPT_R3_MAP);
     map = G_define_standard_option(G_OPT_R3_MAP);
 
 

+ 49 - 78
raster3d/r3.timestamp/r3.timestamp.html

@@ -1,88 +1,59 @@
 <h2>DESCRIPTION</h2>
 <h2>DESCRIPTION</h2>
 
 
-This command has 2 modes of operation. If no date argument
-is supplied, then the current timestamp for the 3D raster map
-is printed. If a date argument is specified, then the
-timestamp for the 3D raster map is set to the specified
-date(s). See EXAMPLES below.
+This command has 2 modes of operation. If no <b>date</b> argument is
+supplied, then the current timestamp for the 3D raster map is
+printed. If a date argument is specified, then the timestamp for the
+3D raster map is set to the specified date(s). See examples below.
+
+<p>
+See <a href="r.timestamp.html#timestamp-format">TIMESTAMP FORMAT</a>
+description for details.
+
+<h2>NOTES</h2>
+
+Strings containing spaces should be quoted. For specifying a range of
+time, the two timestamps should be separated by a forward slash. To
+remove the timestamp from a 3D raster map, use <b>date=none</b>.
 
 
 <h2>EXAMPLES</h2>
 <h2>EXAMPLES</h2>
 
 
-<b>r3.timestamp map=soils</b><br>
-	  Prints the timestamp for the "soils" 3D raster map. If
-	  there is no timestamp for soils, nothing is printed. If
-	  there is a timestamp, one or two lines are printed,
-	  depending on if the timestamp for the map consists of a
-	  single date or two dates (ie start and end dates).
-<p><b>r3.timestamp map=soils date='15 sep 1987'</b><br>
-	  Sets the timestamp for "soils" to the single date<br>
-	  "15 sep 1987"
-<p><b>r3.timestamp map=soils date='15 sep 1987/20 feb 1988'</b><br>
-	  Sets the timestamp for "soils" to have the start date<br>
-	  "15 sep 1987" and the end date "20 feb 1988"
-<p><b>r3.timestamp map=soils date='18 feb 2005 10:30:00/20 jul 2007 20:30:00'</b><br>
-	  Sets the timestamp for "soils" to have the start date<br>
-	  "18 aug 2005 10:30:00" and the end date "20 jul 2007 20:30:00"
-<p>
-<b>r3.timestamp map=soils date=none</b><br>
-	  Removes the timestamp for the "soils" 3D raster map
-
-<h2>TIMESTAMP FORMAT</h2>
-     The timestamp values must use the format as described in the
-     GRASS datetime library.  The source tree for this library
-     should have a description of the format. For convience, the
-     formats as of Feb, 1996 are reproduced here:
-<p>     There are two types of datetime values: absolute and
-     relative. Absolute values specify exact dates and/or times.
-     Relative values specify a span of time. Some examples will
-     help clarify:
-<p><b>Absolute</b><p>	  The general format for absolute values is
-<p><tt>
-	     day month year [bc] hour:minute:seconds timezone
-<br>
-	     day is 1-31<br>
-	     month is jan,feb,...,dec<br>
-	     year is 4 digit year<br>
-	     [bc] if present, indicates dates is BC<br>
-	     hour is 0-23 (24 hour clock)<br>
-	     minute is 0-59<br>
-	     second is 0-59.9999 (fractions of second allowed)<br>
-	     timezone is +hhmm or -hhmm (eg, -0600)<br>
-<br>
-	  parts can be missing
-<br>
-	     1994 [bc]<br>
-	     Jan 1994 [bc]<br>
-	     15 jan 1000 [bc]<br>
-	     15 jan 1994 [bc] 10 [+0000]<br>
-	     15 jan 1994 [bc] 10:00 [+0100]<br>
-	     15 jan 1994 [bc] 10:00:23.34 [-0500]<br>
-<br>
-</tt>
-    <b> Relative</b>
-	  There are two types of relative datetime values, year-
-	  month and day-second.	 The formats are:
-<p><tt>
-	     [-] # years # months<br>
-	     [-] # days # hours # minutes # seconds
-</tt><p>	  The words years, months, days, hours, minutes, seconds
-	  are literal words, and the # are the numeric values.<br>
-	  Examples:<p><tt>
-	     2 years<br>
-	     5 months<br>
-	     2 years 5 months<br>
-	     100 days<br>
-	     15 hours 25 minutes 35.34 seconds<br>
-	     100 days 25 minutes<br>
-	     1000 hours 35.34 seconds
-</tt><p>	  The following are <i>illegal</i> because it mixes year-month
-	  and day-second (because the number of days in a month
-	  or in a year vary):<p><tt>
-	     3 months 15 days<br>
-	     3 years 10 days
-</tt>
+Prints the timestamp for the "soils" 3D raster map. If there is no
+timestamp for soils, nothing is printed. If there is a timestamp, one
+or two lines are printed, depending on if the timestamp for the map
+consists of a single date or two dates (ie start and end dates).
+
+<div class="code"><pre>
+r3.timestamp map=soils
+</pre></div>
+
+Sets the timestamp for "soils" to the single date "15 sep 1987".
+
+<div class="code"><pre>
+r3.timestamp map=soils date='15 sep 1987'
+</pre></div>
+
+Sets the timestamp for "soils" to have the start date "15 sep 1987"
+and the end date "20 feb 1988".
+
+<div class="code"><pre>
+r3.timestamp map=soils date='15 sep 1987/20 feb 1988'
+</pre></div>
+
+Sets the timestamp for "soils" to have the start date "18 feb 2005
+10:30:00" and the end date "20 jul 2007 20:30:00".
+
+<div class="code"><pre>
+r3.timestamp map=soils date='18 feb 2005 10:30:00/20 jul 2007 20:30:00'
+</pre></div>
+
+Removes the timestamp for the "soils" 3D raster map.
+
+<div class="code"><pre>
+r3.timestamp map=soils date=none
+</pre></div> 
 
 
 <h2>KNOWN ISSUES</h2>
 <h2>KNOWN ISSUES</h2>
+
 Spaces in the timestamp value are required.
 Spaces in the timestamp value are required.
 
 
 <h2>SEE ALSO</h2>
 <h2>SEE ALSO</h2>

+ 9 - 80
vector/v.timestamp/v.timestamp.html

@@ -5,88 +5,16 @@ supplied, then the current timestamp for the vector map is printed. If
 a date argument is specified, then the timestamp for the vector map is
 a date argument is specified, then the timestamp for the vector map is
 set to the specified date(s). See examples below.
 set to the specified date(s). See examples below.
 
 
+<p>
+See <a href="r.timestamp.html#timestamp-format">TIMESTAMP FORMAT</a>
+description for details.
+
 <h2>NOTES</h2>
 <h2>NOTES</h2>
 
 
 Strings containing spaces should be quoted. For specifying a range of
 Strings containing spaces should be quoted. For specifying a range of
 time, the two timestamps should be separated by a forward slash. To
 time, the two timestamps should be separated by a forward slash. To
 remove the timestamp from a vector map, use <b>date=none</b>.
 remove the timestamp from a vector map, use <b>date=none</b>.
 
 
-<h2>TIMESTAMP FORMAT</h2>
-
-The timestamp values must use the format as described in the <em>GRASS
-Datetime Library</em>. The source tree for this library should have a
-description of the format. For convience, the formats are reproduced
-here:
-
-<p>There are two types of datetime values:
-
-<ul>
-  <li><em>absolute</em> and
-  <li><em>relative</em>.
-</ul>
-
-Absolute values specify exact dates and/or times. Relative values
-specify a span of time. 
-
-<h3>Absolute</h3>
-
-The general format for absolute values is:
-
-<div class="code"><pre>
-  day month year [bc] hour:minute:seconds timezone
-
-	     day is 1-31
-	     month is jan,feb,...,dec
-	     year is 4 digit year
-	     [bc] if present, indicates dates is BC
-	     hour is 0-23 (24 hour clock)
-	     minute is 0-59
-	     second is 0-59.9999 (fractions of second allowed)
-	     timezone is +hhmm or -hhmm (eg, -0600)
-</pre></div>
-
-Some parts can be missing, for example
-
-<div class="code"><pre>
-	     1994 [bc]
-	     Jan 1994 [bc]
-	     15 jan 1000 [bc]
-	     15 jan 1994 [bc] 10 [+0000]
-	     15 jan 1994 [bc] 10:00 [+0100]
-	     15 jan 1994 [bc] 10:00:23.34 [-0500]
-</pre></div>
-
-<h3>Relative</h3>
-
-There are two types of relative datetime values, year-month and
-day-second. The formats are:
-
-<div class="code"><pre>
-	     [-] # years # months
-	     [-] # days # hours # minutes # seconds
-</pre></div>
-
-The words years, months, days, hours, minutes, seconds are literal
-words, and the # are the numeric values. Examples:
-
-<div class="code"><pre>
-	     2 years
-	     5 months
-	     2 years 5 months
-	     100 days
-	     15 hours 25 minutes 35.34 seconds
-	     100 days 25 minutes
-	     1000 hours 35.34 seconds
-</pre></div>
-
-The following are <i>illegal</i> because it mixes year-month and
-day-second (because the number of days in a month or in a year vary):
-
-<div class="code"><pre>
-	     3 months 15 days
-	     3 years 10 days
-</pre></div>
-
 <h2>EXAMPLES</h2>
 <h2>EXAMPLES</h2>
 
 
 Prints the timestamp for the "lidar" vector map. If there is no
 Prints the timestamp for the "lidar" vector map. If there is no
@@ -96,29 +24,30 @@ the map consists of a single date or two dates (ie start and end
 dates).
 dates).
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-    v.timestamp map=lidar
+v.timestamp map=lidar
 </pre></div>
 </pre></div>
 
 
 Sets the timestamp for "lidar" to the single date "15 sep 1987".
 Sets the timestamp for "lidar" to the single date "15 sep 1987".
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-    v.timestamp map=lidar date='15 sep 1987'
+v.timestamp map=lidar date='15 sep 1987'
 </pre></div>
 </pre></div>
 
 
 Sets the timestamp for "lidar" to have the start date "15 sep 1987"
 Sets the timestamp for "lidar" to have the start date "15 sep 1987"
 and the end date "20 feb 1988".
 and the end date "20 feb 1988".
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-    v.timestamp map=lidar date='15 sep 1987/20 feb 1988'
+v.timestamp map=lidar date='15 sep 1987/20 feb 1988'
 </pre></div>
 </pre></div>
 
 
 Removes the timestamp for the "lidar" vector map.
 Removes the timestamp for the "lidar" vector map.
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-    v.timestamp map=lidar date=none
+v.timestamp map=lidar date=none
 </pre></div>
 </pre></div>
 
 
 <h2>KNOWN ISSUES</h2>
 <h2>KNOWN ISSUES</h2>
+
 Spaces in the timestamp value are required.
 Spaces in the timestamp value are required.
 
 
 <h2>SEE ALSO</h2>
 <h2>SEE ALSO</h2>