diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/pages/wiki/dokuwiki.txt | 2 | ||||
| -rw-r--r-- | data/pages/wiki/syntax.txt | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/data/pages/wiki/dokuwiki.txt b/data/pages/wiki/dokuwiki.txt index 6a7f8eaac..f661eaf20 100644 --- a/data/pages/wiki/dokuwiki.txt +++ b/data/pages/wiki/dokuwiki.txt @@ -56,7 +56,7 @@ All documentation and additional information besides the [[syntax|syntax descrip ===== Copyright ===== -2004-2008 (c) Andreas Gohr <andi@splitbrain.org>((Please do not contact me for help and support -- use the [[doku>mailinglist]] or [[http://forum.dokuwiki.org|forum]] instead)) +2004-2009 (c) Andreas Gohr <andi@splitbrain.org>((Please do not contact me for help and support -- use the [[doku>mailinglist]] or [[http://forum.dokuwiki.org|forum]] instead)) The DokuWiki engine is licensed under [[http://www.gnu.org/licenses/gpl.html|GNU General Public License]] Version 2. If you use DokuWiki in your company, consider [[doku>donate|donating]] a few bucks ;-). 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 %% * :-( %% :-( %% * :-) %% :-) %% + * =) %% =) %% * :-/ %% :-/ %% * :-\ %% :-\ %% |