diff --git a/Gemfile.lock b/Gemfile.lock index 2102d49b..941111d6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,22 +3,19 @@ GEM specs: addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) - bigdecimal (3.1.8) colorator (1.1.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.5) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) eventmachine (1.2.7) - ffi (1.17.0-x86_64-linux-gnu) + ffi (1.17.1) forwardable-extended (2.6.0) - google-protobuf (4.27.1-x86_64-linux) - bigdecimal - rake (>= 13) + google-protobuf (3.25.6) http_parser.rb (0.8.0) - i18n (1.14.5) + i18n (1.14.7) concurrent-ruby (~> 1.0) - jekyll (4.3.3) + jekyll (4.3.4) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -46,8 +43,8 @@ GEM jekyll (>= 3.8, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) - kramdown (2.4.0) - rexml + kramdown (2.5.1) + rexml (>= 3.3.9) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) liquid (4.0.4) @@ -61,21 +58,20 @@ GEM jekyll-seo-tag (~> 2.1) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (6.0.1) + public_suffix (5.1.1) rake (13.2.1) rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - rexml (3.3.2) - strscan - rouge (4.2.1) + rexml (3.4.1) + rouge (4.5.1) safe_yaml (1.0.5) - sass-embedded (1.77.4-x86_64-linux-gnu) - google-protobuf (>= 3.25, < 5.0) - strscan (3.1.0) + sass-embedded (1.63.6) + google-protobuf (~> 3.23) + rake (>= 13.0.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - unicode-display_width (2.5.0) + unicode-display_width (2.6.0) webrick (1.8.1) PLATFORMS @@ -93,4 +89,4 @@ DEPENDENCIES webrick (~> 1.8) BUNDLED WITH - 2.2.32 + 2.3.11 diff --git a/_data/menu.yaml b/_data/menu.yaml index 40f49f6e..f44c0688 100644 --- a/_data/menu.yaml +++ b/_data/menu.yaml @@ -35,16 +35,18 @@ toc: url: /download/explore-content/ - title: Learn subfolderitems: + - page: Manual & Documents + url: /learn/documents/ - page: FAQ url: /learn/faq/ - - page: Manual and Tutorials - url: /learn/manual-and-tutorials/ - - page: Build Your Own Route + - page: Tutorials + url: /learn/tutorials/ + - page: Tutorial - Build Your Own Route url: /learn/build-route/ + - page: Tutorial - Activities + url: /learn/activities/ - page: OR Physics url: /learn/physics/ - - page: Activities - url: /learn/activities/ - title: Share subfolderitems: - page: Community diff --git a/learn/documents/index.html b/learn/documents/index.html new file mode 100644 index 00000000..0935526f --- /dev/null +++ b/learn/documents/index.html @@ -0,0 +1,42 @@ +--- +layout: default +section: Learn +title: Manual & Documents +--- +
+
 
+
+

Using Core Open Rails

+ +

Using Non-Core (Contributed) Programs

+ +

Simulation Documents

+ +

Program Architecture Documents

+ +

Administration Documents

+ +
+
diff --git a/learn/manual-and-tutorials/index.html b/learn/manual-and-tutorials/index.html deleted file mode 100644 index cafde9a9..00000000 --- a/learn/manual-and-tutorials/index.html +++ /dev/null @@ -1,72 +0,0 @@ ---- -layout: default -section: Learn -title: Manual and Tutorials ---- - -
-
 
-
-

Manual

-

- Each download includes a copy of the Operating Manual. - For convenience, you can also directly download the manual (PDF) ({% include file_meta.html file="testing_manual" %}) - or view it on-line. -

-

Test Environment for Models

-

-One of our aims for Open Rails is that train performance should be as realistic as possible. -To help achieve this, -Peter Newell has developed an environment for testing -the performance of locos and rolling stock. Do they perform as we expect? -

-It may be the model that is not configured correctly or, as Open Rails develops, it may be that the simulator is lacking -in realism. -

-In either case, a neutral, repeatable test environment helps to pin down the issue and get it fixed. -

-
-
 
-
-

Tutorials

-

- The comprehensive "Build your own route" tutorial is introduced here. -

-

- We need tutorials for all aspects of Open Rails on: -

- -

- such as the tutorials on Eric Conrad's blog. -

- If you are interested in helping with tutorials, please contact us. -

-

Some other support materials are available:

- -
-
diff --git a/learn/tutorials/index.html b/learn/tutorials/index.html new file mode 100644 index 00000000..875451ad --- /dev/null +++ b/learn/tutorials/index.html @@ -0,0 +1,42 @@ +--- +layout: default +section: Learn +title: Tutorials +--- + +
+
 
+
+

Tutorials

+

+ The comprehensive "Build your own route" tutorial is introduced here. +

+

+ We need tutorials for all aspects of Open Rails on: +

+ +

+ such as the tutorials on Eric Conrad's blog. +

+ If you are interested in helping with tutorials, please contact us. +

+
+
+

Test Environment for Models

+

+ One of our aims for Open Rails is that train performance should be as realistic as possible. + To help achieve this, + Peter Newell has developed an environment for testing + the performance of locos and rolling stock. Do they perform as we expect? +

+ It may be the model that is not configured correctly or, as Open Rails develops, it may be that the simulator is lacking + in realism. +

+ In either case, a neutral, repeatable test environment helps to pin down the issue and get it fixed. +

+
+