From 12243cf285e643a5e6532184f464d9520baf88be Mon Sep 17 00:00:00 2001
From: gunnar_g <gunnar_g@localhost>
Date: Tue, 14 Feb 2012 12:17:57 +0000
Subject: [PATCH] Remove the old links to _short leagues.  These do not exist
 anymore

---
 .../mexico/cup_mexico_concacaf.xml            |  8 ++---
 .../mexico/cup_mexico_libertadores.xml        | 32 +++++++++----------
 .../north_america/usa/cup_usa_concacaf.xml    |  8 ++---
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/support_files/definitions/north_america/mexico/cup_mexico_concacaf.xml b/support_files/definitions/north_america/mexico/cup_mexico_concacaf.xml
index 6bb0c66b..bc936aa5 100644
--- a/support_files/definitions/north_america/mexico/cup_mexico_concacaf.xml
+++ b/support_files/definitions/north_america/mexico/cup_mexico_concacaf.xml
@@ -22,19 +22,19 @@
 					<end_idx>2</end_idx>
 				</choose_team>
 				<choose_team>
-					<choose_team_sid>costa_rica1_short</choose_team_sid>
+					<choose_team_sid>costa_rica1</choose_team_sid>
 					<number_of_teams>2</number_of_teams>
 					<randomly>1</randomly>
 					<generate>1</generate>
 				</choose_team>
 				<choose_team>
-					<choose_team_sid>honduras1_short</choose_team_sid>
+					<choose_team_sid>honduras1</choose_team_sid>
 					<number_of_teams>1</number_of_teams>
 					<randomly>1</randomly>
 					<generate>1</generate>
 				</choose_team>
 				<choose_team>
-					<choose_team_sid>jamaica1_short</choose_team_sid>
+					<choose_team_sid>jamaica1</choose_team_sid>
 					<number_of_teams>1</number_of_teams>
 					<randomly>1</randomly>
 					<generate>1</generate>
@@ -64,4 +64,4 @@
 		<cup_round>
 		</cup_round>
 	</cup_rounds>
-</cup>
\ No newline at end of file
+</cup>
diff --git a/support_files/definitions/north_america/mexico/cup_mexico_libertadores.xml b/support_files/definitions/north_america/mexico/cup_mexico_libertadores.xml
index 350bded0..c6c939bf 100644
--- a/support_files/definitions/north_america/mexico/cup_mexico_libertadores.xml
+++ b/support_files/definitions/north_america/mexico/cup_mexico_libertadores.xml
@@ -34,56 +34,56 @@
 			  </choose_team>
 			  
 			  <choose_team>
-				  <choose_team_sid>colombia1_short</choose_team_sid>
+				  <choose_team_sid>colombia1</choose_team_sid>
 				  <number_of_teams>1</number_of_teams>
 				  <randomly>1</randomly>
 				  <generate>1</generate>
 			  </choose_team>
 			  
 			  <choose_team>
-				  <choose_team_sid>ecuador1_short</choose_team_sid>
+				  <choose_team_sid>ecuador1</choose_team_sid>
 				  <number_of_teams>1</number_of_teams>
 				  <randomly>1</randomly>
 				  <generate>1</generate>
 			  </choose_team>
 			  
 			  <choose_team>
-				  <choose_team_sid>paraguay1_short</choose_team_sid>
+				  <choose_team_sid>paraguay1</choose_team_sid>
 				  <number_of_teams>1</number_of_teams>
 				  <randomly>1</randomly>
 				  <generate>1</generate>
 			  </choose_team>
 			  
 			  <choose_team>
-				  <choose_team_sid>venezuela1_short</choose_team_sid>
+				  <choose_team_sid>venezuela1</choose_team_sid>
 				  <number_of_teams>1</number_of_teams>
 				  <randomly>1</randomly>
 				  <generate>1</generate>
 			  </choose_team>
 			  
 			  <choose_team>
-				  <choose_team_sid>chile1_short</choose_team_sid>
+				  <choose_team_sid>chile1</choose_team_sid>
 				  <number_of_teams>1</number_of_teams>
 				  <randomly>1</randomly>
 				  <generate>1</generate>
 			  </choose_team>
 			  
 			  <choose_team>
-				  <choose_team_sid>uruguay1_short</choose_team_sid>
+				  <choose_team_sid>uruguay1</choose_team_sid>
 				  <number_of_teams>1</number_of_teams>
 				  <randomly>1</randomly>
 				  <generate>1</generate>
 			  </choose_team>
 			  
 			  <choose_team>
-				  <choose_team_sid>bolivia1_short</choose_team_sid>
+				  <choose_team_sid>bolivia1</choose_team_sid>
 				  <number_of_teams>1</number_of_teams>
 				  <randomly>1</randomly>
 				  <generate>1</generate>
 			  </choose_team>
 			  
 			  <choose_team>
-				  <choose_team_sid>peru1_short</choose_team_sid>
+				  <choose_team_sid>peru1</choose_team_sid>
 				  <number_of_teams>1</number_of_teams>
 				  <randomly>1</randomly>
 				  <generate>1</generate>
@@ -127,56 +127,56 @@
 			  </choose_team>
 			  
 			  <choose_team>
-				  <choose_team_sid>colombia1_short</choose_team_sid>
+				  <choose_team_sid>colombia1</choose_team_sid>
 				  <number_of_teams>2</number_of_teams>
 				  <randomly>1</randomly>
 				  <generate>1</generate>
 			  </choose_team>
 			  
 			  <choose_team>
-				  <choose_team_sid>ecuador1_short</choose_team_sid>
+				  <choose_team_sid>ecuador1</choose_team_sid>
 				  <number_of_teams>2</number_of_teams>
 				  <randomly>1</randomly>
 				  <generate>1</generate>
 			  </choose_team>
 			  
 			  <choose_team>
-				  <choose_team_sid>paraguay1_short</choose_team_sid>
+				  <choose_team_sid>paraguay1</choose_team_sid>
 				  <number_of_teams>2</number_of_teams>
 				  <randomly>1</randomly>
 				  <generate>1</generate>
 			  </choose_team>
 			  
 			  <choose_team>
-				  <choose_team_sid>venezuela1_short</choose_team_sid>
+				  <choose_team_sid>venezuela1</choose_team_sid>
 				  <number_of_teams>2</number_of_teams>
 				  <randomly>1</randomly>
 				  <generate>1</generate>
 			  </choose_team>
 			  
 			  <choose_team>
-				  <choose_team_sid>chile1_short</choose_team_sid>
+				  <choose_team_sid>chile1</choose_team_sid>
 				  <number_of_teams>2</number_of_teams>
 				  <randomly>1</randomly>
 				  <generate>1</generate>
 			  </choose_team>
 			  
 			  <choose_team>
-				  <choose_team_sid>uruguay1_short</choose_team_sid>
+				  <choose_team_sid>uruguay1</choose_team_sid>
 				  <number_of_teams>2</number_of_teams>
 				  <randomly>1</randomly>
 				  <generate>1</generate>
 			  </choose_team>
 			  
 			  <choose_team>
-				  <choose_team_sid>bolivia1_short</choose_team_sid>
+				  <choose_team_sid>bolivia1</choose_team_sid>
 				  <number_of_teams>2</number_of_teams>
 				  <randomly>1</randomly>
 				  <generate>1</generate>
 			  </choose_team>
 			  
 			  <choose_team>
-				  <choose_team_sid>peru1_short</choose_team_sid>
+				  <choose_team_sid>peru1</choose_team_sid>
 				  <number_of_teams>2</number_of_teams>
 				  <randomly>1</randomly>
 				  <generate>1</generate>
diff --git a/support_files/definitions/north_america/usa/cup_usa_concacaf.xml b/support_files/definitions/north_america/usa/cup_usa_concacaf.xml
index 7e8e8b43..35d11d16 100644
--- a/support_files/definitions/north_america/usa/cup_usa_concacaf.xml
+++ b/support_files/definitions/north_america/usa/cup_usa_concacaf.xml
@@ -34,19 +34,19 @@
 					<end_idx>1</end_idx>
 				</choose_team>
 				<choose_team>
-					<choose_team_sid>costa_rica1_short</choose_team_sid>
+					<choose_team_sid>costa_rica1</choose_team_sid>
 					<number_of_teams>2</number_of_teams>
 					<randomly>1</randomly>
 					<generate>1</generate>
 				</choose_team>
 				<choose_team>
-					<choose_team_sid>honduras1_short</choose_team_sid>
+					<choose_team_sid>honduras1</choose_team_sid>
 					<number_of_teams>1</number_of_teams>
 					<randomly>1</randomly>
 					<generate>1</generate>
 				</choose_team>
 				<choose_team>
-					<choose_team_sid>jamaica1_short</choose_team_sid>
+					<choose_team_sid>jamaica1</choose_team_sid>
 					<number_of_teams>1</number_of_teams>
 					<randomly>1</randomly>
 					<generate>1</generate>
@@ -64,4 +64,4 @@
 		<cup_round>
 		</cup_round>
 	</cup_rounds>
-</cup>
\ No newline at end of file
+</cup>