Merge remote-tracking branch 'origin/diff_navigation' into revisions

Conflicts:
	inc/parser/xhtml.php

3 files changed, 10 insertions, 6 deletions

diff --git a/conf/entities.conf b/conf/entities.conf
index be9ed6d40..c0d653c18 100644
--- a/conf/entities.conf
+++ b/conf/entities.conf
@@ -2,7 +2,7 @@
 #
 # Order does matter!
 #
-# You can use HTML entities here, but it is not recomended because it may break
+# You can use HTML entities here, but it is not recommended because it may break
 # non-HTML renderers. Use UTF-8 chars directly instead.
 
 <->     ↔
diff --git a/conf/mime.conf b/conf/mime.conf
index 381b93f86..2a50fab10 100644
--- a/conf/mime.conf
+++ b/conf/mime.conf
@@ -13,6 +13,9 @@ swf     application/x-shockwave-flash
 mp3     audio/mpeg
 ogg     audio/ogg
 wav     audio/wav
+webm    video/webm
+ogv     video/ogg
+mp4     video/mp4
 
 tgz     !application/octet-stream
 tar     !application/x-gtar
diff --git a/conf/plugins.required.php b/conf/plugins.required.php
index 26eb8888b..75336da2e 100644
--- a/conf/plugins.required.php
+++ b/conf/plugins.required.php
@@ -4,8 +4,9 @@
  * from changes by the extention manager. These settings will override any local settings.
  * It is not recommended to change this file, as it is overwritten on DokuWiki upgrades.
  */
-$plugins['acl']         = 1;
-$plugins['plugin']      = 1;
-$plugins['config']      = 1;
-$plugins['usermanager'] = 1;
-$plugins['revert']      = 1;
+$plugins['acl']               = 1;
+$plugins['authplain']         = 1;
+$plugins['extension']         = 1;
+$plugins['config']            = 1;
+$plugins['usermanager']       = 1;
+$plugins['template:dokuwiki'] = 1; // not a plugin, but this should not be uninstalled either