Merge branch 'master' into dependency-types

[git.ikiwiki.info.git] / doc / ikiwiki / directive / postsparkline.mdwn

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
 
 
 # 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).
 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.
 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.
 
 * `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.
   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.
 
   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".
 
 the creation times of pages by default. If you instead want
 them to use the modification times of pages, set it to "mtime".