diff options
| author | Dries Buytaert <dries@buytaert.net> | 2005-11-21 21:33:44 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2005-11-21 21:33:44 +0000 |
| commit | 7a5c5b83a72d8c0e717ab3631af7430bcefe55d2 (patch) | |
| tree | 6b9ed2a275a5f65a62b6229094d91b2249d0d607 | |
| parent | ecc279aef61d7518202b36f8f899168c1a364378 (diff) | |
| download | brdo-7a5c5b83a72d8c0e717ab3631af7430bcefe55d2.tar.gz brdo-7a5c5b83a72d8c0e717ab3631af7430bcefe55d2.tar.bz2 | |
- Patch #35725 by drumm: improved conf_init() documentation.
| -rw-r--r-- | includes/bootstrap.inc | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index 6096ac6b2..a4b7ff6c1 100644 --- a/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -82,29 +82,31 @@ function timer_stop($name) { /** * Locate the appropriate configuration file. * - * Try finding a matching configuration directory by stripping the - * website's hostname from left to right and pathname from right to - * left. The first configuration file found will be used, the - * remaining will ignored. If no configuration file is found, - * return a default value '$confdir/default'. + * Try finding a matching configuration directory by stripping the website's + * hostname from left to right and pathname from right to left. The first + * configuration file found will be used, the remaining will ignored. If no + * configuration file is found, return a default value '$confdir/default'. * * Example for a fictitious site installed at - * http://www.drupal.org/mysite/test/ the 'settings.php' is - * searched in the following directories: + * http://www.drupal.org:8080/mysite/test/ the 'settings.php' is searched in + * the following directories: * - * 1. $confdir/www.drupal.org.mysite.test - * 2. $confdir/drupal.org.mysite.test - * 3. $confdir/org.mysite.test + * 1. $confdir/8080.www.drupal.org.mysite.test + * 2. $confdir/www.drupal.org.mysite.test + * 3. $confdir/drupal.org.mysite.test + * 4. $confdir/org.mysite.test * - * 4. $confdir/www.drupal.org.mysite - * 5. $confdir/drupal.org.mysite - * 6. $confdir/org.mysite + * 5. $confdir/8080.www.drupal.org.mysite + * 6. $confdir/www.drupal.org.mysite + * 7. $confdir/drupal.org.mysite + * 8. $confdir/org.mysite * - * 7. $confdir/www.drupal.org - * 8. $confdir/drupal.org - * 9. $confdir/org + * 9. $confdir/8080.www.drupal.org + * 10. $confdir/www.drupal.org + * 11. $confdir/drupal.org + * 12. $confdir/org * - * 10. $confdir/default + * 13. $confdir/default */ function conf_init() { static $conf = ''; |