diff options
| author | Dries Buytaert <dries@buytaert.net> | 2011-09-14 22:47:12 -0400 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2011-09-14 22:47:12 -0400 |
| commit | b20c4dad463d3fc72158055c6f5b45b6a7623152 (patch) | |
| tree | 25fc1188d8237526f969f8d958680cc830e9dbf7 /includes | |
| parent | 051975d69702ee46b693c076bf3b644e49f2d347 (diff) | |
| download | brdo-b20c4dad463d3fc72158055c6f5b45b6a7623152.tar.gz brdo-b20c4dad463d3fc72158055c6f5b45b6a7623152.tar.bz2 | |
- Patch #1273032 by michaellenahan: conf_path() has formatting issue with numbered list.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/bootstrap.inc | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index 8e907f4dc..6f093ad19 100644 --- a/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -489,22 +489,22 @@ function timer_stop($name) { * With a site located at http://www.example.com:8080/mysite/test/, the file, * settings.php, is searched for in the following directories: * - * 1. $confdir/8080.www.example.com.mysite.test - * 2. $confdir/www.example.com.mysite.test - * 3. $confdir/example.com.mysite.test - * 4. $confdir/com.mysite.test - * - * 5. $confdir/8080.www.example.com.mysite - * 6. $confdir/www.example.com.mysite - * 7. $confdir/example.com.mysite - * 8. $confdir/com.mysite - * - * 9. $confdir/8080.www.example.com - * 10. $confdir/www.example.com - * 11. $confdir/example.com - * 12. $confdir/com - * - * 13. $confdir/default + * - $confdir/8080.www.example.com.mysite.test + * - $confdir/www.example.com.mysite.test + * - $confdir/example.com.mysite.test + * - $confdir/com.mysite.test + * + * - $confdir/8080.www.example.com.mysite + * - $confdir/www.example.com.mysite + * - $confdir/example.com.mysite + * - $confdir/com.mysite + * + * - $confdir/8080.www.example.com + * - $confdir/www.example.com + * - $confdir/example.com + * - $confdir/com + * + * - $confdir/default * * If a file named sites.php is present in the $confdir, it will be loaded * prior to scanning for directories. It should define an associative array |