Merge branch 'TrackLabelling'

[andy/viking.git] / help / C / viking.xml

diff --git a/help/C/viking.xml b/help/C/viking.xml
index b774f18e7993b666e8d64dbff80e90ff09fba416..4be2bbaaf672005cd99bec34924e0c340f49e4be 100644 (file)
--- a/help/C/viking.xml
+++ b/help/C/viking.xml
@@ -600,9 +600,11 @@ For instance the largest successful image generated on my (RN) Debian system is
 <para>
 Located on the <menuchoice><guimenu>File</guimenu><guisubmenu>Generate Directory of Images</guisubmenu></menuchoice> menu only.
 </para>
+<note>
 <para>
 This is only available in UTM mode.
 </para>
+</note>
 </section>
 
 </section> <!-- End File Types -->
@@ -745,9 +747,13 @@ Version1.1+: An individual track can be exported to a GPX file via the track men
 
 <section id="finish_track"><title>Finish Track or Route</title>
 <para>
-This is only available when a track or route is being created by the <xref linkend="track_create"/> or <xref linkend="route_create"/> tools.
 Selecting this option ends the creation of that individual track or route.
 </para>
+<note>
+<para>
+This is only available when a track or route is being created by the <xref linkend="track_create"/> or <xref linkend="route_create"/> tools.
+</para>
+</note>
 </section>
 
 <section><title>New</title>
@@ -930,9 +936,13 @@ The following colors are used in the elevation-distance graph:
 
 <section><title>Finish Track</title>
 <para>
-This is only available when a track is being created by the <xref linkend="track_create"/> tool.
 Selecting this option ends the creation of the individual track.
 </para>
+<note>
+<para>
+This is only available when a track is being created by the <xref linkend="track_create"/> tool.
+</para>
+</note>
 </section>
 
 <section><title>Goto</title>
@@ -965,9 +975,11 @@ threshold time away. This way, if you somehow end up with lots of small
 segments (say, caused by turning the GPS on and off) you can merge them
 easily into one track.
 </para>
+<note>
 <para>
 This is not available on routes as they have no timestamps.
 </para>
+</note>
 </section>
 
 <section><title>Merge With Other Tracks</title>
@@ -998,9 +1010,11 @@ time interval between successive trackpoints is larger than some
 threshold. This is useful when processing raw NMEA GPS data, especially
 taken over a long time.
 </para>
+<note>
 <para>
 This is not available on routes as they have no timestamps.
 </para>
+</note>
 </section>
 
 <section><title>Split By Number of Points</title>
@@ -1014,15 +1028,22 @@ This can be useful with devices which may have limits on the number of points it
 <para>
 Splits track segments into new tracks.
 </para>
+<note>
 <para>
 This is not available on routes as they do not have route segments.
 </para>
+</note>
 </section>
 
 <section><title>Split at Trackpoint</title>
 <para>
-Splits the track at the currently selected trackpoint. This is only enabled when a trackpoint is selected.
+Splits the track at the currently selected trackpoint.
 </para>
+<note>
+<para>
+This is only enabled when a trackpoint is selected.
+</para>
+</note>
 </section>
 </section>
 
@@ -1036,9 +1057,11 @@ Deletes subsequent points that have the same position (but have different timest
 <para>
 Deletes subsequent points that have the same time stamp (but may have different positions).
 </para>
+<note>
 <para>
 This is not available on routes as they have no timestamps.
 </para>
+</note>
 </section>
 
 </section>
@@ -1087,9 +1110,24 @@ Same as the layer <link linkend="osm_upload">Upload to OSM</link> command, but o
 <para>
 This selects the track to be used in the <link linkend="filter_with_track">Filter With <emphasis>Trackname</emphasis></link> feature.
 </para>
+<note>
 <para>
 This is not available on routes.
 </para>
+</note>
+</section>
+
+<section><title>Refine Route...</title>
+<para>
+This function allows to request a Routing Engine in order to refine a given route.
+By "refining" we mean computing all real intermediates points between some given major points.
+This could be useful to compute a trip giving only the wished important steps.
+</para>
+<note>
+<para>
+This is only available on routes.
+</para>
+</note>
 </section>
 
 <section><title>View Google Directions</title>
@@ -2484,6 +2522,10 @@ Accept: */*
               <term>url-stop-ll</term>
               <listitem><para>the part of the URL setting the end point location, parametrized in the spirit of C printf format, with 2 "%s" for coordinates (eg. "&amp;stop=%s,%s")</para></listitem>
             </varlistentry>
+            <varlistentry>
+              <term>url-via-ll</term>
+              <listitem><para>the part of the URL setting via point location, parametrized in the spirit of C printf format, with 2 "%s" for coordinates (eg. "&amp;via=%s,%s")</para></listitem>
+            </varlistentry>
             <varlistentry>
               <term>url-start-dir</term>
               <listitem><para>the part of the URL setting the starting point location for direction based routing, parametrized in the spirit of C printf format, with one "%s" for direction (eg. "&amp;start=%s")</para>