two typos

(Commit created by redmine exporter script from page "Faq" version 2)

diff --git a/Faq.textile b/Faq.textile
index 3d4fb44958004fdf2215f7edb8449e7cd1ea0dde..f3fa3e3b7c5c470f10686755ed7a7c2c3baab18b 100644 (file)
--- a/Faq.textile
+++ b/Faq.textile
@@ -3,9 +3,9 @@ h1. Ideas for the Xonotic announcement FAQ
 
 h2. What started the split from Nexuiz?
 
-Vermeulen (the one who started Nexuiz and the development group, Alientrap) decided to license the code of Nexuiz and the Darkplaces engine to a new game development company named Illfonic. Illfonic was to create a new game on the PS3 gaming console. Illfonic decided to use the name "Nexiz" for their game, and Vermeulen allowed them the use the Nexuiz.com domain for their game. The artwork and game code from this console game is not going to be contributed to the original Nexuiz project (now referred to as "Nexuiz GPL"). 
+Vermeulen (the one who started Nexuiz and the development group, Alientrap) decided to license the code of Nexuiz and the Darkplaces engine to a new game development company named Illfonic. Illfonic was to create a new game on the PS3 gaming console. Illfonic decided to use the name "Nexuiz" for their game, and Vermeulen allowed them the use the Nexuiz.com domain for their game. The artwork and game code from this console game is not going to be contributed to the original Nexuiz project (now referred to as "Nexuiz GPL"). 
 
-Most of the Nexuiz contributors responded to this deal negatively, feeling that it was an example of Mushroom Management (link), which is generally not compatible with open source projects. This deal took place over the span of a year, and was done without any discussion with the major contributors/developers of nexuiz, the exception  being LordHavoc, one of the original Nexuiz developers, who worked on porting the game engine (Darkplaces) to PS3.
+Most of the Nexuiz contributors responded to this deal negatively, feeling that it was an example of Mushroom Management (link), which is generally not compatible with open source projects. This deal took place over the span of a year, and was done without any discussion with the major contributors/developers of nexuiz, the exception being LordHavoc, one of the original Nexuiz developers, who worked on porting the game engine (Darkplaces) to PS3.
 
 Most Nexuiz contributors consider this a takeover of the name "Nexuiz" where the original Nexuiz (Nexuiz GPL) will eventually end up as an footnote next to the new game of Nexuiz.