Fix potential crashes from long running threads in a removed window.

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

diff --git a/help/C/viking.xml b/help/C/viking.xml
index c30dea8ddfd6f7315aff9a8face1f8d931ca11ff..aa170b5954f9427f29ef141ff8b24094e9d0faa6 100644 (file)
--- a/help/C/viking.xml
+++ b/help/C/viking.xml
@@ -1829,31 +1829,7 @@ Tracks are searched first in preference over waypoints.
 
 </section><!-- End Agg -->
 
-<section id="GeoRef" xreflabel="GeoRef"><title>GeoRef Layer</title>
-<para>
-This layer allows one to use any image as a map. You will need to tell it how to align the map to a position in the world and the scale of map.
-</para>
-<section><title>Layer Operations</title>
-<section><title>Zoom to Fit Map</title>
-<para>
-Automatically set a zoom level to see the entire map coverage.
-</para>
-</section>
-
-<section><title>Goto Map Center</title>
-<para>
-Center the viewport on this map.
-</para>
-
-</section>
-<section><title>Export to World File</title>
-<para>
-Opens a file save dialog to save the scale and position information as a <ulink url="http://en.wikipedia.org/wiki/World_file">World File</ulink>.
-</para>
-</section>
-</section>
-
-</section><!-- End GeoRef -->
+<xi:include href="georef_layer.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 <section id="Coordinate" xreflabel="Coordinate"><title>Coordinate Layer</title>
 <para>
@@ -2099,7 +2075,7 @@ For Linux you can override this with the setting in the <xref linkend="prefs_ext
 
 </section>
 
-<section><title>Georef Map Layer Tools</title>
+<section id="georef_tools"><title>Georef Map Layer Tools</title>
 <para>
 You must have a <xref linkend="GeoRef"/> Map Layer selected to use these tools.
 </para>
@@ -2299,6 +2275,10 @@ Generally if you have a system with lots of memory it's recommended to increase
 <para>This allows setting the specific location of GPSBabel.</para>
 <para>&appname; will need to be restarted for this setting to take effect.</para>
 </section>
+<section><title>Auto Read World Files</title>
+<para>If this is on, when a new image is selected for the GeoRef layer then the associated world file will be read to find the scale and positional properties.</para>
+<para>The associated file is based on filename patterns; e.g. if the image is <filename>filename.jpg</filename> - then the world file may be <filename>filename.jpgw</filename> or <filename>filename.jgw</filename></para>
+</section>
 </section>
 
 <section id="prefs_osm" xreflabel="OpenStreetMap Traces Preferences"><title>OpenStreetMap Traces</title>
@@ -3344,6 +3324,7 @@ Accept: */*
               <para>K = Some text to display at the start of the message - <emphasis>Trkpt</emphasis></para>
               <para>A = Altitude of a Trackpoint</para>
               <para>S = Speed of a Trackpoint</para>
+              <para>B = Vertical Speed (Climb)</para>
               <para>C = Course of a Trackpoint</para>
               <para>L = Location of a Trackpoint</para>
               <para>T = Time of a Trackpoint</para>