Skip to content

Commit 71df364

Browse files
frank-at-adacorefrank-at-adacore
committed
Merge branch 'mr/533-course-content-file-names-should-match-file-title' into 'master'
Resolve "Course content file names should match file title" Closes #533 See merge request feng/training/material!623
2 parents d9b2ab0 + a0bf09b commit 71df364

31 files changed

Lines changed: 42 additions & 17 deletions

‎courses/rust_essentials/015_overview.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ Overview
3737
.. container:: PRELUDE END
3838

3939
.. include:: 015_overview/01_what_is_rust.rst
40-
.. include:: 015_overview/02_benefits.rst
40+
.. include:: 015_overview/02_benefits_of_rust.rst
4141
.. include:: 015_overview/03_tooling.rst

courses/rust_essentials/015_overview/02_benefits.rst renamed to courses/rust_essentials/015_overview/02_benefits_of_rust.rst

File renamed without changes.

‎courses/rust_essentials/040_control_flow_basics.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ Control Flow Basics
3434

3535
.. include:: 040_control_flow_basics/00_introduction.rst
3636
.. include:: 040_control_flow_basics/01_blocks.rst
37-
.. include:: 040_control_flow_basics/02_if.rst
38-
.. include:: 040_control_flow_basics/03_match.rst
37+
.. include:: 040_control_flow_basics/02_if_expressions.rst
38+
.. include:: 040_control_flow_basics/03_match_expressions.rst
3939
.. include:: 040_control_flow_basics/04_loops.rst
40-
.. include:: 040_control_flow_basics/05_break_continue.rst
40+
.. include:: 040_control_flow_basics/05_break_and_continue.rst
4141
.. include:: 040_control_flow_basics/06_functions.rst
4242
.. include:: 040_control_flow_basics/07_macros.rst
4343
.. include:: 040_control_flow_basics/88-control_flow_basics.lab.rst

courses/rust_essentials/040_control_flow_basics/02_if.rst renamed to courses/rust_essentials/040_control_flow_basics/02_if_expressions.rst

File renamed without changes.

courses/rust_essentials/040_control_flow_basics/03_match.rst renamed to courses/rust_essentials/040_control_flow_basics/03_match_expressions.rst

File renamed without changes.

courses/rust_essentials/040_control_flow_basics/05_break_continue.rst renamed to courses/rust_essentials/040_control_flow_basics/05_break_and_continue.rst

File renamed without changes.

‎courses/rust_essentials/050_tuples_and_arrays.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Tuples and Arrays
3535
.. include:: 050_tuples_and_arrays/00_introduction.rst
3636
.. include:: 050_tuples_and_arrays/01_arrays.rst
3737
.. include:: 050_tuples_and_arrays/02_tuples.rst
38-
.. include:: 050_tuples_and_arrays/03_destructuring.rst
38+
.. include:: 050_tuples_and_arrays/03_patterns_and_destructuring.rst
3939
.. include:: 050_tuples_and_arrays/88-tuples_and_arrays.lab.rst
4040
.. include:: 050_tuples_and_arrays/99_summary.rst
4141

courses/rust_essentials/050_tuples_and_arrays/03_destructuring.rst renamed to courses/rust_essentials/050_tuples_and_arrays/03_patterns_and_destructuring.rst

File renamed without changes.

‎courses/rust_essentials/060_references.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ References
3333
.. container:: PRELUDE END
3434

3535
.. include:: 060_references/00_introduction.rst
36-
.. include:: 060_references/01_shared.rst
37-
.. include:: 060_references/02_exclusive.rst
38-
.. include:: 060_references/03_navigating.rst
36+
.. include:: 060_references/01_shared_references.rst
37+
.. include:: 060_references/02_mutable_references.rst
38+
.. include:: 060_references/03_binding_vs_reference.rst
3939
.. include:: 060_references/04_reference_validity.rst
4040
.. include:: 060_references/05_slices.rst
4141
.. include:: 060_references/88-references.lab.rst

courses/rust_essentials/060_references/01_shared.rst renamed to courses/rust_essentials/060_references/01_shared_references.rst

File renamed without changes.

0 commit comments

Comments
 (0)