Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

diff --git a/doc/ikiwiki/directive/postsparkline.mdwn b/doc/ikiwiki/directive/postsparkline.mdwn
index c17d32952380d87efa37674d490ede3581aeaace..318512eef8bf21a836144a53f9d3642097fdbcbe 100644 (file)
--- a/doc/ikiwiki/directive/postsparkline.mdwn
+++ b/doc/ikiwiki/directive/postsparkline.mdwn
@@ -15,7 +15,7 @@ This directive uses the [[!iki plugins/sparkline desc=sparkline]] plugin to crea
 
 # usage
 
-All options aside fron the `pages`, `max`, `formula`, `time`, and `color`
+All options aside from the `pages`, `max`, `formula`, `time`, and `color`
 options are the same as in [[sparkline]] directive.
 
 You don't need to specify any data points (though you can if you want to).
@@ -24,7 +24,7 @@ times of pages matched by the specified `pages` [[ikiwiki/PageSpec]]. A
 maximum of `max` data points will be generated.
 
 The `formula` parameter controls the formula used to generate data points.
-Available forumlae:
+Available formulae:
 
 * `interval` - The height of each point represents how long it has been
   since the previous post.
@@ -32,10 +32,10 @@ Available forumlae:
   many posts were made that day.
 * `permonth` - Each point represents a month; the height represents how
   many posts were made that month.
-* `peryear` - Each point represents a day; the height represents how
+* `peryear` - Each point represents a year; the height represents how
   many posts were made that year.
 
-The `time` parameter has a default value of "ctime", since forumae use
+The `time` parameter has a default value of "ctime", since formulae use
 the creation times of pages by default. If you instead want
 them to use the modification times of pages, set it to "mtime".
 

diff --git a/doc/ikiwiki/directive/sparkline.mdwn b/doc/ikiwiki/directive/sparkline.mdwn
index 1f691e14f5fca89d0738cc2d4a8af2948ad37a16..e5a03f84e1ad29843904e35e611e89c459e58c92 100644 (file)
--- a/doc/ikiwiki/directive/sparkline.mdwn
+++ b/doc/ikiwiki/directive/sparkline.mdwn
@@ -2,7 +2,7 @@ The `sparkline` directive is supplied by the [[!iki plugins/sparkline desc=spark
 
 This directive allows for embedding sparklines into wiki pages. A
 sparkline is a small word-size graphic chart, that is designed to be
-displayes alongside text.
+displayed alongside text.
 
 # examples