merge master in branch

13 files changed, 24 insertions, 4 deletions

diff --git a/data/.htaccess b/data/.htaccess
index 2cbb757e7..281d5c33d 100644
--- a/data/.htaccess
+++ b/data/.htaccess
@@ -1,3 +1,2 @@
 order allow,deny
 deny from all
-Satisfy All
diff --git a/data/_dummy b/data/_dummy
index e69de29bb..e492265be 100644
--- a/data/_dummy
+++ b/data/_dummy
@@ -0,0 +1 @@
+You can safely delete this file.
\ No newline at end of file
diff --git a/data/attic/_dummy b/data/attic/_dummy
index e69de29bb..e492265be 100644
--- a/data/attic/_dummy
+++ b/data/attic/_dummy
@@ -0,0 +1 @@
+You can safely delete this file.
\ No newline at end of file
diff --git a/data/cache/_dummy b/data/cache/_dummy
index e69de29bb..e492265be 100644
--- a/data/cache/_dummy
+++ b/data/cache/_dummy
@@ -0,0 +1 @@
+You can safely delete this file.
\ No newline at end of file
diff --git a/data/deleted.files b/data/deleted.files
index fada1f29e..664086c25 100644
--- a/data/deleted.files
+++ b/data/deleted.files
@@ -4,6 +4,18 @@
 # A copy of this list is maintained at
 # http://www.dokuwiki.org/install:upgrade#files_to_remove
 
+# removed in 2013-05-10
+lib/plugins/info/lang/sl/lang.php
+
+# removed in 2013-04-06
+inc/adLDAP.php
+inc/auth/ad.class.php
+inc/auth/basic.class.php
+inc/auth/ldap.class.php
+inc/auth/mysql.class.php
+inc/auth/pgsql.class.php
+inc/auth/plain.class.php
+
 # removed in 2012-09-10
 lib/images/icon-file.png
 lib/images/icon-thumb.png
diff --git a/data/index/_dummy b/data/index/_dummy
index e69de29bb..e492265be 100644
--- a/data/index/_dummy
+++ b/data/index/_dummy
@@ -0,0 +1 @@
+You can safely delete this file.
\ No newline at end of file
diff --git a/data/locks/_dummy b/data/locks/_dummy
index e69de29bb..e492265be 100644
--- a/data/locks/_dummy
+++ b/data/locks/_dummy
@@ -0,0 +1 @@
+You can safely delete this file.
\ No newline at end of file
diff --git a/data/media_attic/_dummy b/data/media_attic/_dummy
index e69de29bb..e492265be 100644
--- a/data/media_attic/_dummy
+++ b/data/media_attic/_dummy
@@ -0,0 +1 @@
+You can safely delete this file.
\ No newline at end of file
diff --git a/data/media_meta/_dummy b/data/media_meta/_dummy
index e69de29bb..e492265be 100644
--- a/data/media_meta/_dummy
+++ b/data/media_meta/_dummy
@@ -0,0 +1 @@
+You can safely delete this file.
\ No newline at end of file
diff --git a/data/meta/_dummy b/data/meta/_dummy
index e69de29bb..e492265be 100644
--- a/data/meta/_dummy
+++ b/data/meta/_dummy
@@ -0,0 +1 @@
+You can safely delete this file.
\ No newline at end of file
diff --git a/data/pages/wiki/dokuwiki.txt b/data/pages/wiki/dokuwiki.txt
index e6fac5b65..2db4dbef3 100644
--- a/data/pages/wiki/dokuwiki.txt
+++ b/data/pages/wiki/dokuwiki.txt
@@ -57,7 +57,7 @@ All documentation and additional information besides the [[syntax|syntax descrip
 
 ===== Copyright =====
 
-2004-2010 (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)) and the DokuWiki Community
+2004-2013 (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)) and the DokuWiki Community
 
 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 55bbabab2..f2c2864ed 100644
--- a/data/pages/wiki/syntax.txt
+++ b/data/pages/wiki/syntax.txt
@@ -83,9 +83,9 @@ Windows shares like [[\\server\share|this]] are recognized, too. Please note tha
 Notes:
 
   * For security reasons direct browsing of windows shares only works in Microsoft Internet Explorer per default (and only in the "local zone").
-  * For Mozilla and Firefox it can be enabled through different workaround mentioned in the [[http://kb.mozillazine.org/Links_to_local_pages_do_not_work|Mozilla Knowledge Base]]. However, there will still be a JavaScript warning about trying to open a Windows Share. To remove this warning (for all users), put the following line in ''conf/local.protected.php'':
+  * For Mozilla and Firefox it can be enabled through different workaround mentioned in the [[http://kb.mozillazine.org/Links_to_local_pages_do_not_work|Mozilla Knowledge Base]]. However, there will still be a JavaScript warning about trying to open a Windows Share. To remove this warning (for all users), put the following line in ''conf/userscript.js'':
 
-  $lang['js']['nosmblinks'] = '';
+  LANG.nosmblinks = '';
 
 ==== Image Links ====
 
diff --git a/data/tmp/_dummy b/data/tmp/_dummy
index e69de29bb..e492265be 100644
--- a/data/tmp/_dummy
+++ b/data/tmp/_dummy
@@ -0,0 +1 @@
+You can safely delete this file.
\ No newline at end of file