Merge branch 'release/debian/1_5.3.0GA-1'debian/1_5.3.0GA-1

1 files changed, 35 insertions, 15 deletions

diff --git a/app/doc/optionm.but b/app/doc/optionm.but
index 8876d96..1398ad9 100644
--- a/app/doc/optionm.but
+++ b/app/doc/optionm.but
@@ -44,7 +44,7 @@ The \f{Options Menu} shows commands to change configuration options.
 \rule
 
 
-\S{cmdRgbcolor} Colors Dialog
+\S{cmdRgbcolor} \i{Colors Dialog}
 
 The \f{Colors} dialog is invoked from the Options (\K{optionM}) menu
 
@@ -90,10 +90,18 @@ The \f{Colors} dialog controls the color that various objects are drawn.
 
 \dd \f{Track Ties} - color of ties (if drawn).
 
+\u000
+
+\dd \f{Bridge Base} - color of Bridge fill between the parapets.
+
+\u000
+
+\dd \f{Track Roadbed} - color of Roadbed fill under the track.
+
 \rule
 
 
-\S{cmdCmdopt} Command Option Dialog
+\S{cmdCmdopt} \i{Command Option Dialog}
 
 The \f{Command Option} dialog is invoked from the Options (\K{optionM}) menu
 
@@ -109,7 +117,7 @@ The \f{Command Option} dialog contains items which control the behavior of some
 
 \u000
 
-\dd \e{Select-Mode} - will either (a) only select the current item unless Ctrl is added or (b) will add the current item to the selection unless Ctrl is added in which case it will only select this item. 
+\dd \e{Select-Mode} - will either (a) only select the current item unless Ctrl is added or (b) will add the current item to the selection unless Ctrl is added in which case it will only select this item.
 
 \u000
 
@@ -118,7 +126,7 @@ The \f{Command Option} dialog contains items which control the behavior of some
 \rule
 
 
-\S{cmdDisplay} Display Dialog
+\S{cmdDisplay} \i{Display Dialog}
 
 The \f{Display} dialog is invoked from the Options (\K{optionM}) menu
 
@@ -149,6 +157,10 @@ Setting this option constrains the Main Canvas to minimize these areas (the \f{g
 
 \u000
 
+\dd \f{Dont Hide System Cursor} - when XTrackCAD substitutes a specialized cursor to show actions that will occur (or are occuring) it will normallly hide the System Cursor.  This option suppresses this behaviour and leaves the system cursor in place.
+
+\u000
+
 \dd \f{Draw EndPts} - when to draw endpoints between connected track: never, only for turnouts or for all tracks.
 
 \u000
@@ -183,13 +195,13 @@ Setting this option constrains the Main Canvas to minimize these areas (the \f{g
 
 \u000
 
-\b \e{Cars} - Reporting mark labels on cars.
+\b \e{Cars} - Reporting mark labels on cars - the content shown on the Cars label is either the Repmarks (if the Rep Number is set), or the car index number (with a "#" before it). See the Car Part dialog \K{carpart}.
 
 \b \e{EndPt Elevations} - Elevation markers attached to endpoints.
 
-\b \e{Lengths} - Length of flex-track attached to ends of turnouts.
+\b \e{Lengths} - Length of flex-track attached to ends of turnouts all the way to the next turnout.
 
-\b \e{Track Descriptions} - Title of each turnout and sectional track.
+\b \e{Track Descriptions} - Title of each turnout and sectional track, optional details of each piece of Flexible Track. These can be shown or hidden using the Move Description \K{cmdMoveLabel} command.
 
 \b \e{Track Elevations} - Computed elevations at the center of each track.
 
@@ -201,11 +213,11 @@ Setting this option constrains the Main Canvas to minimize these areas (the \f{g
 
 \u000
 
-\dd \f{Layout Labels} - controls the format of titles for turnouts and structures displayed on the Layout.
+\dd \f{Layout Labels} - controls the format of titles for Turnouts and Structures displayed on the Layout.
 
 \u000
 
-\dd \f{Label Scale} - draw labels only when the drawing Scale is smaller or equal to this value.
+\dd \f{Label Scale} - the program will draw labels only when the drawing Scale is smaller or equal to this value.
 
 \u000
 
@@ -321,7 +333,7 @@ Easements require the possibility of creating track with arbitrary radii. Theref
 \rule
 
 
-\S{fontSelW} Font Selection
+\S{fontSelW} \i{Font Selection}
 
 The font selection dialog allows selection of the font used by the text (\K{cmdText}) command.  This command is valid only on UNIX based systems.
 
@@ -330,7 +342,7 @@ The font selection dialog allows selection of the font used by the text (\K{cmdT
 \rule
 
 
-\S{cmdLayout} Layout Dialog
+\S{cmdLayout} \i{Layout Dialog}
 
 The \f{Layout Options} dialog, displayed by the Options (\K{optionM}) or the File (\K{fileM} menu, contains items controlling the current layout.
 
@@ -391,7 +403,7 @@ It can be changed to a new local file and the next \f{Save} will rebuild the pac
 
 \rule
 
-\S{cmdPref} Preferences Dialog
+\S{cmdPref} \i{Preferences Dialog}
 
 This dialog controls some parameters which likely will not be changed frequently.
 
@@ -403,7 +415,7 @@ This dialog controls some parameters which likely will not be changed frequently
 
 \u000
 
-\dd \f{AutoSave} \i{AutoSave} - specifies the number of Check Points taken before an AutoSave. The same number of checkpoints are retained in a circular archive set in the (\K{workDir}) named for the layout file.  Setting this value to 0 disables AutoSave. 
+\dd \f{AutoSave} \i{AutoSave} - specifies the number of Check Points taken before an AutoSave. The same number of checkpoints are retained in a circular archive set in the (\K{workDir}) named for the layout file.  Setting this value to 0 disables AutoSave.
 
 \u000
 
@@ -411,7 +423,7 @@ This dialog controls some parameters which likely will not be changed frequently
 
 \u000
 
-\dd \f{Show FlexTrack} - disables the display or \f{FlexTrack} (\K{generalTerms}) which is shown on the left of the Toolbar.
+\dd \f{Show Flex-track} - disables the display or \f{Flex-track} (\K{generalTerms}) which is shown on the left of the Toolbar.
 
 \u000
 
@@ -461,10 +473,18 @@ This dialog controls some parameters which likely will not be changed frequently
 
 \dd \f{Units} - choose between English (inches) or Metric (centimeters) measurements.
 
+\u000
+
+\dd \f{Write Settings} - Save the current settings to a named settings file
+
+\u000
+
+\dd \f{Read Settings} - Load settings from a named settings file
+
 \rule
 
 
-\S{cmdSticky} Sticky Dialog
+\S{cmdSticky} \i{Sticky Dialog}
 
 By default, when commands complete, the defined \f{Default Command} (\K{cmdCmdopt}) becomes active.  If a command is \f{sticky}, the defined \f{Default Command} is ignored and the current command remains active after completion.