diff options
| author | Anika Henke <anika@selfthinker.org> | 2014-02-15 22:55:10 +0000 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2014-02-15 22:55:10 +0000 |
| commit | 3f5b6538b677cb10221af901cbc1e4b9c9813c53 (patch) | |
| tree | 20a27efc2a1dedc589542f8a8e19554cd1ef276d /data | |
| parent | 17954bb5e3033069554ebb963fb9040c52b4760b (diff) | |
| download | rpg-3f5b6538b677cb10221af901cbc1e4b9c9813c53.tar.gz rpg-3f5b6538b677cb10221af901cbc1e4b9c9813c53.tar.bz2 | |
updated syntax page to include recently added video and audio formats
Diffstat (limited to 'data')
| -rw-r--r-- | data/pages/wiki/syntax.txt | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/data/pages/wiki/syntax.txt b/data/pages/wiki/syntax.txt index 02b49dc3d..86ad815e4 100644 --- a/data/pages/wiki/syntax.txt +++ b/data/pages/wiki/syntax.txt @@ -121,9 +121,9 @@ By using four or more dashes, you can make a horizontal line: ---- -===== Images and Other Files ===== +===== Media Files ===== -You can include external and internal [[doku>images]] with curly brackets. Optionally you can specify the size of them. +You can include external and internal [[doku>images|images, videos and audio files]] with curly brackets. Optionally you can specify the size of them. Real size: {{wiki:dokuwiki-128.png}} @@ -157,10 +157,31 @@ Of course, you can add a title (displayed as a tooltip by most browsers), too. {{ wiki:dokuwiki-128.png |This is the caption}} -If you specify a filename (external or internal) that is not an image (''gif, jpeg, png''), then it will be displayed as a link instead. - For linking an image to another page see [[#Image Links]] above. +==== Supported Media Formats ==== + +DokuWiki can embed the following media formats directly. + +| Image | ''gif'', ''jpg'', ''png'' | +| Video | ''webm'', ''ogv'', ''mp4'' | +| Audio | ''ogg'', ''mp3'', ''wav'' | +| Flash | ''swf'' | + +If you specify a filename that is not a supported media format, then it will be displayed as a link instead. + +==== Fallback Formats ==== + +Unfortunately not all browsers understand all video and audio formats. To mitigate the problem, you can upload your file in different formats for maximum browser compatibility. + +For example consider this embedded mp4 video: + + {{video.mp4|A funny video}} + +When you upload a ''video.webm'' and ''video.ogv'' next to the referenced ''video.mp4'', DokuWiki will automatically add them as alternatives so that one of the three files is understood by your browser. + +Additionally DokuWiki supports a "poster" image which will be shown before the video has started. That image needs to have the same filename as the video and be either a jpg or png file. In the example above a ''video.jpg'' file would work. + ===== Lists ===== Dokuwiki supports ordered and unordered lists. To create a list item, indent your text by two spaces and use a ''*'' for unordered lists or a ''-'' for ordered ones. |