improved comments, added link to farm.php

2 files changed, 4 insertions, 3 deletions

diff --git a/inc/farm.php b/inc/farm.php
index 05a5d6466..11b33efe7 100644
--- a/inc/farm.php
+++ b/inc/farm.php
@@ -2,8 +2,9 @@
 /**
  * This overwrites DOKU_CONF. Each animal gets its own configuration and data directory.
  * This can be used together with preload.php. See preload.php.dist for an example setup.
+ * For more information see http://www.dokuwiki.org/farms.
  *
- * The farm ($farm) can be any directory and needs to be set.
+ * The farm directory (constant DOKU_FARMDIR) can be any directory and needs to be set.
  * Animals are direct subdirectories of the farm directory.
  * There are two different approaches:
  *  * An .htaccess based setup can use any animal directory name:
@@ -21,7 +22,7 @@
  * @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
 */
 
-// DOKU_FARMDIR needs to be set in preload.php, here the fallback is the same as DOKU_INC (which isn't set yet)
+// DOKU_FARMDIR needs to be set in preload.php, here the fallback is the same as DOKU_INC would be (if it was set already)
 if(!defined('DOKU_FARMDIR')) define('DOKU_FARMDIR', fullpath(dirname(__FILE__).'/../').'/');
 if(!defined('DOKU_CONF')) define('DOKU_CONF', conf_path(DOKU_FARMDIR));
 if(!defined('DOKU_FARM')) define('DOKU_FARM', false);
diff --git a/inc/preload.php.dist b/inc/preload.php.dist
index f4eab2dae..7acda0e3d 100644
--- a/inc/preload.php.dist
+++ b/inc/preload.php.dist
@@ -1,7 +1,7 @@
 <?php
 /**
  * This is an example for a farm setup. Simply copy this file to preload.php and
- * uncomment what you need. See http://dokuwiki.org/farms for more information.
+ * uncomment what you need. See http://www.dokuwiki.org/farms for more information.
  * You can also use preload.php for other things than farming, e.g. for moving
  * local configuration files out of the main ./conf directory.
  */