diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-07-19 12:36:01 +0200 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-07-19 12:36:01 +0200 |
| commit | ec965fc92cd41f597c6e8e88584b9a688407c8c6 (patch) | |
| tree | 410173c14f66ae62a6436ea00b73bb470c9d1dda /doc/ikiwiki/directive/img.mdwn | |
| parent | 86edd73d169600875a10a635ef8df4a644545b0d (diff) | |
| parent | fa2c3a3dba2a4589b63cf445ec9e33ec19be627e (diff) | |
Merge branch 'master' into po
Conflicts:
debian/changelog
Diffstat (limited to 'doc/ikiwiki/directive/img.mdwn')
| -rw-r--r-- | doc/ikiwiki/directive/img.mdwn | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/ikiwiki/directive/img.mdwn b/doc/ikiwiki/directive/img.mdwn index 1d1f29bea..66efd008e 100644 --- a/doc/ikiwiki/directive/img.mdwn +++ b/doc/ikiwiki/directive/img.mdwn @@ -18,9 +18,9 @@ making the image smaller than the specified size. You can also specify only the width or the height, and the other value will be calculated based on it: "200x", "x200" -You can also pass `alt`, `title`, `class` and `id` parameters. These are -passed through unchanged to the html img tag. If you include a `caption` -parameter, the caption will be displayed centered beneath the image. +You can also pass `alt`, `title`, `class`, `align` and `id` parameters. +These are passed through unchanged to the html img tag. If you include a +`caption` parameter, the caption will be displayed centered beneath the image. The `link` parameter is used to control whether the scaled down image links to the full size version. By default it does; set "link=somepage" to link |