Merge branch 'master' into stable

12 files changed, 50 insertions, 2 deletions

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..4b9657da2 100644
--- a/data/deleted.files
+++ b/data/deleted.files
@@ -4,6 +4,15 @@
 # A copy of this list is maintained at
 # http://www.dokuwiki.org/install:upgrade#files_to_remove
 
+# 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/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/pages/wiki/welcome.txt b/data/pages/wiki/welcome.txt
new file mode 100644
index 000000000..6978f1b14
--- /dev/null
+++ b/data/pages/wiki/welcome.txt
@@ -0,0 +1,30 @@
+====== Welcome to your new DokuWiki ======
+
+Congratulations, your wiki is now up and running. Here are a few more tips to get you started.
+
+Enjoy your work with DokuWiki,\\
+-- the developers
+
+===== Create your first pages =====
+
+Your wiki needs to have a start page. As long as it doesn't exist, this link will be red: [[:start]].
+
+Go on, follow that link and create the page. If you need help with using the syntax you can always refer to the [[wiki:syntax|syntax page]].
+
+You might also want to use a sidebar. To create it, just edit the [[:sidebar]] page. Everything in that page will be shown in a margin column on the side. Read our [[doku>faq:sidebar|FAQ on sidebars]] to learn more.
+
+Please be aware that not all templates support sidebars.
+
+===== Customize your Wiki =====
+
+Once you're comfortable with creating and editing pages you might want to have a look at the [[this>doku.php?do=admin&page=config|configuration settings]] (be sure to login as superuser first).
+
+You may also want to see what [[doku>plugins|plugins]] and [[doku>templates|templates]] are available at DokuWiki.org to extend the functionality and looks of your DokuWiki installation.
+
+===== Join the Community =====
+
+DokuWiki is an Open Source project that thrives through user contributions. A good way to stay informed on what's going on and to get useful tips in using DokuWiki is subscribing to the [[doku>newsletter]].
+
+The [[http://forum.dokuwiki.org|DokuWiki User Forum]] is an excellent way to get in contact with other DokuWiki users and is just one of the many ways to get [[doku>faq:support|support]].
+
+Of course we'd be more than happy to have you [[doku>teams:getting_involved|getting involved]] with DokuWiki.
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