All line endings are now Unix-style.

git-svn-id: https://code.elgg.org/elgg/trunk@3451 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 104 insertions, 104 deletions

diff --git a/engine/settings.example.php b/engine/settings.example.php
index 50af236e4..4fbc716a3 100644
--- a/engine/settings.example.php
+++ b/engine/settings.example.php
@@ -1,98 +1,98 @@
-<?php

-

-	/**

-	 * Elgg settings

-	 * 

-	 * Elgg manages most of its configuration from the admin panel. However, we need you to

-	 * include your database settings below.

-	 * 

-	 * @todo Turn this into something we handle more automatically. 

-	 */

-

-		global $CONFIG;

-		if (!isset($CONFIG))

-			$CONFIG = new stdClass;

-

-	/*

-	 * Standard configuration

-	 * 

-	 * You will use the same database connection for reads and writes.

-	 * This is the easiest configuration, and will suit 99.99% of setups. However, if you're

-	 * running a really popular site, you'll probably want to spread out your database connections

-	 * and implement database replication.  That's beyond the scope of this configuration file

-	 * to explain, but if you know you need it, skip past this section. 

-	 */

-		

-		// Database username

-			$CONFIG->dbuser = '{{CONFIG_DBUSER}}';

-			

-		// Database password

-			$CONFIG->dbpass = '{{CONFIG_DBPASS}}';

-

-		// Database name

-			$CONFIG->dbname = '{{CONFIG_DBNAME}}';

-			

-		// Database server

-		// (For most configurations, you can leave this as 'localhost')

-			$CONFIG->dbhost = '{{CONFIG_DBHOST}}';

-			

-		// Database table prefix

-		// If you're sharing a database with other applications, you will want to use this

-		// to differentiate Elgg's tables.

-			$CONFIG->dbprefix = '{{CONFIG_DBPREFIX}}';

-

-	/*

-	 * Multiple database connections

-	 * 

-	 * Here you can set up multiple connections for reads and writes. To do this, uncomment out

-	 * the lines below. 

-	 */

-			

-	/*

-

-		// Yes! We want to split reads and writes

-			$CONFIG->db->split = true;

-	 

-		// READS

-		// Database username

-			$CONFIG->db['read']->dbuser = "";

-			

-		// Database password

-			$CONFIG->db['read']->dbpass = "";

-

-		// Database name

-			$CONFIG->db['read']->dbname = "";

-			

-		// Database server

-		// (For most configurations, you can leave this as 'localhost')

-			$CONFIG->db['read']->dbhost = "localhost";

-

-		// WRITES

-		// Database username

-			$CONFIG->db['write']->dbuser = "";

-			

-		// Database password

-			$CONFIG->db['write']->dbpass = "";

-

-		// Database name

-			$CONFIG->db['write']->dbname = "";

-			

-		// Database server

-		// (For most configurations, you can leave this as 'localhost')

-			$CONFIG->db['write']->dbhost = "localhost";

-

-

-	 */

-			

-	/*

-	 * For extra connections for both reads and writes, you can turn both

-	 * $CONFIG->db['read'] and $CONFIG->db['write'] into an array, eg:

-	 * 

-	 * 	$CONFIG->db['read'][0]->dbhost = "localhost";

-	 * 

-	 * Note that the array keys must be numeric and consecutive, i.e., they start

-	 * at 0, the next one must be at 1, etc.

-	 */

+<?php
+
+	/**
+	 * Elgg settings
+	 * 
+	 * Elgg manages most of its configuration from the admin panel. However, we need you to
+	 * include your database settings below.
+	 * 
+	 * @todo Turn this into something we handle more automatically. 
+	 */
+
+		global $CONFIG;
+		if (!isset($CONFIG))
+			$CONFIG = new stdClass;
+
+	/*
+	 * Standard configuration
+	 * 
+	 * You will use the same database connection for reads and writes.
+	 * This is the easiest configuration, and will suit 99.99% of setups. However, if you're
+	 * running a really popular site, you'll probably want to spread out your database connections
+	 * and implement database replication.  That's beyond the scope of this configuration file
+	 * to explain, but if you know you need it, skip past this section. 
+	 */
+		
+		// Database username
+			$CONFIG->dbuser = '{{CONFIG_DBUSER}}';
+			
+		// Database password
+			$CONFIG->dbpass = '{{CONFIG_DBPASS}}';
+
+		// Database name
+			$CONFIG->dbname = '{{CONFIG_DBNAME}}';
+			
+		// Database server
+		// (For most configurations, you can leave this as 'localhost')
+			$CONFIG->dbhost = '{{CONFIG_DBHOST}}';
+			
+		// Database table prefix
+		// If you're sharing a database with other applications, you will want to use this
+		// to differentiate Elgg's tables.
+			$CONFIG->dbprefix = '{{CONFIG_DBPREFIX}}';
+
+	/*
+	 * Multiple database connections
+	 * 
+	 * Here you can set up multiple connections for reads and writes. To do this, uncomment out
+	 * the lines below. 
+	 */
+			
+	/*
+
+		// Yes! We want to split reads and writes
+			$CONFIG->db->split = true;
+	 
+		// READS
+		// Database username
+			$CONFIG->db['read']->dbuser = "";
+			
+		// Database password
+			$CONFIG->db['read']->dbpass = "";
+
+		// Database name
+			$CONFIG->db['read']->dbname = "";
+			
+		// Database server
+		// (For most configurations, you can leave this as 'localhost')
+			$CONFIG->db['read']->dbhost = "localhost";
+
+		// WRITES
+		// Database username
+			$CONFIG->db['write']->dbuser = "";
+			
+		// Database password
+			$CONFIG->db['write']->dbpass = "";
+
+		// Database name
+			$CONFIG->db['write']->dbname = "";
+			
+		// Database server
+		// (For most configurations, you can leave this as 'localhost')
+			$CONFIG->db['write']->dbhost = "localhost";
+
+
+	 */
+			
+	/*
+	 * For extra connections for both reads and writes, you can turn both
+	 * $CONFIG->db['read'] and $CONFIG->db['write'] into an array, eg:
+	 * 
+	 * 	$CONFIG->db['read'][0]->dbhost = "localhost";
+	 * 
+	 * Note that the array keys must be numeric and consecutive, i.e., they start
+	 * at 0, the next one must be at 1, etc.
+	 */
 	 
 			
 	/**
@@ -110,7 +110,7 @@
 	//$CONFIG->memcache_servers = array (
 	//	array('server1', 11211),
 	//	array('server2', 11211)
-	//);		

+	//);		
 	
 	/**
 	 * Some work-around flags.
@@ -118,12 +118,12 @@
 	
 	// Try uncommenting the below if your notification emails are not being sent
 	// $CONFIG->broken_mta = true; 
-			

-	/**

-	  * Url - I am not sure if this will be here ?

-	 **/

-	 

-	 // URL

-	    $CONFIG->url = "";

-			

+			
+	/**
+	  * Url - I am not sure if this will be here ?
+	 **/
+	 
+	 // URL
+	    $CONFIG->url = "";
+			
 ?>
\ No newline at end of file