diff options
| -rw-r--r-- | policies/constitution.md | 25 | ||||
| -rw-r--r-- | policies/privacy-policy.md | 2 |
2 files changed, 14 insertions, 13 deletions
diff --git a/policies/constitution.md b/policies/constitution.md index dd05981..a4d6dd2 100644 --- a/policies/constitution.md +++ b/policies/constitution.md @@ -9,16 +9,17 @@ autoupdate: --- # Manasource -Manasource is a federated open source group, composed of several game projects that have spawned throughout the history of the organisation. The Mana World (TMW) is the original game that started as a single open source 2D MMORPG in 2004 and was from the beginning a constantly-evolving prototype. -As new people joined and old people left, different ideas on what to produce started to arise. Thus, The Mana World expanded into an organisation hosting many related projects, including forks of the original game, client adaptations and even plans for new titles inspired by the original game. +Manasource is a federated open source group, with members from several game projects that have spawned throughout the history of the organisation. + +The Mana World started as an open source 2D MMORPG in 2004 and was from the beginning constantly-evolving. Over time forks emerged of the original game and its client, as well as different server software and even plans for new titles inspired by the original game. Manasource is a collaboration between these related projects, managing shared resources like hosting, software and game content. Our software is free and open source and we endorse the principles of free software as defined by the Free Software Foundation. ## Development Projects -- The Mana World is the designation given to the original game server project dating back to 2004; -- Manasource may have other game projects related to or inspired by The Mana World; - - Such game projects administrate their own autonomous development and GM teams; - - A member of a game project's team is not necessarily a Manasource Team member, unless voted so. +- The Mana World is the designation given to the original game dating back to 2004; +- Other games related to or inspired by The Mana World; + - Such projects administrate their own autonomous development and GM teams; + - A member of a project's team is not necessarily a Manasource Team member, unless voted so. ## Manasource Team (MT, Team) Manasource Team is the executive body of Manasource. It is made up of Developers, Administrators and Game Masters with a long history within the organisation. @@ -47,7 +48,7 @@ In order to acquire MT membership, a vote is required within the guidelines esta - Decisions on financial or legal matters affecting Manasource; - Decisions regarding guardianship of inactive projects; - Ultimate arbitration, if requested, in relation to an individual game project that is unable to come to a consensus; -- Formal objections to everyday decisions taken without a vote. Such objections must be raised by at least one MT Member +- Formal objections to everyday decisions taken without a vote. Such objections must be raised by at least one MT member within 30 days of any changes made that they may affect. ### How to conduct a voting poll @@ -62,7 +63,7 @@ within 30 days of any changes made that they may affect. - Any poll conducted in the Manasource Team private section which does not follow the format defined for a voting poll is considered a consultative poll; - Any voting poll which does not gather a minimum of 3 votes is considered a consultative poll; - MT members may open polls simply to gather opinions and not to take binding decisions, in this case they should clearly state in the original post that votes cast are for the purpose of opinion-gathering; -- Consultative polls may be used for governance through consensus unless objected to by a MT Member. +- Consultative polls may be used for governance through consensus unless objected to by a MT member. ### Consensus governance - Consensus-based decisions are taken in the absence of any objections and in the assumption that none would be raised; @@ -70,7 +71,7 @@ within 30 days of any changes made that they may affect. - Further guidelines on consensus governance are outlined [on the wiki](https://wiki.themanaworld.org/index.php/Consensus); - Consensus governance cannot be applied to constitutional changes and legal or financial decisions, which will always require a voting poll; - Consensus may be used to act on certain issues while a voting poll is still open, but only in case it is abundantly clear that a clear opinion has already been reached; -- Any objection by any MT Member will invalidate the consensus process and force a voting poll or enforce the status-quo. +- Any objection by any MT member will invalidate the consensus process and force a voting poll or enforce the status-quo. ### Membership - Members are nominated by one or more Manasource Team members and voted in by MT as a whole; @@ -91,7 +92,7 @@ MT members roughly fit into three categories: Administrators (Admins), Developer - Are those who may have administrator access to essential infrastracture such as the official forum board, wiki, IRC and Discord; - May be tasked in this capacity to manage group memberships; - Are usually those that deal with Account resets/info and aid in GM investigations; -- To become a member of this group, a person must demonstrate the appropriate knowledge and willingness to devote time, as well as an ability to collaborate successfully with the exisitng admin team; +- To become a member of this group, a person must demonstrate the appropriate knowledge and willingness to devote time, as well as an ability to collaborate successfully with the existing admin team; ### Developers (Devs) - Responsible for the development of one or more official Manasource projects; @@ -110,7 +111,7 @@ MT may suspend membership of these groups through consensus and revoke membershi ### Advisers -- To become a member of this group, a person needs to be a prior contributor and MT Member; +- To become a member of this group, a person needs to be a prior contributor and MT member; - MT members may be moved automatically to this group by becoming inactive for a period of 12 months or more; - Inactivity is defined as lack of engagement with Manasource in general or any associated projects, other MT members and particularly one's expected duties within MT; @@ -119,7 +120,7 @@ MT may suspend membership of these groups through consensus and revoke membershi - Advisers are not MT members; - MT members who are Sysadmins may retain ssh access upon becoming Advisers with the unanimous agreement of other Sysadmins; - Advisers typically no longer actively contribute but may choose to do so anyway; -- Allowed to participate in internal discussions, but not allowed to vote as a MT Member; +- Allowed to participate in internal discussions, but not allowed to vote as a MT member; - May be reinstated into MT with a simple voting poll. ### Moderators diff --git a/policies/privacy-policy.md b/policies/privacy-policy.md index 6c527bd..4320aee 100644 --- a/policies/privacy-policy.md +++ b/policies/privacy-policy.md @@ -9,7 +9,7 @@ autoupdate: # Privacy Policy -This is the general Privacy Policy for the Manasource organization ("we", "us", "Manasource", "Manasource Organisation", "MO"), along +This is the general Privacy Policy for the Manasource organization ("we", "us", "Manasource"), along all its services, including websites, forums, wikis, repositories and game servers, Containing information regarding the types of information that is collected and recorded by us. If you have additional questions or require more information about |