more updates to r3

(Commit created by redmine exporter script from page "Pr" version 17)

diff --git a/Pr.textile b/Pr.textile
index efd1a42ba8c21e27b4b70c9334f48e6dfb5d1c63..13d9ba06b398b2976c9d5e2f11f4be5965b053ae 100644 (file)
--- a/Pr.textile
+++ b/Pr.textile
@@ -97,9 +97,9 @@ Team Xonotic
 
 h1. v3, edited by a grue -- re-edited by -z-
 
-On March 3rd, 2010, game developer IllFonic[link] announced that they had acquired a commercial, closed-source license for Nexuiz[link], its engine (darkplaces[link]) and the rights to the game's name from Alientrap.  Much to the surprise of everyone who considered themselves part of Alientrap, only Lee Vermeulen (Nexuiz's original creator) was 'Alientrap' in this deal.  After exhausting all options for compromise with Lee and IllFonic, including an open letter from the community[link], it became clear that the deal had been finalized and things were not going to change.  A large portion of the community, including several major Nexuiz developers and contributors, joined together to continue development under a new name, where we can preserve our freedoms, stay open-source and community-based.
+On March 3rd, 2010, game developer IllFonic[link] announced that they had acquired a commercial, closed-source license for Nexuiz[link], its engine (darkplaces[link]) and the rights to the game's name from Alientrap.  Much to the surprise of everyone who considered themselves part of Alientrap, only Lee Vermeulen (Nexuiz's original creator) was 'Alientrap' in this deal.  After exhausting all options for compromise with Lee and IllFonic, including an open letter from the community[link], it became clear that the deal had been finalized and the trust was gone.  A large portion of the community, including several major Nexuiz developers and contributors, joined together to continue development under a new name, to preserve freedoms and better distribute power for such decisions.
 
-While functionality-wise being a direct successor to Nexuiz, the Xonotic[link] project is a rethink and reorganization of how a community creates an open source video game and organizes the services around it. The idea is to bring game development and design under the community control and to change the development process in a way that will make it easier to contribute. The major organizational change is that the decisions affecting the game at large will be made by an elected group of three to six people, XSG (Xonotic Steering Group), with no single person maintaining total control.
+While functionality-wise being a direct successor to Nexuiz, the Xonotic[link] project is a rethink and reorganization of how a community creates an open source video game and organizes the services around it. The idea is to bring game development and design under the community control and streamline the contribution process.  A major organizational structure change is that decisions affecting the game at large will be made by an elected group of three to six people, XSG (Xonotic Steering Group), with no single person maintaining total control.
 
 The major technical change is the transition of development to the Git version control system, which should make collaboration much easier. While the push (i.e. write) access to the master branch will be limited to a few people, many more will have permissions to create and maintain topic branches, which can then be easily tested and integrated into the master.