diff --git a/doc/Command-line.md b/doc/Command-line.md index 1daf3eb..2c87923 100644 --- a/doc/Command-line.md +++ b/doc/Command-line.md @@ -43,7 +43,7 @@ By default hablo will generate a very simple banner for your blog with its name The banner is processed when your blog is generated so it's not relative to the root of your blog, the banner file can totally be outside of your blog structure. ```bash -hablo --banner /my/set/of/banner/turtles.html /path/to/your/blog +hablo --banner /my/set/of/banners/turtles.html /path/to/your/blog ``` ## Card image @@ -170,7 +170,7 @@ The file is read by hablo when the blog is generated and its content gets includ `-R, --rss` -Enables the generation of RSS feeds for each [list](https://git.marvid.fr/Tissevert/hablo/wiki/Architectural%20choices#page-types) of articles. The feed consists in an additional `rss.xml` file placed in the same directory as the `index.html` and `all.html` files generated for. The feeds only include the most recent articles exactly as the «short» versions of each list, which means that they are affected by the use of the [`--preview-articles`](#number-of-articles-previewed) option. When this option is enabled, hablo will also include links to the generated feeds in the list pages. Two [template variables](https://git.marvid.fr/Tissevert/hablo/wiki/Template%20variables#rsslinks) control respectively the content and the title of the link. +Enables the generation of RSS feeds for each [list](https://git.marvid.fr/Tissevert/hablo/wiki/Architectural%20choices#page-types) of articles. The feed consists in an additional `rss.xml` file placed in the same directory as the `index.html` and `all.html` files generated for the general lists. The feeds only include the most recent articles exactly as the «short» versions of each list, which means that they are affected by the use of the [`--preview-articles`](#number-of-articles-previewed) option. When this option is enabled, hablo will also include links to the generated feeds in the list pages. Two [template variables](https://git.marvid.fr/Tissevert/hablo/wiki/Template%20variables#rsslinks) control respectively the content and the title of the link. Note that this feature requires setting your site URL with [`--site-url`](#site-url). @@ -186,7 +186,7 @@ Note that this is purely optional and you don't have to use this option if you d `-w, --wording` -This option makes hablo look for the value of the texts used to [generate the pages](https://git.marvid.fr/Tissevert/hablo/wiki/Architectural choices#customization) in an [arbitrary file](https://git.marvid.fr/Tissevert/hablo/wiki/Template variables). It is useful to translate your blog (all texts are in english by default) or to give it a particular feel. +This option makes hablo look for the value of the texts used to [generate the pages](https://git.marvid.fr/Tissevert/hablo/wiki/Architectural%20choices#customization) in an [arbitrary file](https://git.marvid.fr/Tissevert/hablo/wiki/Template%20variables). It is useful to translate your blog (all texts are in english by default) or to give it a particular feel. ```bash hablo --wording /blogs/translations/fr-ca.conf /path/to/your/blog diff --git a/doc/Customizing-your-blog.md b/doc/Customizing-your-blog.md index 2818987..b105ee3 100644 --- a/doc/Customizing-your-blog.md +++ b/doc/Customizing-your-blog.md @@ -70,7 +70,7 @@ If you'd like to read more details about all the available customization, you sh ## How do I activate comments on my blog ? -Since hablo is [static](https://git.marvid.fr/Tissevert/hablo/wiki/Architectural choices#static-and-lazy) there's no way to directly include the comments in the pages. On a blog generated with hablo comments are fetched with JS and dynamically added to the page when it gets rendered in the client. +Since hablo is [static](https://git.marvid.fr/Tissevert/hablo/wiki/Architectural%20choices#static-and-lazy) there's no way to directly include the comments in the pages. On a blog generated with hablo comments are fetched with JS and dynamically added to the page when it gets rendered in the client. Let's say you published an article, tell people about it from your fediverse instance by posting a link to that article. First, we need to find the status [`id`](https://docs.joinmastodon.org/api/entities#status) of your post. diff --git a/doc/Metadata.md b/doc/Metadata.md index 8ee66fa..6383faa 100644 --- a/doc/Metadata.md +++ b/doc/Metadata.md @@ -1,6 +1,6 @@ # Metadata -Markdown articles are rendered as late as possible into HTML, even the [article pages](https://git.marvid.fr/Tissevert/hablo/wiki/Architectural choices#article-pages) only wrap the markdown content into a `
` element. But metadata are still read by hablo when it analyses your blog because some metadata trigger special behaviors.
+Markdown articles are rendered as late as possible into HTML, even the [article pages](https://git.marvid.fr/Tissevert/hablo/wiki/Architectural%20choices#article-pages) only wrap the markdown content into a `
` element. But metadata are still read by hablo when it analyses your blog because some metadata trigger special behaviors.
 
 ## Format
 
diff --git a/doc/Template-variables.md b/doc/Template-variables.md
index 9873bec..51b53da 100644
--- a/doc/Template-variables.md
+++ b/doc/Template-variables.md
@@ -8,7 +8,7 @@ All template variables are checked at «[compile-time](https://git.marvid.fr/Tis
 
 ## Conditional blocks
 
-Now some contexts may vary a bit and sometimes «lack» a variable so some templates like `metadata` need a way to «catch» those possible null values and keep templating. You could for instance decide that most articles of your blog aren't signed because they obviously come from you or the organization that publishes the blog but that when the blog features an article by a special guest it needs a special mention and you would put the corresponding part using the `${author}` variable in a conditional block. The syntax to do so and «warn» the templating system of possible null values is to enclose the corresponding optional part inside `${? ?}` like so :
+Now some contexts may vary a bit and sometimes «lack» a variable so some templates like `metadata` need a way to «catch» those possible null values and keep templating. You could for instance decide that most articles of your blog aren't signed because they obviously come from you or the organization that publishes the blog but that when the blog features an article by a special guest it needs a special mention and you would put the corresponding part using the `${author}` variable in a conditional block. The syntax to do so and «warn» the templating system of possible null values is to enclose the corresponding optional part inside `{? ?}` like so :
 
 ```
 allPage = The articles{? about ${tag}?}
diff --git a/hablo.cabal b/hablo.cabal
index ca68a99..58d94c7 100644
--- a/hablo.cabal
+++ b/hablo.cabal
@@ -51,7 +51,7 @@ library hablo-internals
                      , RSS
   -- other-extensions:
   build-depends:       aeson >= 1.4.0 && < 1.5
-                     , base >= 4.9.1 && < 4.13
+                     , base >= 4.9.1 && < 4.14
                      , bytestring >= 0.10.8 && < 0.11
                      , containers >= 0.5.11 && < 0.7
                      , directory >= 1.3.1 && < 1.4
@@ -62,7 +62,7 @@ library hablo-internals
                      , parsec >= 3.1.13 && < 3.2
                      , template >= 0.2.0 && < 0.3
                      , text >= 1.2.3 && < 1.3
-                     , time >= 1.8.0 && < 1.9
+                     , time >= 1.8.0 && < 1.10
                      , SJW >= 0.1.2 && < 0.2
                      , unix >= 2.7.2 && < 2.8
   ghc-options:         -Wall