Skip to content

Commit

Permalink
Replace SEP and INS with REB
Browse files Browse the repository at this point in the history
  • Loading branch information
ahalterman committed Sep 1, 2014
1 parent 80fcb95 commit 902e3dc
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 35 deletions.
16 changes: 8 additions & 8 deletions Phoenix.Countries.actors.txt
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,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]
Expand Down Expand Up @@ -46053,7 +46053,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_
Expand All @@ -46068,7 +46068,7 @@ JABHAT_AL_NUSRA_ ;
+JOULANI_
+ABU_MUHAMMAD_AL_JOULANI_
+AL_JOULANI_
[SYRINSMOS]
[SYRREBMOS]

SUPREME_COUNCIL_OF_THE_SYRIAN_REVOLUTION_ ;
[SYROPP >110101]
Expand All @@ -46087,7 +46087,7 @@ MOAZ_AL_KHATIB_ ;
[SYROPP > 20110101]

SYRIAN_ISLAMIC_FRONT_ ;
[SYRINSMOS]
[SYRREBMOS]

SYRIAN_NATIONAL_COUNCIL_ ;
+SYRIAN_NATIONAL_TRANSITIONAL_COUNCIL_
Expand All @@ -46114,19 +46114,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_
Expand All @@ -46139,7 +46139,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_
Expand Down
58 changes: 31 additions & 27 deletions Phoenix.agents.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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]
Expand Down

0 comments on commit 902e3dc

Please sign in to comment.