summaryrefslogtreecommitdiff
path: root/data/pages/wiki/syntax.txt
diff options
context:
space:
mode:
Diffstat (limited to 'data/pages/wiki/syntax.txt')
-rw-r--r--data/pages/wiki/syntax.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/data/pages/wiki/syntax.txt b/data/pages/wiki/syntax.txt
index 4eaf6bc2f..d8ee015f3 100644
--- a/data/pages/wiki/syntax.txt
+++ b/data/pages/wiki/syntax.txt
@@ -129,7 +129,7 @@ Real size: {{wiki:dokuwiki-128.png}}
Resize to given width: {{wiki:dokuwiki-128.png?50}}
-Resize to given width and height: {{wiki:dokuwiki-128.png?200x50}}
+Resize to given width and height((when the aspect ratio of the given width and height doesn't match that of the image, it will be cropped to the new ratio before resizing)): {{wiki:dokuwiki-128.png?200x50}}
Resized external image: {{http://de3.php.net/images/php.gif?200x50}}
@@ -195,6 +195,7 @@ DokuWiki converts commonly used [[wp>emoticon]]s to their graphical equivalents.
* 8-O %% 8-O %%
* :-( %% :-( %%
* :-) %% :-) %%
+
* =) %% =) %%
* :-/ %% :-/ %%
* :-\ %% :-\ %%