From 95a24b950f69cbacb6bd3a53961a87ef24ed48cb Mon Sep 17 00:00:00 2001 From: David Jennes Date: Sun, 31 Jul 2022 23:03:40 +0200 Subject: [PATCH 1/2] Small docs fix --- docs/templates.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/templates.rst b/docs/templates.rst index c57a3a50..ec1ca582 100644 --- a/docs/templates.rst +++ b/docs/templates.rst @@ -113,12 +113,10 @@ To comment out part of your template, you can use the following syntax: {# My comment is completely hidden #} -.. _template-inheritance: - Whitespace Control ------------------ -Stencil supports the same syntax as Jinja for whitespace control, see [their docs for more information](https://jinja.palletsprojects.com/en/3.1.x/templates/#whitespace-control). +Stencil supports the same syntax as Jinja for whitespace control, see `their docs for more information `_. Essentially, Stencil will **not** trim whitespace by default. However you can: @@ -126,6 +124,8 @@ Essentially, Stencil will **not** trim whitespace by default. However you can: - You can disable this per-block using the `+` control character. For example `{{+ if … }}` to preserve whitespace before. - You can force trimming per-block by using the `-` control character. For example `{{ if … -}}` to trim whitespace after. +.. _template-inheritance: + Template inheritance -------------------- From 3a98d1ef7d33dcf8fee0dde7fc0303408896930d Mon Sep 17 00:00:00 2001 From: David Jennes Date: Sun, 31 Jul 2022 23:05:06 +0200 Subject: [PATCH 2/2] Bump version to 0.15.1 --- CHANGELOG.md | 18 +----------------- Stencil.podspec.json | 4 ++-- docs/conf.py | 4 ++-- docs/installation.rst | 6 +++--- 4 files changed, 8 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 042e82b5..1e0a2d27 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,16 +1,4 @@ -## Master - -### Breaking - -_None_ - -### Enhancements - -_None_ - -### Deprecations - -_None_ +## 0.15.1 ### Bug Fixes @@ -18,10 +6,6 @@ _None_ [David Jennes](https://github.com/djbe) [#328](https://github.com/stencilproject/Stencil/pull/328) -### Internal Changes - -_None_ - ## 0.15.0 ### Breaking diff --git a/Stencil.podspec.json b/Stencil.podspec.json index c49adf09..d5538d5b 100644 --- a/Stencil.podspec.json +++ b/Stencil.podspec.json @@ -1,6 +1,6 @@ { "name": "Stencil", - "version": "0.15.0", + "version": "0.15.1", "summary": "Stencil is a simple and powerful template language for Swift.", "homepage": "https://stencil.fuller.li", "license": { @@ -13,7 +13,7 @@ "social_media_url": "https://twitter.com/kylefuller", "source": { "git": "https://github.com/stencilproject/Stencil.git", - "tag": "0.15.0" + "tag": "0.15.1" }, "source_files": [ "Sources/Stencil/*.swift" diff --git a/docs/conf.py b/docs/conf.py index 4c67de99..c4fc7a54 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -58,9 +58,9 @@ # built documents. # # The short X.Y version. -version = '0.15.0' +version = '0.15.1' # The full version, including alpha/beta/rc tags. -release = '0.15.0' +release = '0.15.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/installation.rst b/docs/installation.rst index 0ee8fa9a..527b1356 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -14,7 +14,7 @@ dependencies inside ``Package.swift``. let package = Package( name: "MyApplication", dependencies: [ - .package(url: "https://github.com/stencilproject/Stencil.git", from: "0.15.0"), + .package(url: "https://github.com/stencilproject/Stencil.git", from: "0.15.1"), ] ) @@ -26,7 +26,7 @@ If you're using CocoaPods, you can add Stencil to your ``Podfile`` and then run .. code-block:: ruby - pod 'Stencil', '~> 0.15.0' + pod 'Stencil', '~> 0.15.1' Carthage -------- @@ -37,7 +37,7 @@ Carthage .. code-block:: text - github "stencilproject/Stencil" ~> 0.15.0 + github "stencilproject/Stencil" ~> 0.15.1 2) Checkout your dependencies, generate the Stencil Xcode project, and then use Carthage to build Stencil: