Merge branch 'rust-lang:master' into #1564

.github/workflows/main.yml

@@ -31,7 +31,7 @@ jobs:
             rust: stable
           - build: msrv
             os: ubuntu-latest
-            rust: 1.42.0
+            rust: 1.45.0
     steps:
     - uses: actions/checkout@master
     - name: Install Rust

Cargo.lock

@@ -511,9 +511,9 @@ dependencies = [
 
 [[package]]
 name = "handlebars"
-version = "3.5.5"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4498fc115fa7d34de968184e473529abb40eeb6be8bc5f7faba3d08c316cb3e3"
+checksum = "28f0fe89affef47e2c9729030a8f6e79df34cb66b8a44ecf91dad43f31150559"
 dependencies = [
  "log",
  "pest",

Cargo.toml

@@ -20,7 +20,7 @@ anyhow = "1.0.28"
 chrono = "0.4"
 clap = "2.24"
 env_logger = "0.7.1"
-handlebars = "3.0"
+handlebars = "4.0"
 lazy_static = "1.0"
 log = "0.4"
 memchr = "2.0"

guide/src/format/summary.md

@@ -13,7 +13,7 @@ to be ignored at best, or may cause an error when attempting to build the book.
 
 1. ***Title*** - While optional, it's common practice to begin with a title, generally <code
    class="language-markdown"># Summary</code>. This is ignored by the parser however, and
-   can be ommitted.
+   can be omitted.
    ```markdown
    # Summary
    ```
@@ -54,8 +54,8 @@ to be ignored at best, or may cause an error when attempting to build the book.
 
    - [Another Chapter](relative/path/to/markdown4.md)
    ```
-   Numbered chapters can be denoted with either `-` or `*`.
-
+   Numbered chapters can be denoted with either `-` or `*` (do not mix delimiters). 
+   
 1. ***Suffix Chapter*** - Like prefix chapters, suffix chapters are unnumbered, but they come after 
    numbered chapters.
    ```markdown