Added support for multiple uplink blocks in the new config.

Moved the type and id directives from the uplink block to the serverinfo block.
Small config fixes.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1746 5417fbe8-f217-4b02-8779-1006273d7864

data/example_new.conf

@@ -80,19 +80,6 @@
  */
 uplink
 {
-	/*
-	 * This directive instructs Anope which IRCd Protocol to speak when connecting.
-	 * You MUST modify this to match the IRCd you run.
-	 *
-	 * Supported:
-	 *  - inspircd11
-	 *  - ratbox
-	 *  - bahamut
-	 *  - charybdis
-	 *  - unreal32
-	 */
-	type = "inspircd11"
-
 	/*
 	 * The IP or hostname of the IRC server you wish to connect Services to.
 	 * Usually, you will want to connect Services over 127.0.0.1 (aka localhost).
@@ -117,12 +104,6 @@ uplink
 	 * Refer to your IRCd documentation for more information on link blocks.
 	 */
 	password = "mypassword"
-
-	/*
-	 * What Server ID to use for this connection?
-	 * Note: This should *ONLY* be used for TS6/P10 IRCds.
-	 */
-	#id = "64"
 }
 
 /*
@@ -146,6 +127,25 @@ serverinfo {
 	 */
 	description = "Services for IRC Networks"
 
+	/*
+	 * This directive instructs Anope which IRCd Protocol to speak when connecting.
+	 * You MUST modify this to match the IRCd you run.
+	 *
+	 * Supported:
+	 *  - inspircd11
+	 *  - ratbox
+	 *  - bahamut
+	 *  - charybdis
+	 *  - unreal32
+	 */
+	type = "inspircd11"
+
+	/*
+	 * What Server ID to use for this connection?
+	 * Note: This should *ONLY* be used for TS6/P10 IRCds.
+	 */
+	#id = "64"
+
 	/*
 	 * These identify the ident@hostname which will be used by the Serivces pesudoclients.
 	 * They can be overridden by the -user and -host command-line options when starting