Merge branch 'master' into server-json-tests

JMRI · Apr 18, 2019 · 11067fa · 11067fa
2 parents 9706179 + 8e38f04
commit 11067fa
Show file tree

Hide file tree

Showing 262 changed files with 32,474 additions and 2,252 deletions.
diff --git a/help/en/JavaHelpSearch/DOCS b/help/en/JavaHelpSearch/DOCS
diff --git a/help/en/JavaHelpSearch/DOCS.TAB b/help/en/JavaHelpSearch/DOCS.TAB
diff --git a/help/en/JavaHelpSearch/OFFSETS b/help/en/JavaHelpSearch/OFFSETS
diff --git a/help/en/JavaHelpSearch/POSITIONS b/help/en/JavaHelpSearch/POSITIONS
diff --git a/help/en/JavaHelpSearch/SCHEMA b/help/en/JavaHelpSearch/SCHEMA
@@ -1,2 +1,2 @@
 JavaSearch 1.0
-TMAP bs=2048 rt=74 fl=-1 id1=16892 id2=1
+TMAP bs=2048 rt=72 fl=-1 id1=16997 id2=1
diff --git a/help/en/JavaHelpSearch/TMAP b/help/en/JavaHelpSearch/TMAP
diff --git a/help/en/JmriHelp_enIndex.xml b/help/en/JmriHelp_enIndex.xml
@@ -62,6 +62,68 @@
 
  <indexitem text="Consisting Tool " target="html.tools.consisttool.ConsistTool"/>
 
+ <indexitem text="System Console " target="package.apps.SystemConsole"/>
+
+ <indexitem text="CTC " target="package.jmri.jmrit.ctc.CTC">
+  <indexitem text="CTCEditor " target="package.jmri.jmrit.ctc.CTC_editor">
+   <indexitem text="Menus " target="package.jmri.jmrit.ctc.CTC_menuFile">
+    <indexitem text="File menu " target="package.jmri.jmrit.ctc.CTC_menuFile">
+     <indexitem text="New " target="package.jmri.jmrit.ctc.CTC_menuFile"/>
+
+     <indexitem text="Save " target="package.jmri.jmrit.ctc.CTC_menuFile"/>
+
+     <indexitem text="Exit without saving " target="package.jmri.jmrit.ctc.CTC_menuFile"/>
+
+    </indexitem>
+    <indexitem text="Edit menu " target="package.jmri.jmrit.ctc.CTC_menuEditFind">
+     <indexitem text="Find and Replace... " target="package.jmri.jmrit.ctc.CTC_menuEditFind"/>
+
+     <indexitem text="Fix Error(s)... " target="package.jmri.jmrit.ctc.CTC_menuEditFix"/>
+
+    </indexitem>
+    <indexitem text="Configure menu " target="package.jmri.jmrit.ctc.CTC_menuCfgDeb">
+     <indexitem text="Debugging " target="package.jmri.jmrit.ctc.CTC_menuCfgDeb"/>
+
+     <indexitem text="Defaults " target="package.jmri.jmrit.ctc.CTC_menuCfgDef"/>
+
+     <indexitem text="Fleeting " target="package.jmri.jmrit.ctc.CTC_menuCfgFlt"/>
+
+     <indexitem text="Patterns " target="package.jmri.jmrit.ctc.CTC_menuCfgPat"/>
+
+     <indexitem text="GUI Design " target="package.jmri.jmrit.ctc.CTC_menuCfgGui"/>
+
+    </indexitem>
+   </indexitem>
+   <indexitem text="O.S. Sections List " target="package.jmri.jmrit.ctc.CTC_osList"/>
+
+   <indexitem text="Edit Buttons " target="package.jmri.jmrit.ctc.CTC_frmCB">
+    <indexitem text="Code button " target="package.jmri.jmrit.ctc.CTC_frmCB"/>
+
+    <indexitem text="Signal direction indicators " target="package.jmri.jmrit.ctc.CTC_frmSIDI"/>
+
+    <indexitem text="Signal direction lever " target="package.jmri.jmrit.ctc.CTC_frmSIDL"/>
+
+    <indexitem text="Switch direction indicators " target="package.jmri.jmrit.ctc.CTC_frmSWDI"/>
+
+    <indexitem text="Switch direction lever " target="package.jmri.jmrit.ctc.CTC_frmSWDL"/>
+
+    <indexitem text="Call On " target="package.jmri.jmrit.ctc.CTC_frmCO"/>
+
+    <indexitem text="Traffic locking " target="package.jmri.jmrit.ctc.CTC_frmTRL"/>
+
+    <indexitem text="Turnout locking " target="package.jmri.jmrit.ctc.CTC_frmTUL"/>
+
+    <indexitem text="Indication locking " target="package.jmri.jmrit.ctc.CTC_frmIL"/>
+
+   </indexitem>
+  </indexitem>
+  <indexitem text="Files " target="package.jmri.jmrit.ctc.CTC_ctcFiles"/>
+
+  <indexitem text="CTCMain " target="package.jmri.jmrit.ctc.CTC_ctcMain"/>
+
+  <indexitem text="Definitions " target="package.jmri.jmrit.ctc.CTC_ctcDefinitions"/>
+
+ </indexitem>
  <indexitem text="Debug Menu " target="package.jmri.jmrit.DebugMenu"/>
 
  <indexitem text="DecoderPro " target="html.apps.DecoderPro.index">

diff --git a/help/en/JmriHelp_enTOC.xml b/help/en/JmriHelp_enTOC.xml
@@ -277,6 +277,66 @@
   </tocitem>
   <tocitem text="Consisting Tool " target="html.tools.consisttool.ConsistTool"/>
 
+  <tocitem text="CTC " target="package.jmri.jmrit.ctc.CTC">
+   <tocitem text="CTCEditor " target="package.jmri.jmrit.ctc.CTC_editor">
+    <tocitem text="Menus " target="package.jmri.jmrit.ctc.CTC_menuFile">
+     <tocitem text="File menu " target="package.jmri.jmrit.ctc.CTC_menuFile">
+      <tocitem text="New " target="package.jmri.jmrit.ctc.CTC_menuFile"/>
+
+      <tocitem text="Save " target="package.jmri.jmrit.ctc.CTC_menuFile"/>
+
+      <tocitem text="Exit without saving " target="package.jmri.jmrit.ctc.CTC_menuFile"/>
+
+     </tocitem>
+     <tocitem text="Edit menu " target="package.jmri.jmrit.ctc.CTC_menuEditFind">
+      <tocitem text="Find and Replace... " target="package.jmri.jmrit.ctc.CTC_menuEditFind"/>
+
+      <tocitem text="Fix Error(s)... " target="package.jmri.jmrit.ctc.CTC_menuEditFix"/>
+
+     </tocitem>
+     <tocitem text="Configure menu " target="package.jmri.jmrit.ctc.CTC_menuCfgDeb">
+      <tocitem text="Debugging " target="package.jmri.jmrit.ctc.CTC_menuCfgDeb"/>
+
+      <tocitem text="Defaults " target="package.jmri.jmrit.ctc.CTC_menuCfgDef"/>
+
+      <tocitem text="Fleeting " target="package.jmri.jmrit.ctc.CTC_menuCfgFlt"/>
+
+      <tocitem text="Patterns " target="package.jmri.jmrit.ctc.CTC_menuCfgPat"/>
+
+      <tocitem text="GUI Design " target="package.jmri.jmrit.ctc.CTC_menuCfgGui"/>
+
+     </tocitem>
+    </tocitem>
+    <tocitem text="O.S. Sections List " target="package.jmri.jmrit.ctc.CTC_osList"/>
+
+    <tocitem text="Edit Buttons " target="package.jmri.jmrit.ctc.CTC_frmCB">
+     <tocitem text="Code button " target="package.jmri.jmrit.ctc.CTC_frmCB"/>
+
+     <tocitem text="Signal direction indicators " target="package.jmri.jmrit.ctc.CTC_frmSIDI"/>
+
+     <tocitem text="Signal direction lever " target="package.jmri.jmrit.ctc.CTC_frmSIDL"/>
+
+     <tocitem text="Switch direction indicators " target="package.jmri.jmrit.ctc.CTC_frmSWDI"/>
+
+     <tocitem text="Switch direction lever " target="package.jmri.jmrit.ctc.CTC_frmSWDL"/>
+
+     <tocitem text="Call On " target="package.jmri.jmrit.ctc.CTC_frmCO"/>
+
+     <tocitem text="Traffic locking " target="package.jmri.jmrit.ctc.CTC_frmTRL"/>
+
+     <tocitem text="Turnout locking " target="package.jmri.jmrit.ctc.CTC_frmTUL"/>
+
+     <tocitem text="Indication locking " target="package.jmri.jmrit.ctc.CTC_frmIL"/>
+
+    </tocitem>
+   </tocitem>
+   <tocitem text="Files " target="package.jmri.jmrit.ctc.CTC_ctcFiles"/>
+
+   <tocitem text="CTCMain " target="package.jmri.jmrit.ctc.CTC_ctcMain"/>
+
+   <tocitem text="Definitions " target="package.jmri.jmrit.ctc.CTC_ctcDefinitions"/>
+
+  </tocitem>
   <tocitem text="Fast Clocks " target="html.tools.fastclock.index">
    <tocitem text="Introduction " target="html.tools.fastclock.index"/>
 
@@ -420,18 +480,24 @@
 
   </tocitem>
   <tocitem text="Warrants " target="package.jmri.jmrit.logix.Warrant">
-   <tocitem text="The Warrant List " target="package.jmri.jmrit.logix.WarrantTable"/>
+   <tocitem text="Warrants Introduction " target="package.jmri.jmrit.logix.Warrant"/>
 
    <tocitem text="Creating and Editing Warrants " target="package.jmri.jmrit.logix.CreateEditWarrant"/>
 
    <tocitem text="NXWarrants " target="package.jmri.jmrit.logix.NXWarrant"/>
 
+   <tocitem text="SCWarrants " target="package.jmri.jmrit.logix.SCWarrant"/>
+
+   <tocitem text="The Warrant List " target="package.jmri.jmrit.logix.WarrantTable"/>
+
    <tocitem text="When Warrant Speeds Are Modified " target="package.jmri.jmrit.logix.SpeedChanges"/>
 
    <tocitem text="The Occupancy Block Tables " target="package.jmri.jmrit.logix.OBlockTable"/>
 
    <tocitem text="Creating and Editing OBlocks, Portals and OPaths " target="package.jmri.jmrit.logix.OBlockEdit"/>
 
+   <tocitem text="Circuit Builder " target="package.jmri.jmrit.display.CircuitBuilder"/>
+
   </tocitem>
   <tocitem text="USS CTC Tools " target="html.tools.uss.index">
    <tocitem text="OS Indicator " target="package.jmri.jmrit.ussctc.OsIndicatorFrame"/>

diff --git a/help/en/Map.jhm b/help/en/Map.jhm
@@ -42,6 +42,8 @@
 
 <mapID target="releasenotes.current-draft-note" url="releasenotes/current-draft-note.shtml"/>
 
+<mapID target="package.jmri.jmrit.ctc.CTC_editor" url="package/jmri/jmrit/ctc/CTC.shtml#editor"/>
+
 <mapID target="manual.DecoderPro.Main_LocoNet_Packet" url="manual/DecoderPro/Main_LocoNet.shtml#Packet"/>
 
 <mapID target="package.jmri.jmrix.loconet.duplexgroup.DuplexGroupTabbedPanel_Starting" url="package/jmri/jmrix/loconet/duplexgroup/DuplexGroupTabbedPanel.shtml#Starting"/>
@@ -102,6 +104,8 @@
 
 <mapID target="package.jmri.jmrit.beantable.SignalMastRepeater" url="package/jmri/jmrit/beantable/SignalMastRepeater.shtml"/>
 
+<mapID target="package.jmri.jmrit.ctc.CTC_menuCfgPat" url="package/jmri/jmrit/ctc/CTC.shtml#menuCfgPat"/>
+
 <mapID target="manual.DecoderPro.Main_LocoNet_Top" url="manual/DecoderPro/Main_LocoNet.shtml#Top"/>
 
 <mapID target="package.jmri.jmrix.loconet.locomon.LocoMonFrame" url="package/jmri/jmrix/loconet/locomon/LocoMonFrame.shtml"/>
@@ -178,6 +182,8 @@
 
 <mapID target="package.jmri.jmrit.operations.Operations_Schedules" url="package/jmri/jmrit/operations/Operations.shtml#Schedules"/>
 
+<mapID target="package.jmri.jmrit.ctc.CTC_menuCfgGui" url="package/jmri/jmrit/ctc/CTC.shtml#menuCfgGui"/>
+
 <mapID target="html.hardware.sprog.SPROG_hardware" url="html/hardware/sprog/SPROG.shtml#hardware"/>
 
 <mapID target="package.jmri.jmrit.operations.Operations_BuildingTrains" url="package/jmri/jmrit/operations/Operations.shtml#BuildingTrains"/>
@@ -1146,6 +1152,8 @@
 
 <mapID target="package.jmri.jmrit.beantable.LRouteAddEdit" url="package/jmri/jmrit/beantable/LRouteAddEdit.shtml"/>
 
+<mapID target="package.jmri.jmrit.ctc.CTC_ctcFiles" url="package/jmri/jmrit/ctc/CTC.shtml#ctcFiles"/>
+
 <mapID target="manual.DecoderPro.Basic_Mode" url="manual/DecoderPro/Basic_Mode.shtml"/>
 
 <mapID target="manual.DecoderPro3.Main_RPS_DebuggerWin" url="manual/DecoderPro3/Main_RPS.shtml#DebuggerWin"/>
@@ -1764,6 +1772,8 @@
 
 <mapID target="html.tools.signaling.SignalHeads_edit" url="html/tools/signaling/SignalHeads.shtml#edit"/>
 
+<mapID target="package.jmri.jmrit.ctc.CTC_osList" url="package/jmri/jmrit/ctc/CTC.shtml#osList"/>
+
 <mapID target="manual.DecoderPro3.Start_Preferences_WiThrottle" url="manual/DecoderPro3/Start_Preferences.shtml#WiThrottle"/>
 
 <mapID target="package.jmri.jmrit.dispatcher.Dispatcher_glossary" url="package/jmri/jmrit/dispatcher/Dispatcher.shtml#glossary"/>
@@ -1794,6 +1804,8 @@
 
 <mapID target="package.jmri.jmrit.beantable.MemoryTable" url="package/jmri/jmrit/beantable/MemoryTable.shtml"/>
 
+<mapID target="package.jmri.jmrit.ctc.CTC_ctcMain" url="package/jmri/jmrit/ctc/CTC.shtml#ctcMain"/>
+
 <mapID target="html.doc.Technical.JUnit_Coverage" url="html/doc/Technical/JUnit.shtml#Coverage"/>
 
 <mapID target="html.hardware.XPressNet.LI101Configurationtool" url="html/hardware/XPressNet/LI101Configurationtool.shtml"/>
@@ -2136,8 +2148,12 @@
 
 <mapID target="manual.DecoderPro.Main_NCE_EditMacro" url="manual/DecoderPro/Main_NCE.shtml#EditMacro"/>
 
+<mapID target="package.jmri.jmrit.ctc.CTC_menuCfgDef" url="package/jmri/jmrit/ctc/CTC.shtml#menuCfgDef"/>
+
 <mapID target="html.doc.Technical.JUnit_Introduction" url="html/doc/Technical/JUnit.shtml#Introduction"/>
 
+<mapID target="package.jmri.jmrit.ctc.CTC_menuCfgDeb" url="package/jmri/jmrit/ctc/CTC.shtml#menuCfgDeb"/>
+
 <mapID target="manual.DecoderPro.VSD_File_and_Config_xy" url="manual/DecoderPro/VSD_File_and_Config.shtml#xy"/>
 
 <mapID target="manual.DecoderPro.Basic_BasicPane_EnterEditData" url="manual/DecoderPro/Basic_BasicPane.shtml#EnterEditData"/>
@@ -2404,6 +2420,8 @@
 
 <mapID target="html.hardware.tmcc.index" url="html/hardware/tmcc/index.shtml"/>
 
+<mapID target="package.jmri.jmrit.ctc.CTC_frmIL" url="package/jmri/jmrit/ctc/CTC.shtml#frmIL"/>
+
 <mapID target="manual.DecoderPro.Start_DCC" url="manual/DecoderPro/Start_DCC.shtml"/>
 
 <mapID target="package.jmri.jmrit.operations.Operations_TrainShowCarTypesServiced" url="package/jmri/jmrit/operations/Operations.shtml#TrainShowCarTypesServiced"/>
@@ -2520,6 +2538,8 @@
 
 <mapID target="package.jmri.jmrit.beantable.SectionAddEdit_editsection" url="package/jmri/jmrit/beantable/SectionAddEdit.shtml#editsection"/>
 
+<mapID target="package.jmri.jmrit.ctc.CTC_menuEditFind" url="package/jmri/jmrit/ctc/CTC.shtml#menuEditFind"/>
+
 <mapID target="html.tools.throttle.ThrottleToolBar" url="html/tools/throttle/ThrottleToolBar.shtml"/>
 
 <mapID target="package.jmri.jmrix.can.cbus.swing.console.CbusConsoleFrame_stats" url="package/jmri/jmrix/can/cbus/swing/console/CbusConsoleFrame.shtml#stats"/>
@@ -2682,6 +2702,8 @@
 
 <mapID target="package.jmri.jmrit.display.LayoutEditor" url="package/jmri/jmrit/display/LayoutEditor.shtml"/>
 
+<mapID target="package.jmri.jmrit.ctc.CTC_menuEditFix" url="package/jmri/jmrit/ctc/CTC.shtml#menuEditFix"/>
+
 <mapID target="html.hardware.loconet.Addressing_BXPA1Reporter" url="html/hardware/loconet/Addressing.shtml#BXPA1Reporter"/>
 
 <mapID target="manual.JMRI_OPS_UsersGuide.Ops_Trains_BuildOptions" url="manual/JMRI_OPS_UsersGuide/Ops_Trains_BuildOptions.shtml"/>
@@ -2734,6 +2756,8 @@
 
 <mapID target="package.jmri.jmrix.loconet.duplexgroup.DuplexGroupTabbedPanel_NameField" url="package/jmri/jmrix/loconet/duplexgroup/DuplexGroupTabbedPanel.shtml#NameField"/>
 
+<mapID target="package.jmri.jmrit.ctc.CTC_frmCB" url="package/jmri/jmrit/ctc/CTC.shtml#frmCB"/>
+
 <mapID target="package.jmri.jmrix.acela.nodeconfig.NodeConfigFrame" url="package/jmri/jmrix/acela/nodeconfig/NodeConfigFrame.shtml"/>
 
 <mapID target="html.setup.index_Top" url="html/setup/index.shtml#Top"/>
@@ -2750,6 +2774,8 @@
 
 <mapID target="html.tools.index" url="html/tools/index.shtml"/>
 
+<mapID target="package.jmri.jmrit.ctc.CTC_frmCO" url="package/jmri/jmrit/ctc/CTC.shtml#frmCO"/>
+
 <mapID target="manual.JMRI_OPS_UsersGuide.Ops_Settings_menubar" url="manual/JMRI_OPS_UsersGuide/Ops_Settings_menubar.shtml"/>
 
 <mapID target="manual.DecoderPro.Main_RPS_Receiver" url="manual/DecoderPro/Main_RPS.shtml#Receiver"/>
@@ -2840,6 +2866,8 @@
 
 <mapID target="html.setup.MigrateSystemPrefixes" url="html/setup/MigrateSystemPrefixes.shtml"/>
 
+<mapID target="package.jmri.jmrit.ctc.CTC_menuFile" url="package/jmri/jmrit/ctc/CTC.shtml#menuFile"/>
+
 <mapID target="package.jmri.jmrit.symbolicprog.tabbedframe.PaneProgFrame" url="package/jmri/jmrit/symbolicprog/tabbedframe/PaneProgFrame.shtml"/>
 
 <mapID target="html.hardware.nce.NCE_usblimitations" url="html/hardware/nce/NCE.shtml#usblimitations"/>
@@ -2904,6 +2932,8 @@
 
 <mapID target="package.jmri.jmrit.ussctc.CodeButtonFrame" url="package/jmri/jmrit/ussctc/CodeButtonFrame.shtml"/>
 
+<mapID target="package.jmri.jmrit.ctc.CTC_ctcDefinitions" url="package/jmri/jmrit/ctc/CTC.shtml#ctcDefinitions"/>
+
 <mapID target="package.jmri.jmrix.rps.reversealign.AlignmentPanel" url="package/jmri/jmrix/rps/reversealign/AlignmentPanel.shtml"/>
 
 <mapID target="html.tools.signaling.interlock.index" url="html/tools/signaling/interlock/index.shtml"/>
@@ -3136,6 +3166,8 @@
 
 <mapID target="html.doc.Technical.JUnit_Write4NewPackage" url="html/doc/Technical/JUnit.shtml#Write4NewPackage"/>
 
+<mapID target="package.jmri.jmrit.ctc.CTC_frmSIDI" url="package/jmri/jmrit/ctc/CTC.shtml#frmSIDI"/>
+
 <mapID target="manual.DecoderPro3.Comp_PrintData" url="manual/DecoderPro3/Comp_PrintData.shtml"/>
 
 <mapID target="html.tools.Logix_start" url="html/tools/Logix.shtml#start"/>
@@ -3146,6 +3178,8 @@
 
 <mapID target="html.hardware.dccpp.index_tools" url="html/hardware/dccpp/index.shtml#tools"/>
 
+<mapID target="package.jmri.jmrit.ctc.CTC_frmSIDL" url="package/jmri/jmrit/ctc/CTC.shtml#frmSIDL"/>
+
 <mapID target="html.hardware.raildriver.index_tools" url="html/hardware/raildriver/index.shtml#tools"/>
 
 <mapID target="manual.DecoderPro3.dp3_settings_rosterGroups_DupRosterGroup" url="manual/DecoderPro3/dp3_settings_rosterGroups.shtml#DupRosterGroup"/>
@@ -3240,6 +3274,8 @@
 
 <mapID target="package.jmri.jmrit.dispatcher.Dispatcher_autorequire" url="package/jmri/jmrit/dispatcher/Dispatcher.shtml#autorequire"/>
 
+<mapID target="package.jmri.jmrit.ctc.CTC" url="package/jmri/jmrit/ctc/CTC.shtml"/>
+
 <mapID target="manual.DecoderPro.Main_XpressNet_LV100CM" url="manual/DecoderPro/Main_XpressNet.shtml#LV100CM"/>
 
 <mapID target="package.jmri.jmrit.operations.Operations_RestrictingTrackToCertainTrains" url="package/jmri/jmrit/operations/Operations.shtml#RestrictingTrackToCertainTrains"/>
@@ -3414,6 +3450,8 @@
 
 <mapID target="html.apps.DecoderPro.Programmer_id" url="html/apps/DecoderPro/Programmer.shtml#id"/>
 
+<mapID target="package.jmri.jmrit.ctc.CTC_frmTRL" url="package/jmri/jmrit/ctc/CTC.shtml#frmTRL"/>
+
 <mapID target="html.tools.signaling.index_scripting" url="html/tools/signaling/index.shtml#scripting"/>
 
 <mapID target="html.hardware.loconet.DCS52" url="html/hardware/loconet/DCS52.shtml"/>
@@ -3512,6 +3550,8 @@
 
 <mapID target="package.jmri.jmrix.acela.acelamon.SerialMonFrame" url="package/jmri/jmrix/acela/acelamon/SerialMonFrame.shtml"/>
 
+<mapID target="package.jmri.jmrit.ctc.CTC_frmTUL" url="package/jmri/jmrit/ctc/CTC.shtml#frmTUL"/>
+
 <mapID target="html.tools.scripting.Start" url="html/tools/scripting/Start.shtml"/>
 
 <mapID target="manual.JMRI_OPS_UsersGuide.Main_Main_Top" url="manual/JMRI_OPS_UsersGuide/Main_Main.shtml#Top"/>
@@ -4048,10 +4088,14 @@
 
 <mapID target="html.hardware.dccpp.index_hardware" url="html/hardware/dccpp/index.shtml#hardware"/>
 
+<mapID target="package.jmri.jmrit.ctc.CTC_frmSWDI" url="package/jmri/jmrit/ctc/CTC.shtml#frmSWDI"/>
+
 <mapID target="manual.DecoderPro.Main_XpressNet" url="manual/DecoderPro/Main_XpressNet.shtml"/>
 
 <mapID target="package.jmri.jmrit.dispatcher.Dispatcher_transits" url="package/jmri/jmrit/dispatcher/Dispatcher.shtml#transits"/>
 
+<mapID target="package.jmri.jmrit.ctc.CTC_frmSWDL" url="package/jmri/jmrit/ctc/CTC.shtml#frmSWDL"/>
+
 <mapID target="html.tools.throttle.ThrottleChapter1" url="html/tools/throttle/ThrottleChapter1.shtml"/>
 
 <mapID target="manual.DecoderPro3.index_index" url="manual/DecoderPro3/index.shtml#index"/>
@@ -4112,6 +4156,8 @@
 
 <mapID target="package.jmri.jmrix.mrc.swing.monitor.MrcMonPanel" url="package/jmri/jmrix/mrc/swing/monitor/MrcMonPanel.shtml"/>
 
+<mapID target="package.jmri.jmrit.ctc.CTC_menuCfgFlt" url="package/jmri/jmrit/ctc/CTC.shtml#menuCfgFlt"/>
+
 <mapID target="package.jmri.jmrit.vsdecoder.VSDecoderFrame" url="package/jmri/jmrit/vsdecoder/VSDecoderFrame.shtml"/>
 
 <mapID target="manual.DecoderPro3.Main_LocoNet_LocoIOProgrammer" url="manual/DecoderPro3/Main_LocoNet.shtml#LocoIOProgrammer"/>

diff --git a/help/en/html/hardware/can/cbus/index.shtml b/help/en/html/hardware/can/cbus/index.shtml
@@ -120,10 +120,14 @@
         Node Manager</a> - Node Table and node configuration tools.
 
         <ul>
-        <li><a href="../../../../package/jmri/jmrix/can/cbus/swing/nodeconfig/NodeConfigToolPane.shtml#variables">Node Variables</a></li>
-        <li><a href="../../../../package/jmri/jmrix/can/cbus/swing/nodeconfig/NodeConfigToolPane.shtml#events">Node Events</a></li>
-        <li><a href="../../../../package/jmri/jmrix/can/cbus/swing/nodeconfig/NodeConfigToolPane.shtml#nodenumber">Node Numbers</a></li>
-        <li><a href="../../../../package/jmri/jmrix/can/cbus/swing/nodeconfig/NodeConfigToolPane.shtml#fcuimport">Restore node from MERG FCU xml file</a></li>
+        <li><a href="../../../../package/jmri/jmrix/can/cbus/swing/nodeconfig/NodeConfigToolPane.shtml#variables"
+            >Node Variables</a></li>
+        <li><a href="../../../../package/jmri/jmrix/can/cbus/swing/nodeconfig/NodeConfigToolPane.shtml#events"
+            >Node Events</a></li>
+        <li><a href="../../../../package/jmri/jmrix/can/cbus/swing/nodeconfig/NodeConfigToolPane.shtml#nodenumber"
+            >Node Numbers</a></li>
+        <li><a href="../../../../package/jmri/jmrix/can/cbus/swing/nodeconfig/NodeConfigToolPane.shtml#fcuimport"
+            >Import MERG FCU xml file - Restore NV's and Events, Import CBUS event names</a></li>
         </ul>
         </li>