Merge branch 'glob-paths' of https://github.com/DesmondWillowbrook/zola…

… into glob-paths
getzola · Jan 29, 2022 · 11fcf47 · 11fcf47
2 parents 4c74474 + 82c363d
commit 11fcf47
Show file tree

Hide file tree

Showing 12 changed files with 243 additions and 190 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.16.0 (unreleased)
+
+
 ## 0.15.3 (2022-01-23)
 
 - Fix shortcodes not being rendered in code blocks

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zola"
-version = "0.15.3"
+version = "0.16.0"
 authors = ["Vincent Prouillet <hello@vincentprouillet.com>"]
 edition = "2018"
 license = "MIT"
@@ -13,14 +13,15 @@ keywords = ["static", "site", "generator", "blog"]
 include = ["src/**/*", "LICENSE", "README.md"]
 
 [build-dependencies]
-clap = "2"
+clap = "3"
+clap_complete = "3"
 
 [[bin]]
 name = "zola"
 
 [dependencies]
 atty = "0.2.11"
-clap = { version = "2", default-features = false }
+clap = { version = "3", features = ["derive"] }
 chrono = "0.4"
 lazy_static = "1.1"
 termcolor = "1.0.4"

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -21,7 +21,7 @@ stages:
               rustup_toolchain: stable
             linux-pinned:
               imageName: 'ubuntu-20.04'
-              rustup_toolchain: 1.53.0
+              rustup_toolchain: 1.54.0
         pool:
           vmImage: $(imageName)
         steps:

diff --git a/docs/content/documentation/content/multilingual.md b/docs/content/documentation/content/multilingual.md
@@ -27,6 +27,9 @@ summary = "Mon blog"
 [languages.it.translations]
 summary = "Mio blog"
 
+# translations for the default language are not prefixed by languages.code
+[translations]
+summary = "My blog"
 ```
 
 Note: By default, Chinese and Japanese search indexing is not included. You can include

diff --git a/docs/content/documentation/content/sass.md b/docs/content/documentation/content/sass.md
@@ -11,6 +11,8 @@ may be of interest:
 * The [official Sass website](https://sass-lang.com/)
 * [Why Sass?](https://alistapart.com/article/why-sass), by Dan Cederholm
 
+It currently uses a wrapper around LibSass 3.6.4.
+
 ## Using Sass in Zola
 
 Zola processes any files with the `sass` or `scss` extension in the `sass`

diff --git a/docs/content/documentation/content/search.md b/docs/content/documentation/content/search.md
@@ -21,6 +21,9 @@ As each site will be different, Zola makes no assumptions about your search func
 the JavaScript/CSS code to do an actual search and display results. You can look at how this site
 implements it to get an idea: [search.js](https://github.com/getzola/zola/tree/master/docs/static/search.js).
 
+If you are using a language other than English, you will also need to include the corresponding JavaScript stemmer file.
+See <https://github.com/weixsong/lunr-languages#in-a-web-browser> for details.
+
 ## Configuring the search index
 In some cases, the default indexing strategy is not suitable. You can customize which fields to include and whether
 to truncate the content in the [search configuration](@/documentation/getting-started/configuration.md).
diff --git a/docs/content/documentation/content/syntax-highlighting.md b/docs/content/documentation/content/syntax-highlighting.md
@@ -171,6 +171,9 @@ If your site source is laid out as follows:
 
 you would set your `extra_syntaxes_and_themes` to `["syntaxes", "syntaxes/Sublime-Language1"]` to load `lang1.sublime-syntax` and `lang2.sublime-syntax`.
 
+You can see the list of available themes on the [configuration page](@/documentation/getting-started/configuration.md#syntax-highlighting).
+
+
 ## Inline VS classed highlighting
 
 If you use a highlighting scheme like

diff --git a/docs/content/documentation/getting-started/overview.md b/docs/content/documentation/getting-started/overview.md
@@ -155,6 +155,7 @@ Let's now create some more templates. In the `templates` directory, create a `bl
   {{ section.title }}
 </h1>
 <ul>
+  <!-- If you are using pagination, section.pages will be empty. You need to use the paginator object -->  
   {% for page in section.pages %}
   <li><a href="{{ page.permalink | safe }}">{{ page.title }}</a></li>
   {% endfor %}

diff --git a/snapcraft.yaml b/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: zola 
-version: 0.15.3
+version: 0.16.0
 summary: A fast static site generator in a single binary with everything built-in.
 description: |
   A fast static site generator in a single binary with everything built-in.
@@ -21,7 +21,7 @@ parts:
   zola:
     source-type: git
     source: https://github.com/getzola/zola.git
-    source-tag: v0.15.3
+    source-tag: v0.16.0
     plugin: rust
     rust-channel: stable
     build-packages: