Factions - Revision history

Ctv: /* Major powers */

2007-01-24T04:43:14Z

‎Major powers

2006-06-07T09:59:50Z

‎See also: changed CVS repsitory link to SVN

2006-01-07T13:16:20Z

2006-01-03T10:54:59Z

2005-08-19T04:35:58Z

edited for content

2005-08-14T07:14:22Z

2005-08-13T03:06:27Z

added Rlaan Merchants meme group from old wiki

2005-08-13T02:38:32Z

added aara merchant marine meme group

2005-08-13T02:15:03Z

added fixme to shmrn position

2005-08-13T01:59:59Z

added question concerning the Hunter faction

@@ Line 21: / Line 21: @@
 **[[Faction:Andolian Protectorate|Andolian Protectorate]]
 ***[[Faction:Andolian|Andolian]]
-****[[Faction:Spaceborn|Spaceborn]]
+***[[Faction:Spaceborn|Spaceborn]]
-****[[Faction:Klk'k|Klk'k]]
+***[[Faction:Klk'k|Klk'k]]
-****[[Faction:Purth|Purth]]
+***[[Faction:Purth|Purth]]
 **[[Faction:Highborn|Highborn]]
 **[[Faction:Homeland security|Homeland security]]

@@ Line 69: / Line 69: @@
 =See also=
 * [http://vegastrike.sourceforge.net/phpwiki/index.php/VsManualDbFactions VsManualDbFactions] in the [http://vegastrike.sourceforge.net/phpwiki old wiki]
-* [http://cvs.sourceforge.net/viewcvs.py/vegastrike/history/factions/ ./history/factions/] in [[CVS]]
+* [http://svn.sourceforge.net/viewcvs.cgi/vegastrike/trunk/history/factions/ ./history/factions] in the [[HowTo:Checkout SVN|SVN]] repository
 ----

@@ Line 26: / Line 26: @@
 **[[Faction:Highborn|Highborn]]
 **[[Faction:Homeland security|Homeland security]]
 **[[Faction:Hunter|Hunter]]
 **[[Faction:League of Independent Human Worlds|League of Independent Human Worlds (LIHW)]]
 **[[Faction:Mechanist|Mechanist]]
@@ Line 35: / Line 39: @@
 **[[Faction:Unadorned|Unadorned]]
 ***[[Faction:Mishtali|Mishtali]]

@@ Line 1: / Line 1: @@
-[[Category:Database]] [[Category:Factions]]
+[[Category:Database]] [[Category:Faction]]
 {{NAV_Database |
 | previous=[[Species]]

@@ Line 15: / Line 15: @@
 *'''[[Faction:Aera|Aera]]'''
 **[[Faction:Bzbr|Bzbr]]
-**[[Faction:Merchant Marines|Merchant Marines]]
+**[[Faction:Aeran Merchant Marine|Aeran Merchant Marine]]
@@ Line 21: / Line 21: @@
 **[[Faction:Andolian Protectorate|Andolian Protectorate]]
 ***[[Faction:Andolian|Andolian]]
 ****[[Faction:Klk'k|Klk'k]]
 ****[[Faction:Purth|Purth]]
 **[[Faction:Highborn|Highborn]]
 **[[Faction:Homeland security|Homeland security]]
-**[[Faction:Hunter|Hunter]] ''Old wiki shows this as a Rlaan meme group. Is it in the right faction place? {{Fixme}}
+**[[Faction:Hunter|Hunter]]
 **[[Faction:League of Independent Human Worlds|League of Independent Human Worlds (LIHW)]]
 **[[Faction:Mechanist|Mechanist]]
@@ Line 36: / Line 37: @@
-*'''[[Faction:Rlaan|Rlaan]]'''
+*'''[[Faction:Rlaan|Rlaan Assembly]]'''
 **[[Faction:Enforcers|Enforcers]]
 **[[Faction:Lmpl|Lmpl]]
 **[[Faction:Nuhln|Nuhln]]
 **[[Faction:Rlaan Briin|Rlaan Briin]]
-**[[Faction:Rlaan Merchants|Rlaan Merchants]] ''Found these guys in old wiki, do they go here?''{{Fixme}}
+**[[Faction:Rlaan Hunters|Rlaan Hunters]]
 **[[Faction:Saahasayaay|Saahasayaay]]
@@ Line 57: / Line 59: @@
 *[[Faction:Lightbearer|Lightbearer <defunct>]]
-**[[Faction:Spaceborn|Spaceborn]] {{Fixme}}
 =See also=

@@ Line 46: / Line 46: @@
 ==Minor powers==
 *[[Faction:Forsaken|Forsaken]]
-*[[Faction:Shmrn|Shmrn]] ''Are these guys indipendant after the fall of Lightbearer? Or are they under Andolians?{{Fixme}}
+*[[Faction:Shmrn|Shmrn]]
 *[[Faction:Uln|Uln]]
@@ Line 57: / Line 57: @@
 *[[Faction:Lightbearer|Lightbearer <defunct>]]
-**[[Faction:Spaceborn|Spaceborn]] {{Fixme}} ''Where are these guys? Do they have ships in the game?''
+**[[Faction:Spaceborn|Spaceborn]] {{Fixme}}
 =See also=

← Older revision		Revision as of 02:38, 13 August 2005
Line 15:		Line 15:
	*'''[[Faction:Aera\|Aera]]'''		*'''[[Faction:Aera\|Aera]]'''
	**[[Faction:Bzbr\|Bzbr]]		**[[Faction:Bzbr\|Bzbr]]
		+	**[[Faction:Merchant Marines\|Merchant Marines]]