From 3df3c8cdf2e54f5c75ec36d610025cc93c052960 Mon Sep 17 00:00:00 2001 From: Egbert Broerse Date: Wed, 3 Mar 2021 23:47:58 +0100 Subject: [PATCH 1/8] all sidebars js, html5 type --- help/en/Acknowledgements.shtml | 22 ++++-------- help/en/Map.jhm | 4 +-- help/en/README | 4 +-- help/en/TemplateBar.shtml | 35 ------------------- help/en/TemplatePlain.shtml | 34 ------------------ help/en/glossary/index.shtml | 16 ++++----- help/en/html/Sidebar.shtml | 2 ++ help/en/html/SidebarCompact.shtml | 6 ++-- help/en/html/SidebarNew.shtml | 2 ++ help/en/html/apps/DecoderPro/Sidebar.shtml | 3 +- help/en/html/apps/DispatcherPro/Sidebar.shtml | 5 +-- help/en/html/apps/PanelPro/Sidebar.shtml | 3 +- help/en/html/apps/Sidebar.shtml | 2 ++ help/en/html/apps/SidebarNew.shtml | 2 ++ help/en/html/apps/SoundPro/Sidebar.shtml | 3 +- help/en/html/doc/Technical/Help.shtml | 4 +-- help/en/html/doc/Technical/Sidebar.shtml | 3 +- help/en/html/hardware/Sidebar.shtml | 3 +- help/en/html/hardware/SidebarNew.shtml | 3 +- help/en/html/hardware/XBee/Sidebar.shtml | 6 ++-- help/en/html/hardware/XPressNet/Sidebar.shtml | 6 ++-- help/en/html/hardware/arduino/Sidebar.shtml | 3 +- help/en/html/hardware/can/Sidebar.shtml | 3 +- help/en/html/hardware/cmri/Sidebar.shtml | 3 +- help/en/html/hardware/dccpp/Sidebar.shtml | 3 +- help/en/html/hardware/grapevine/Sidebar.shtml | 3 +- help/en/html/hardware/loconet/Sidebar.shtml | 3 +- help/en/html/hardware/merg/Sidebar.shtml | 5 +-- help/en/html/hardware/openlcb/Sidebar.shtml | 6 ++-- help/en/html/hardware/powerline/Sidebar.shtml | 6 ++-- .../en/html/hardware/raildriver/Sidebar.shtml | 6 ++-- help/en/html/hardware/roco/z21/Sidebar.shtml | 6 ++-- help/en/html/hardware/rps/Sidebar.shtml | 6 ++-- help/en/html/hardware/sproggen5/Sidebar.shtml | 5 +-- help/en/html/setup/Sidebar.shtml | 3 +- help/en/html/tools/Sidebar.shtml | 3 +- help/en/html/tools/automation/Sidebar.shtml | 3 +- help/en/html/tools/consisttool/Sidebar.shtml | 3 +- help/en/html/tools/programmer/Sidebar.shtml | 1 + help/en/html/tools/scripting/Sidebar.shtml | 5 +-- help/en/html/tools/signaling/Sidebar.shtml | 5 +-- help/en/html/tools/speedometer/Sidebar.shtml | 5 +-- help/en/html/tools/throttle/Sidebar.shtml | 5 +-- help/en/html/tools/tracker/Sidebar.shtml | 1 + help/en/html/tools/uss/Sidebar.shtml | 1 + help/en/html/web/Sidebar.shtml | 2 ++ help/en/index.shtml | 21 ++++------- help/en/manual/DecoderPro/Sidebar.shtml | 5 ++- help/en/manual/DecoderPro3/Sidebar.shtml | 5 ++- .../manual/JMRI_OPS_UsersGuide/Sidebar.shtml | 2 ++ help/en/manual/Sidebar.shtml | 2 ++ help/en/template-no-sidebar.shtml | 27 ++++++++++++++ help/en/template-sidebar.shtml | 30 ++++++++++++++++ help/en/tocheader | 2 +- help/fr/Map.jhm | 4 +-- help/fr/README | 4 +-- help/fr/html/doc/Technical/Help.shtml | 2 +- 57 files changed, 188 insertions(+), 179 deletions(-) delete mode 100644 help/en/TemplateBar.shtml delete mode 100644 help/en/TemplatePlain.shtml create mode 100644 help/en/template-no-sidebar.shtml create mode 100644 help/en/template-sidebar.shtml diff --git a/help/en/Acknowledgements.shtml b/help/en/Acknowledgements.shtml index e3a334a4abde..55b65bff0ce8 100644 --- a/help/en/Acknowledgements.shtml +++ b/help/en/Acknowledgements.shtml @@ -1,24 +1,12 @@ - - + - - + JMRI: Acknowledgements - - - - - - - + "java model railroad JMRI decoderpro panelpro cmri loconet lenz nce easydcc dcc nmra"> + @@ -27,6 +15,7 @@

Acknowledgements: People who've contributed to JMRI

+

A number of people have contributed their effort to JMRI. They are listed below in alphabetical order and deserve our thanks.
@@ -1266,5 +1255,6 @@

+ diff --git a/help/en/Map.jhm b/help/en/Map.jhm index 5ac66d85451b..3d7f6944240d 100644 --- a/help/en/Map.jhm +++ b/help/en/Map.jhm @@ -4076,7 +4076,7 @@ - + @@ -4992,4 +4992,4 @@ - \ No newline at end of file + diff --git a/help/en/README b/help/en/README index 721a6f8950e2..22496a139135 100644 --- a/help/en/README +++ b/help/en/README @@ -8,8 +8,8 @@ There are several content subtrees: html - a help-customized version of the web site package - package-sensitive help, organized by Java package -The TemplatePlain.shtml and TemplateBar.shtml files are basic templates -to copy when making a new file. +The template-no-sidebar.shtml and template-sidebar.shtml files +are basic templates to copy when making a new file. For more information on maintaining the various metadata in the help system, please see: diff --git a/help/en/TemplateBar.shtml b/help/en/TemplateBar.shtml deleted file mode 100644 index f6e4f1d008bf..000000000000 --- a/help/en/TemplateBar.shtml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - JMRI: ???Page Title - - - - - - - - - - - -
- -
- -

JMRI: Page Title???

- Content???? This file shows the - top and bottom matter for a page with a side menu - bar (on the web), which comes from the "Sidebar" - file in the same directory. - - -
-
- - diff --git a/help/en/TemplatePlain.shtml b/help/en/TemplatePlain.shtml deleted file mode 100644 index 3453a9c82d83..000000000000 --- a/help/en/TemplatePlain.shtml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - JMRI: ???Page Title - - - - - - - - - - - -
-
- -

JMRI: Page Title???

Content???? This file shows the - top and bottom matter for a plain page, without a side menu - (on the web). -
-
- - diff --git a/help/en/glossary/index.shtml b/help/en/glossary/index.shtml index 13571ff2724b..f2c33e85ab2f 100644 --- a/help/en/glossary/index.shtml +++ b/help/en/glossary/index.shtml @@ -1,7 +1,6 @@ - - + + @@ -11,13 +10,7 @@ - - - - - - - + @@ -54,6 +47,7 @@ table.sortable th {

Click a heading to sort the list up or down.

+
@@ -2369,9 +2363,11 @@ table.sortable th {
+
+ diff --git a/help/en/html/Sidebar.shtml b/help/en/html/Sidebar.shtml index 59f769be107a..9702514a75c7 100644 --- a/help/en/html/Sidebar.shtml +++ b/help/en/html/Sidebar.shtml @@ -22,4 +22,6 @@ + + diff --git a/help/en/html/SidebarCompact.shtml b/help/en/html/SidebarCompact.shtml index 16cfb5179fe6..bff807411a07 100644 --- a/help/en/html/SidebarCompact.shtml +++ b/help/en/html/SidebarCompact.shtml @@ -27,7 +27,7 @@ - - - + + + diff --git a/help/en/html/SidebarNew.shtml b/help/en/html/SidebarNew.shtml index 6a8c168ee250..ce058ba692f5 100644 --- a/help/en/html/SidebarNew.shtml +++ b/help/en/html/SidebarNew.shtml @@ -24,6 +24,8 @@ + + diff --git a/help/en/html/apps/DecoderPro/Sidebar.shtml b/help/en/html/apps/DecoderPro/Sidebar.shtml index 31fbaff4584f..aee1410e5487 100644 --- a/help/en/html/apps/DecoderPro/Sidebar.shtml +++ b/help/en/html/apps/DecoderPro/Sidebar.shtml @@ -28,6 +28,7 @@ - + + diff --git a/help/en/html/apps/DispatcherPro/Sidebar.shtml b/help/en/html/apps/DispatcherPro/Sidebar.shtml index a3ee49da8dea..f18aac826ce7 100644 --- a/help/en/html/apps/DispatcherPro/Sidebar.shtml +++ b/help/en/html/apps/DispatcherPro/Sidebar.shtml @@ -1,4 +1,4 @@ -!-- Sidebar.shtml --> + @@ -28,5 +28,6 @@ - + + diff --git a/help/en/html/apps/PanelPro/Sidebar.shtml b/help/en/html/apps/PanelPro/Sidebar.shtml index 24fdfaae9750..aa7b68a9fb14 100644 --- a/help/en/html/apps/PanelPro/Sidebar.shtml +++ b/help/en/html/apps/PanelPro/Sidebar.shtml @@ -28,5 +28,6 @@ - + + diff --git a/help/en/html/apps/Sidebar.shtml b/help/en/html/apps/Sidebar.shtml index 8a0b42fc80ab..923a4cb7fdcc 100644 --- a/help/en/html/apps/Sidebar.shtml +++ b/help/en/html/apps/Sidebar.shtml @@ -21,4 +21,6 @@ + + diff --git a/help/en/html/apps/SidebarNew.shtml b/help/en/html/apps/SidebarNew.shtml index 3d36835fa5eb..b2194bde1ac3 100644 --- a/help/en/html/apps/SidebarNew.shtml +++ b/help/en/html/apps/SidebarNew.shtml @@ -21,4 +21,6 @@ + + diff --git a/help/en/html/apps/SoundPro/Sidebar.shtml b/help/en/html/apps/SoundPro/Sidebar.shtml index 31fbaff4584f..aee1410e5487 100644 --- a/help/en/html/apps/SoundPro/Sidebar.shtml +++ b/help/en/html/apps/SoundPro/Sidebar.shtml @@ -28,6 +28,7 @@ - + + diff --git a/help/en/html/doc/Technical/Help.shtml b/help/en/html/doc/Technical/Help.shtml index 117018a1c61b..30fa5fa4e10a 100644 --- a/help/en/html/doc/Technical/Help.shtml +++ b/help/en/html/doc/Technical/Help.shtml @@ -119,8 +119,8 @@ "https://httpd.apache.org/docs/1.3/howto/ssi.html">server-side includes. -
  • When you create a new page, start with a copy of either the help/en/TemplateBar.shtml - or help/en/TemplatePlain.shtml template file, depending on whether or not you want to include +
  • When you create a new page, start with a copy of either the help/en/template-sidebar.shtml + or help/en/template-no-sidebar.shtml template file, depending on whether or not you want to include a "sidebar" (via a file named Sidebar.shtml). This template will put the proper top and bottom matter in place to get the page properly displayed.
    • diff --git a/help/en/html/doc/Technical/Sidebar.shtml b/help/en/html/doc/Technical/Sidebar.shtml index 010ee84cfba5..6e03d1bac7d5 100644 --- a/help/en/html/doc/Technical/Sidebar.shtml +++ b/help/en/html/doc/Technical/Sidebar.shtml @@ -115,5 +115,6 @@ - + + diff --git a/help/en/html/hardware/Sidebar.shtml b/help/en/html/hardware/Sidebar.shtml index c5a8651835ed..82ed5c27934e 100644 --- a/help/en/html/hardware/Sidebar.shtml +++ b/help/en/html/hardware/Sidebar.shtml @@ -19,5 +19,6 @@ - + + diff --git a/help/en/html/hardware/SidebarNew.shtml b/help/en/html/hardware/SidebarNew.shtml index 7fdd204a138a..938de8892a2d 100644 --- a/help/en/html/hardware/SidebarNew.shtml +++ b/help/en/html/hardware/SidebarNew.shtml @@ -19,5 +19,6 @@ - + + diff --git a/help/en/html/hardware/XBee/Sidebar.shtml b/help/en/html/hardware/XBee/Sidebar.shtml index 49f2e9de8096..cdff2fdfee04 100644 --- a/help/en/html/hardware/XBee/Sidebar.shtml +++ b/help/en/html/hardware/XBee/Sidebar.shtml @@ -21,7 +21,7 @@ - - - + + + diff --git a/help/en/html/hardware/XPressNet/Sidebar.shtml b/help/en/html/hardware/XPressNet/Sidebar.shtml index 49f2e9de8096..cdff2fdfee04 100644 --- a/help/en/html/hardware/XPressNet/Sidebar.shtml +++ b/help/en/html/hardware/XPressNet/Sidebar.shtml @@ -21,7 +21,7 @@ - - - + + + diff --git a/help/en/html/hardware/arduino/Sidebar.shtml b/help/en/html/hardware/arduino/Sidebar.shtml index ca8cf42a6d7b..6cb6fed6909e 100644 --- a/help/en/html/hardware/arduino/Sidebar.shtml +++ b/help/en/html/hardware/arduino/Sidebar.shtml @@ -22,5 +22,6 @@ - + + diff --git a/help/en/html/hardware/can/Sidebar.shtml b/help/en/html/hardware/can/Sidebar.shtml index ca8cf42a6d7b..5c52a14fcfe6 100644 --- a/help/en/html/hardware/can/Sidebar.shtml +++ b/help/en/html/hardware/can/Sidebar.shtml @@ -22,5 +22,6 @@ - + + diff --git a/help/en/html/hardware/cmri/Sidebar.shtml b/help/en/html/hardware/cmri/Sidebar.shtml index df0e5881b014..c037c8543f47 100644 --- a/help/en/html/hardware/cmri/Sidebar.shtml +++ b/help/en/html/hardware/cmri/Sidebar.shtml @@ -22,5 +22,6 @@ - + + diff --git a/help/en/html/hardware/dccpp/Sidebar.shtml b/help/en/html/hardware/dccpp/Sidebar.shtml index b96e17330913..b1cd6c83d283 100644 --- a/help/en/html/hardware/dccpp/Sidebar.shtml +++ b/help/en/html/hardware/dccpp/Sidebar.shtml @@ -27,5 +27,6 @@ - + + diff --git a/help/en/html/hardware/grapevine/Sidebar.shtml b/help/en/html/hardware/grapevine/Sidebar.shtml index 69f2e313d437..af0557b209c6 100644 --- a/help/en/html/hardware/grapevine/Sidebar.shtml +++ b/help/en/html/hardware/grapevine/Sidebar.shtml @@ -22,5 +22,6 @@ - + + diff --git a/help/en/html/hardware/loconet/Sidebar.shtml b/help/en/html/hardware/loconet/Sidebar.shtml index 69f2e313d437..af0557b209c6 100644 --- a/help/en/html/hardware/loconet/Sidebar.shtml +++ b/help/en/html/hardware/loconet/Sidebar.shtml @@ -22,5 +22,6 @@ - + + diff --git a/help/en/html/hardware/merg/Sidebar.shtml b/help/en/html/hardware/merg/Sidebar.shtml index 5929beb0aeee..c5d36de53538 100644 --- a/help/en/html/hardware/merg/Sidebar.shtml +++ b/help/en/html/hardware/merg/Sidebar.shtml @@ -27,6 +27,7 @@ - - + + + diff --git a/help/en/html/hardware/openlcb/Sidebar.shtml b/help/en/html/hardware/openlcb/Sidebar.shtml index de1807d420ed..31ca0a7afeca 100644 --- a/help/en/html/hardware/openlcb/Sidebar.shtml +++ b/help/en/html/hardware/openlcb/Sidebar.shtml @@ -21,7 +21,7 @@ - - - + + + diff --git a/help/en/html/hardware/powerline/Sidebar.shtml b/help/en/html/hardware/powerline/Sidebar.shtml index 49f2e9de8096..27d345771032 100644 --- a/help/en/html/hardware/powerline/Sidebar.shtml +++ b/help/en/html/hardware/powerline/Sidebar.shtml @@ -21,7 +21,7 @@ - - - + + + diff --git a/help/en/html/hardware/raildriver/Sidebar.shtml b/help/en/html/hardware/raildriver/Sidebar.shtml index df34c9334755..1d5e8bc99745 100644 --- a/help/en/html/hardware/raildriver/Sidebar.shtml +++ b/help/en/html/hardware/raildriver/Sidebar.shtml @@ -20,7 +20,7 @@ - - - + + + diff --git a/help/en/html/hardware/roco/z21/Sidebar.shtml b/help/en/html/hardware/roco/z21/Sidebar.shtml index 771dbcf2dc91..8394df368f91 100644 --- a/help/en/html/hardware/roco/z21/Sidebar.shtml +++ b/help/en/html/hardware/roco/z21/Sidebar.shtml @@ -21,7 +21,7 @@ - - - + + + diff --git a/help/en/html/hardware/rps/Sidebar.shtml b/help/en/html/hardware/rps/Sidebar.shtml index 49f2e9de8096..cdff2fdfee04 100644 --- a/help/en/html/hardware/rps/Sidebar.shtml +++ b/help/en/html/hardware/rps/Sidebar.shtml @@ -21,7 +21,7 @@ - - - + + + diff --git a/help/en/html/hardware/sproggen5/Sidebar.shtml b/help/en/html/hardware/sproggen5/Sidebar.shtml index b14cd3c38bbc..1a58c171fe62 100644 --- a/help/en/html/hardware/sproggen5/Sidebar.shtml +++ b/help/en/html/hardware/sproggen5/Sidebar.shtml @@ -27,6 +27,7 @@ - - + + + diff --git a/help/en/html/setup/Sidebar.shtml b/help/en/html/setup/Sidebar.shtml index 879e7427df3f..d22d7a539a15 100644 --- a/help/en/html/setup/Sidebar.shtml +++ b/help/en/html/setup/Sidebar.shtml @@ -33,5 +33,6 @@ - + + diff --git a/help/en/html/tools/Sidebar.shtml b/help/en/html/tools/Sidebar.shtml index a0931ecdf4c8..64b4cdb5adac 100644 --- a/help/en/html/tools/Sidebar.shtml +++ b/help/en/html/tools/Sidebar.shtml @@ -23,9 +23,10 @@ + + - diff --git a/help/en/html/tools/automation/Sidebar.shtml b/help/en/html/tools/automation/Sidebar.shtml index e78ed212d4ea..3e42d072cb51 100644 --- a/help/en/html/tools/automation/Sidebar.shtml +++ b/help/en/html/tools/automation/Sidebar.shtml @@ -21,5 +21,6 @@ - + + diff --git a/help/en/html/tools/consisttool/Sidebar.shtml b/help/en/html/tools/consisttool/Sidebar.shtml index 6a3ac4ea199a..a78150018aa9 100644 --- a/help/en/html/tools/consisttool/Sidebar.shtml +++ b/help/en/html/tools/consisttool/Sidebar.shtml @@ -1,7 +1,6 @@ - - + diff --git a/help/en/html/tools/programmer/Sidebar.shtml b/help/en/html/tools/programmer/Sidebar.shtml index 5193e927ff78..9466b58238c8 100644 --- a/help/en/html/tools/programmer/Sidebar.shtml +++ b/help/en/html/tools/programmer/Sidebar.shtml @@ -1,2 +1,3 @@ + diff --git a/help/en/html/tools/scripting/Sidebar.shtml b/help/en/html/tools/scripting/Sidebar.shtml index 624b5afab02a..bc629153d6e4 100644 --- a/help/en/html/tools/scripting/Sidebar.shtml +++ b/help/en/html/tools/scripting/Sidebar.shtml @@ -26,6 +26,7 @@ - - + + + diff --git a/help/en/html/tools/signaling/Sidebar.shtml b/help/en/html/tools/signaling/Sidebar.shtml index 1939c2e3a9b4..78e88bc6ccda 100644 --- a/help/en/html/tools/signaling/Sidebar.shtml +++ b/help/en/html/tools/signaling/Sidebar.shtml @@ -27,5 +27,6 @@ - - + + + diff --git a/help/en/html/tools/speedometer/Sidebar.shtml b/help/en/html/tools/speedometer/Sidebar.shtml index f72aa54dc28d..d5855d02baa3 100644 --- a/help/en/html/tools/speedometer/Sidebar.shtml +++ b/help/en/html/tools/speedometer/Sidebar.shtml @@ -26,5 +26,6 @@ - - + + + diff --git a/help/en/html/tools/throttle/Sidebar.shtml b/help/en/html/tools/throttle/Sidebar.shtml index 7b2af0886295..61a2de77de13 100644 --- a/help/en/html/tools/throttle/Sidebar.shtml +++ b/help/en/html/tools/throttle/Sidebar.shtml @@ -26,5 +26,6 @@ - - + + + diff --git a/help/en/html/tools/tracker/Sidebar.shtml b/help/en/html/tools/tracker/Sidebar.shtml index cfc68f3935b3..ed064820ea6a 100644 --- a/help/en/html/tools/tracker/Sidebar.shtml +++ b/help/en/html/tools/tracker/Sidebar.shtml @@ -1,2 +1,3 @@ + diff --git a/help/en/html/tools/uss/Sidebar.shtml b/help/en/html/tools/uss/Sidebar.shtml index cfc68f3935b3..ed064820ea6a 100644 --- a/help/en/html/tools/uss/Sidebar.shtml +++ b/help/en/html/tools/uss/Sidebar.shtml @@ -1,2 +1,3 @@ + diff --git a/help/en/html/web/Sidebar.shtml b/help/en/html/web/Sidebar.shtml index bfe8ac9dbcd0..14b42277b4bc 100644 --- a/help/en/html/web/Sidebar.shtml +++ b/help/en/html/web/Sidebar.shtml @@ -32,4 +32,6 @@ + + diff --git a/help/en/index.shtml b/help/en/index.shtml index 4e7d5e79efbf..19806303af1e 100644 --- a/help/en/index.shtml +++ b/help/en/index.shtml @@ -1,21 +1,10 @@ - + + - - - - JMRI Help - - - - - + + @@ -83,6 +72,8 @@ code or updating some Help files, we'd love to help you get started.

    + + diff --git a/help/en/manual/DecoderPro/Sidebar.shtml b/help/en/manual/DecoderPro/Sidebar.shtml index 991f8f000af7..fbb87a9358ce 100644 --- a/help/en/manual/DecoderPro/Sidebar.shtml +++ b/help/en/manual/DecoderPro/Sidebar.shtml @@ -76,5 +76,8 @@ - + + + + diff --git a/help/en/manual/DecoderPro3/Sidebar.shtml b/help/en/manual/DecoderPro3/Sidebar.shtml index 13bf878c2925..0ef755312c40 100644 --- a/help/en/manual/DecoderPro3/Sidebar.shtml +++ b/help/en/manual/DecoderPro3/Sidebar.shtml @@ -101,5 +101,8 @@ - + + + + diff --git a/help/en/manual/JMRI_OPS_UsersGuide/Sidebar.shtml b/help/en/manual/JMRI_OPS_UsersGuide/Sidebar.shtml index d300f915f1ba..3303dcace992 100644 --- a/help/en/manual/JMRI_OPS_UsersGuide/Sidebar.shtml +++ b/help/en/manual/JMRI_OPS_UsersGuide/Sidebar.shtml @@ -53,4 +53,6 @@ + + diff --git a/help/en/manual/Sidebar.shtml b/help/en/manual/Sidebar.shtml index 602ca321f2cd..f21b78357e70 100644 --- a/help/en/manual/Sidebar.shtml +++ b/help/en/manual/Sidebar.shtml @@ -92,4 +92,6 @@ + + diff --git a/help/en/template-no-sidebar.shtml b/help/en/template-no-sidebar.shtml new file mode 100644 index 000000000000..2730fe66c6ae --- /dev/null +++ b/help/en/template-no-sidebar.shtml @@ -0,0 +1,27 @@ + + + + + + JMRI: ... Title ... + + + + + + + + +
    +
    + +

    JMRI: Page Title???

    Content???? This file shows the + top and bottom matter for a plain page, without a side menu + (on the web). + + +
    +
    + + + diff --git a/help/en/template-sidebar.shtml b/help/en/template-sidebar.shtml new file mode 100644 index 000000000000..a04e272f6a50 --- /dev/null +++ b/help/en/template-sidebar.shtml @@ -0,0 +1,30 @@ + + + + + + JMRI: ... Title ... + + + + + + + + +
    + +
    + +

    JMRI: Page Title???

    + Content???? This file shows the + top and bottom matter for a page with a side menu + bar (on the web), which comes from the "Sidebar" + file in the same directory. + + +
    +
    + + + diff --git a/help/en/tocheader b/help/en/tocheader index b97aacd97031..046337f6dd0c 100644 --- a/help/en/tocheader +++ b/help/en/tocheader @@ -1,6 +1,6 @@ - +

    JMRI® Help: Table of Contents

    diff --git a/help/fr/Map.jhm b/help/fr/Map.jhm index b5240eb3d217..0b10a72901d2 100644 --- a/help/fr/Map.jhm +++ b/help/fr/Map.jhm @@ -1108,7 +1108,7 @@ - + @@ -1664,4 +1664,4 @@ - \ No newline at end of file + diff --git a/help/fr/README b/help/fr/README index 68902ff0864d..085045a0f85e 100644 --- a/help/fr/README +++ b/help/fr/README @@ -8,8 +8,8 @@ There are several content subtrees: html - a help-customized version of the web site package - package-sensitive help, organized by Java package -The TemplatePlain.shtml and TemplateBar.shtml files are basic templates -to copy when making a new file. +The template-no-sidebar.shtml and template-sidebar.shtml files +are basic templates to copy when making a new file. For more information on maintaining the various metadata in the help system, please see: diff --git a/help/fr/html/doc/Technical/Help.shtml b/help/fr/html/doc/Technical/Help.shtml index 732ffecc15a4..21409a2c2e81 100644 --- a/help/fr/html/doc/Technical/Help.shtml +++ b/help/fr/html/doc/Technical/Help.shtml @@ -119,7 +119,7 @@ utilisons un formulaire particulier pour les pages web dans le système d'ai les serveurs Web principaux recherchent les fichiers pour les serveurs inclus .
  • Lorsque vous créez une nouvelle page, commencez par une copie -soit du fichier modèle Aide/fr/TemplateBar.shtml ou de l'aide/fr/TemplatePlain.shtml +soit du fichier modèle Aide/fr/template-sidebar.shtml ou de l'aide/fr/template-no-sidebar.shtml , selon que vous souhaitez ou non inclure une "Sidebar" via un fichier du même nom. Cela mettra en haut et en bas la matière en place pour obtenir que la page s'affiche correctement. From 531dd44eb4b87eb061724a235dd0c0b7e1ba57a5 Mon Sep 17 00:00:00 2001 From: Egbert Broerse Date: Thu, 4 Mar 2021 00:18:45 +0100 Subject: [PATCH 2/8] html5+style up to incl docs --- .idea/checkstyle-idea.xml | 2 +- help/en/html/FAQ.shtml | 11 +- help/en/html/apps/DataManagement.shtml | 6 +- help/en/html/apps/Errors.shtml | 6 +- help/en/html/apps/StoringYourWork.shtml | 7 +- help/en/html/apps/index.shtml | 11 +- help/en/html/doc/Technical/Ant.shtml | 6 +- .../html/doc/Technical/AppPreferences.shtml | 3 +- help/en/html/doc/Technical/AppStructure.shtml | 6 +- help/en/html/doc/Technical/CATS.shtml | 6 +- help/en/html/doc/Technical/CI-status.shtml | 4 +- help/en/html/doc/Technical/CVSFAQ.shtml | 5 +- .../doc/Technical/ContinuousIntegration.shtml | 6 +- help/en/html/doc/Technical/Eclipse.shtml | 6 +- help/en/html/doc/Technical/Enums.shtml | 7 +- help/en/html/doc/Technical/FileNames.shtml | 6 +- help/en/html/doc/Technical/GitFAQ.shtml | 10 +- help/en/html/doc/Technical/Help.shtml | 11 +- help/en/html/doc/Technical/I8N.shtml | 20 +- help/en/html/doc/Technical/IntelliJ.shtml | 9 +- .../html/doc/Technical/IntroStructure.shtml | 25 +- help/en/html/doc/Technical/JUnit.shtml | 22 +- .../html/doc/Technical/JVMCapabilities.shtml | 17 +- .../doc/Technical/JVMCapabilitiesOlder.shtml | 20 +- help/en/html/doc/Technical/Javadoc.shtml | 20 +- help/en/html/doc/Technical/Jython.shtml | 25 +- help/en/html/doc/Technical/Logging.shtml | 23 +- .../doc/Technical/MultiConnectionUpdate.shtml | 19 +- help/en/html/doc/Technical/Names.shtml | 25 +- help/en/html/doc/Technical/NetBeans.shtml | 1438 ++++++++--------- .../doc/Technical/NetBeansGUIEditor.shtml | 22 +- help/en/html/doc/Technical/Networking.shtml | 21 +- help/en/html/doc/Technical/NewSystem.shtml | 19 +- help/en/html/doc/Technical/NewType.shtml | 19 +- help/en/html/doc/Technical/Patterns.shtml | 22 +- help/en/html/doc/Technical/Poll2007.shtml | 25 +- .../doc/Technical/ProfileFileStructure.shtml | 401 ++--- help/en/html/doc/Technical/Properties.shtml | 20 +- help/en/html/doc/Technical/RP.shtml | 24 +- help/en/html/doc/Technical/SVNFAQ.shtml | 24 +- help/en/html/doc/Technical/SpotBugs.shtml | 25 +- .../html/doc/Technical/StartUpScripts.shtml | 20 +- help/en/html/doc/Technical/Swing.shtml | 30 +- .../html/doc/Technical/SystemStructure.shtml | 20 +- help/en/html/doc/Technical/TechRoadMap.shtml | 8 +- .../html/doc/Technical/TechRoadMapOlder.shtml | 21 +- help/en/html/doc/Technical/Threads.shtml | 29 +- .../html/doc/Technical/TurnoutFeedback.shtml | 27 +- help/en/html/doc/Technical/UpdatingDocs.shtml | 22 +- help/en/html/doc/Technical/WebSite.shtml | 25 +- help/en/html/doc/Technical/XmlDtdUsage.shtml | 19 +- help/en/html/doc/Technical/XmlEditors.shtml | 9 +- .../html/doc/Technical/XmlPersistance.shtml | 10 +- help/en/html/doc/Technical/XmlSchema.shtml | 9 +- .../doc/Technical/XmlSchemaExamples.shtml | 22 +- help/en/html/doc/Technical/XmlUsage.shtml | 9 +- help/en/html/doc/Technical/XmlView.shtml | 21 +- help/en/html/doc/Technical/getcvscode.shtml | 5 +- help/en/html/doc/Technical/getgitcode.shtml | 14 +- help/en/html/doc/Technical/getsvncode.shtml | 5 +- help/en/html/doc/Technical/gitadmin.shtml | 6 +- help/en/html/doc/Technical/gitdeveloper.shtml | 9 +- .../doc/Technical/githubdesktopintro.shtml | 8 +- help/en/html/doc/Technical/index.shtml | 8 +- help/en/html/doc/Technical/plugins.shtml | 14 +- 65 files changed, 1159 insertions(+), 1615 deletions(-) diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml index b6652f31bf14..1ac8b06c9b78 100644 --- a/.idea/checkstyle-idea.xml +++ b/.idea/checkstyle-idea.xml @@ -15,4 +15,4 @@ - + \ No newline at end of file diff --git a/help/en/html/FAQ.shtml b/help/en/html/FAQ.shtml index 7021d7cf4c94..42de2332036e 100644 --- a/help/en/html/FAQ.shtml +++ b/help/en/html/FAQ.shtml @@ -1,13 +1,11 @@ - - + - - + JMRI: Frequently Asked Questions (General) - + - +