3 files changed, 98 insertions, 17 deletions
diff --git a/data/deleted.files b/data/deleted.files
index 664086c25..63335d3cc 100644
--- a/data/deleted.files
+++ b/data/deleted.files
@@ -1,8 +1,68 @@
 # This is a list of files that were present in previous DokuWiki releases
 # but were removed later. An up to date DokuWiki should not have any of
 # the files installed
-# A copy of this list is maintained at
-# http://www.dokuwiki.org/install:upgrade#files_to_remove
+
+# removed in 2013-11-18
+lib/images/arrow_down.gif
+lib/images/arrow_up.gif
+lib/images/at.gif
+lib/images/close.png
+lib/images/del.png
+lib/images/edit.gif
+lib/images/list-minus.gif
+lib/images/list-plus.gif
+lib/images/pencil.png
+
+# removed in 2013-10-28
+lib/images/interwiki/meatball.gif
+lib/images/interwiki/wiki.gif
+lib/plugins/acl/ajax.php
+lib/tpl/default/_admin.css
+lib/tpl/default/_fileuploader.css
+lib/tpl/default/_linkwiz.css
+lib/tpl/default/_mediamanager.css
+lib/tpl/default/_mediaoptions.css
+lib/tpl/default/_subscription.css
+lib/tpl/default/_tabs.css
+lib/tpl/default/design.css
+lib/tpl/default/detail.php
+lib/tpl/default/footer.html
+lib/tpl/default/images/UWEB.png
+lib/tpl/default/images/UWEBshadow.png
+lib/tpl/default/images/apple-touch-icon.png
+lib/tpl/default/images/bullet.gif
+lib/tpl/default/images/button-cc.gif
+lib/tpl/default/images/button-css.png
+lib/tpl/default/images/button-donate.gif
+lib/tpl/default/images/button-dw.png
+lib/tpl/default/images/button-php.gif
+lib/tpl/default/images/button-rss.png
+lib/tpl/default/images/button-xhtml.png
+lib/tpl/default/images/buttonshadow.png
+lib/tpl/default/images/closed.gif
+lib/tpl/default/images/favicon.ico
+lib/tpl/default/images/inputshadow.png
+lib/tpl/default/images/link_icon.gif
+lib/tpl/default/images/mail_icon.gif
+lib/tpl/default/images/open.gif
+lib/tpl/default/images/resizecol.png
+lib/tpl/default/images/tocdot2.gif
+lib/tpl/default/images/windows.gif
+lib/tpl/default/layout.css
+lib/tpl/default/main.php
+lib/tpl/default/media.css
+lib/tpl/default/mediamanager.php
+lib/tpl/default/print.css
+lib/tpl/default/rtl.css
+lib/tpl/default/style.ini
+lib/tpl/default/template.info.txt
+lib/tpl/dokuwiki/css/basic.css
+lib/tpl/dokuwiki/css/content.css
+lib/tpl/dokuwiki/css/design.css
+lib/tpl/dokuwiki/css/includes.css
+lib/tpl/dokuwiki/css/mobile.css
+lib/tpl/dokuwiki/css/pagetools.css
+lib/tpl/dokuwiki/css/structure.css
 
 # removed in 2013-05-10
 lib/plugins/info/lang/sl/lang.php
diff --git a/data/pages/wiki/dokuwiki.txt b/data/pages/wiki/dokuwiki.txt
index 808aea68a..0e08fdcd3 100644
--- a/data/pages/wiki/dokuwiki.txt
+++ b/data/pages/wiki/dokuwiki.txt
@@ -6,7 +6,7 @@ Read the [[doku>manual|DokuWiki Manual]] to unleash the full power of DokuWiki.
 
 ===== Download =====
 
-DokuWiki is available at http://www.splitbrain.org/go/dokuwiki
+DokuWiki is available at http://download.dokuwiki.org/
 
 
 ===== Read More =====
@@ -24,7 +24,7 @@ All documentation and additional information besides the [[syntax|syntax descrip
 **Installing DokuWiki**
 
   * [[doku>requirements|System Requirements]]
-  * [[http://www.splitbrain.org/go/dokuwiki|Download DokuWiki]] :!:
+  * [[http://download.dokuwiki.org/|Download DokuWiki]] :!:
   * [[doku>changes|Change Log]]
   * [[doku>Install|How to install or upgrade]] :!:
   * [[doku>config|Configuration]]
@@ -50,7 +50,7 @@ All documentation and additional information besides the [[syntax|syntax descrip
   * [[doku>mailinglist|Join the mailing list]]
   * [[http://forum.dokuwiki.org|Check out the user forum]]
   * [[doku>irc|Talk to other users in the IRC channel]]
-  * [[http://bugs.splitbrain.org/index.php?project=1|Submit bugs and feature wishes]]
+  * [[https://github.com/splitbrain/dokuwiki/issues|Submit bugs and feature wishes]]
   * [[http://www.wikimatrix.org/forum/viewforum.php?id=10|Share your experiences in the WikiMatrix forum]]
   * [[doku>thanks|Some humble thanks]]
 
diff --git a/data/pages/wiki/syntax.txt b/data/pages/wiki/syntax.txt
index f2c2864ed..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.
@@ -427,25 +448,25 @@ PHP example:
 
 <code>
 <php>
-echo 'A logo generated by PHP:';
-echo '<img src="' . $_SERVER['PHP_SELF'] . '?=' . php_logo_guid() . '" alt="PHP Logo !" />';
-echo '(generated inline HTML)';
+echo 'The PHP version: ';
+echo phpversion();
+echo ' (generated inline HTML)';
 </php>
 <PHP>
 echo '<table class="inline"><tr><td>The same, but inside a block level element:</td>';
-echo '<td><img src="' . $_SERVER['PHP_SELF'] . '?=' . php_logo_guid() . '" alt="PHP Logo !" /></td>';
+echo '<td>'.phpversion().'</td>';
 echo '</tr></table>';
 </PHP>
 </code>
 
 <php>
-echo 'A logo generated by PHP:';
-echo '<img src="' . $_SERVER['PHP_SELF'] . '?=' . php_logo_guid() . '" alt="PHP Logo !" />';
-echo '(inline HTML)';
+echo 'The PHP version: ';
+echo phpversion();
+echo ' (inline HTML)';
 </php>
 <PHP>
 echo '<table class="inline"><tr><td>The same, but inside a block level element:</td>';
-echo '<td><img src="' . $_SERVER['PHP_SELF'] . '?=' . php_logo_guid() . '" alt="PHP Logo !" /></td>';
+echo '<td>'.phpversion().'</td>';
 echo '</tr></table>';
 </PHP>