Merge pull request #16 from openeventdata/dev

No more SEP and INS, more South Sudan

Phoenix.Countries.actors.txt

@@ -206,7 +206,7 @@ AHMED_ZIA_MASSOUD_
 	[AFGGOV 20041207-20091119]
 	[AFGELI]
 AHMED_SHAH_MASSOUD_
-	[AFGINS 19790706-20110909] # maybe ELI or UAF post-Soviet?
+	[AFGREB 19790706-20110909] # maybe ELI or UAF post-Soviet?
 ABDUL_RAHIM_GHAFOORZAI_  ; CountryInfo.txt
 	[AFGGOV 970811-970821]
 	[AFGELI]
@@ -42996,19 +42996,45 @@ YU_IN_CHON_  ; CountryInfo.txt
 YU_MYUNG_HWAN_  ; CountryInfo.txt
 	[KORGOVBUS 080401-100930]
 
-+SOUTH_SUDANESE_ 
+SOUTH_SUDAN
++SOUTH_SUDANESE 
 +REPUBLIC_OF_SOUTH_SUDAN_ 
 +JUBA_ 
-+RAMCIEL___#_LIKELY_TO_EVENTUALLY_BECOME_A_FEDERAL_DISTRICT/CAPITAL_ 
++RAMCIEL___#_LIKELY_TO_EVENTUALLY_BECOME_A_FEDERAL_DISTRICT/CAPITAL_
++JONGLEI
++BENTIU
 	[SDNSSD <20050709]
 	[SDNSSDAUT 1920050709-20110709]
-	[SSD >20110709]
+    [SSD >20110709]
+SUDAN_PEOPLES_LIBERATION_MOVEMENT # Still need to deal with apostrophes
+SUDAN_PEOPLE'S_LIBERATION_MOVEMENT
+    [SDNREB 19830516-20050109] # recog by gov as ruling party of S.Sudan aut. reg.
+    [SDNGOVPTY 20050109-20071011] # then withdrew from gov
+    [SDNOPPPTY 20071011-20110711] # Need to consistently implement PTY
+    [SDNGOVPTY >20110711]
+SUDAN_PEOPLE'S_LIBERATION_ARMY
++SUDAN_PEOPLES_LIBERATION_ARMY
++SPLA
+    [SDNREB 19830101-20110711]
+    [SSDMIL >20110711]
+# President
 SALVA_KIIR_MAYARDIT  ; CountryInfo.txt
++SALVA_KIIR
++PRESIDENT_KIIR
++PRESIDENT_SALVA_KIIR
+    [SSDGOV >110709]
 	[SSDGOV >110709]
 	[SSDELI]
 RIEK_MACHAR_TENY_DHURGON_  ; CountryInfo.txt
++RIEK_MACHAR
++VICE_PRESIDENT_RIEK_MACHAR
+    [SSDGOV 20110709-20130723]
+    [SSDELI]
 	[SSDGOV >110709]
+JAMES_WANI_IGGA
+    [SSDGOV >20130825]
 BETTY_ACHAN_OGWARO_  ; CountryInfo.txt
++BETTY_OGWARO
 	[SSDGOVAGR >110709]
 MARTIN_ELIA_LOMURO_  ; CountryInfo.txt
 	[SSDGOVAGR >110709]
@@ -43052,7 +43078,7 @@ AWUT_DENG_ACUIL_  ; CountryInfo.txt
 	[SSDGOV >110709]
 OYAY_DENG_AJAK_  ; CountryInfo.txt
 	[SSDGOV >110709]
-EMMANUEL_LOWILLA__  ; CountryInfo.txt
+EMMANUEL_LOWILLA_  ; CountryInfo.txt
 	[SSDGOV >110709]
 MICHAEL MAKUEI LUETH_  ; CountryInfo.txt
 	[SSDGOV >110709]
@@ -45064,7 +45090,7 @@ JAISH_AL_MUHAJIREEN_WAL_ANSAR_ ;
 +ABU_OMAR_AL-SHISHANI_
 +SALAHUDDIN_AL-CHECHEN_
 +SALAHUDDIN_AL-CHECHEN_
-	[SYRINS >120401]
+	[SYRREB >120401]
 
 JABHAT_AL_NUSRA_  ; 
 +NUSRA_FRONT_
@@ -45079,7 +45105,7 @@ JABHAT_AL_NUSRA_  ;
 +JOULANI_
 +ABU_MUHAMMAD_AL_JOULANI_
 +AL_JOULANI_
-	[SYRINSMOS]
+	[SYRREBMOS]
 
 SUPREME_COUNCIL_OF_THE_SYRIAN_REVOLUTION_ ; 
 	[SYROPP >110101]
@@ -45098,7 +45124,7 @@ MOAZ_AL_KHATIB_ ;
 	[SYROPP > 20110101]
 
 SYRIAN_ISLAMIC_FRONT_ ; 
-	[SYRINSMOS]
+	[SYRREBMOS]
 
 SYRIAN_NATIONAL_COUNCIL_ ; 
 +SYRIAN_NATIONAL_TRANSITIONAL_COUNCIL_
@@ -45125,19 +45151,19 @@ AHRAR_AL_SHAM_ ;
 +HARAKAT_AHRAR_AL-SHAM_AL-ISLAMIYYA_
 +ABU_OBEIDA_AL_BINNISHI_
 +ABU_OBEIDA_AL-BINNISHI_
-	[SYRINSMOS]
+	[SYRREBMOS]
 
 SUQOUR_AL_SHAM_BRIGADE_ ; 
 +SUQOUR_AL-SHAM_BRIGADE_
 +SHAM_FALCONS_BRIGADE_
 +AHMED_ABU_ISSA_
 +ABU_HUSSEIN_AL_DIK_
 +ABU_HUSSEIN_AL-DIK_
-	[SYRINS]
+	[SYRREB]
 
 GHURABA_AL_SHAM_ ; 
 GHURABA_AL-SHAM_
-	[SYRINSMOS]
+	[SYRREBMOS]
 
 TAWHID_BRIGADE_ ; 
 +AL_TAWHID_BRIGADE_
@@ -45150,7 +45176,7 @@ TAWHID_BRIGADE_ ;
 +FURSAN_AL_JABAL_BRIGADE_
 +FURSAN_AL-JABAL_BRIGADE_
 +ABU_FURAT_
-	[SYRINS >120701]
+	[SYRREB >120701]
 
 JAYSH_AL_SHA'BI_ ; 
 +JAYSH_AL-SHA'BI_

Phoenix.agents.txt

@@ -1284,15 +1284,17 @@ RIGHTS_ACTIVIST [~HRI]
 RIGHTS_GROUP [~HRI]
 HUMAN_RIGHTS_GROUP [~HRI]
 
-COMMUNIST_REBEL [~INS]
-COUP_D'ETAT_LEADER [~INS]
-COUP_LEADER [~INS]
-COUP_MAKER [~INS]
-COUP_PLOTTER [~INS]
+# Need Jay or someone else to look these over.
+# MIL if they're mil, and REB if not mentioned?
+COMMUNIST_REBEL [~REB]
+COUP_D'ETAT_LEADER [~REB]
+COUP_LEADER [~REB]
+COUP_MAKER [~REB]
+COUP_PLOTTER [~REB]
 
 INTERNATIONAL_TERRORIST [~IMG]
-MILITARY_COUP_D'ETAT_LEADER [~INS]
-MILITARY_COUP_LEADER [~INS]
+MILITARY_COUP_D'ETAT_LEADER [~MIL]
+MILITARY_COUP_LEADER [~MIL]
 
 CANTOR [~JEW]
 HEBREW  [~JEW]
@@ -2058,27 +2060,29 @@ RELIGIOUS_LEADER [~REL]
 WORSHIPER [~REL]
 WORSHIPPER [~REL]
 
-ARMED_SEPARATIST [~SEP]
-ARMED_SEPARATIST_MOVEMENT [~SEP]
-ARMY_FOR_THE_LIBERATION_  [~SEP]
-ETHNIC_SEPARATISTS [~SEP]
-FRONT_FOR_THE_LIBERATION_  [~SEP]
-LIBERATION_ARMY_  [~SEP]
-LIBERATION_FORCES_  [~SEP]
-LIBERATION_FRONT_  [~SEP]
-LIBERATION_MOVEMENT  [~SEP]
-POPULAR_MOVEMENT_FOR_THE_LIBERATION_  [~SEP]
-PRO_INDEPENDENCE_ACTIVIST [~SEP]
-REBEL_SEPARATIST [~SEP]
-SEPARATIST [~SEP]
-SEPARATIST_GROUP [~SEP]
-SEPARATIST_GUERRILLA [~SEP]
-SEPARATIST_LEADER [~SEP]
-SEPARATIST_MILITANT [~SEP]
-SEPARATIST_MOVEMENT [~SEP]
-SEPARATIST_REBEL [~SEP]
+# SEP is depreciated. Some SEPs are OPP instead of REB, though
+ARMED_SEPARATIST [~REB]
+ARMED_SEPARATIST_MOVEMENT [~REB]
+ARMY_FOR_THE_LIBERATION_  [~REB]
+ETHNIC_SEPARATISTS [~REB] # ?
+FRONT_FOR_THE_LIBERATION_  [~REB]
+LIBERATION_ARMY_  [~REB]
+LIBERATION_FORCES_  [~REB]
+LIBERATION_FRONT_  [~REB]
+LIBERATION_MOVEMENT  [~OPP]
+POPULAR_MOVEMENT_FOR_THE_LIBERATION_  [~REB]
+PRO_INDEPENDENCE_ACTIVIST [~OPP] # ? REB seemed wrong
+REBEL_SEPARATIST [~REB]
+SEPARATIST [~REB]
+SEPARATIST_GROUP [~REB]
+SEPARATIST_GUERRILLA [~REB]
+SEPARATIST_LEADER [~REB]
+SEPARATIST_MILITANT [~REB]
+SEPARATIST_MOVEMENT [~REB]
+SEPARATIST_REBEL [~REB]
 
-SETTLER [~SET]
+# Only use of SET in the dictionaries. Changed to CVL
+SETTLER [~CVL]
 
 CHIEF_OF_INTELLIGENCE [~SPY]
 FOREIGN_INTELLIGENCE_SERVICE [~SPY]