merged

README.md

@@ -13,7 +13,11 @@ We created our very own Ghent hackerspace. We had two rules: be excellent to eac
 
 We knew that, in order to fix this, we needed a system that gets the best out of everyone and enables us to be awesome! After long late-night discussions, we came up with HTH. *This git repository contains the organizational structure of our hackerspace. This is intended to be place-agnostic information so it can be used by other hackerspaces around the world.*
 
+<<<<<<< HEAD
 This is divided into 3 parts.
+=======
+This is divided into 3 parts. Because [naming things is very hard](http://xkcd.com/910/) we decided to use the names from the ["Silo" series of Hugh Howey](http://en.wikipedia.org/wiki/Silo_%28series%29). The series follows the life of several people living in underground silos in a post-apocalyptic society.
+>>>>>>> 4d4ece810837524bba901470d3500b0e7a40c863
 
 ### [1. The System](./system)
 

guidelines/README.md

@@ -3,16 +3,16 @@
 **Note:** For now the goal of this page is to collect ideas that YOU think should be part of the
 code of conduct for the space. Each of the points will be agreed upon using [group decision model](../system/decision.md#members-group).
 
-Basically we've come the observation that "*use common sense*" and "*be excellent*" don't always suffice as a *code of conduct*. This is because different people have different realities, different values and morals. We think this diversity is a good thing. However in a communal context where these realities clash with each-other it creates friction and conflict.
+Basically we've come the observation that "*use common sense*" and "*be excellent*" don't always suffice as a *code of conduct*. This is because different people have different realities, values and morals. We think this diversity is a good thing. However in a communal context where these realities clash with each other it creates friction and conflict.
 
-So the need for basic rules arose, this is an attempt to define these rules.
+So the need for guidelines arose, this is an attempt to define these rules.
 
-These basic rules are a practical emanation the two basic rules:
+These guidelines are a practical emanation the two basic rules:
 
 * Use common sense
-* Be excellent to eachother
+* Be excellent to each other
 
-Members are encouraged to apply the two basic rules to the best of their abilities. *Be excellent to eachother* implies treating others the way you want to be treated, which is considered by almost all moral systems as [the golden rule](http://en.wikipedia.org/wiki/Golden_Rule).
+Members are encouraged to apply the two basic rules to the best of their abilities. *Be excellent to each other* implies treating others the way you want to be treated, which is considered by almost all moral systems as [the golden rule](http://en.wikipedia.org/wiki/Golden_Rule).
 
 ## 1 Projects
 
@@ -22,13 +22,13 @@ There is a clear distinction between Personal vs Space projects.
 
 * You have full control over what happens to the project.
 * The property of the project is considered personal property and 2.1 applies to it.
-* You decide what happens to the end-result of the project
+* You decide what happens to the end-result of the project.
 
 ### Space
 
-* Decisions goes through the [Flow](../system/flow.md)
+* Decisions go through the [Flow](../system/flow.md).
 * The property of the project is considered space property and 2.2 applies to it.
-* The Group decides what happens to the end-result of the project
+* The Group decides what happens to the end result of the project.
 
 ## 2 Property and tools
 
@@ -55,7 +55,7 @@ All personal property that is not in a members box has to be labeled (including
 ##### Space property that requires you to follow a workshop before use
 
 * ~~3D printer~~ (Broken: if you can fix it, you're the new expert!)
-* Table-saw
+* Table saw
 
 #### 2.2.2 Damaging or losing space property
 
@@ -72,14 +72,14 @@ Only members are allowed to take space property out of the space. If you takes s
 * Keep the dishes clean: when using the dishes clean your dishes and any dishes that are standing there. When you see other people using the dishes, and they forget cleaning them, give them a gentle reminder.
 * Keep the desks clean, feel free to use the deskspace for your stuff, you can leave your stuff on the desk when you just 'pop out for some food', but leave a note stating when you'll be back. _Do Not_ leave it there until the next morning.
 * Remove empty packaging, from food or beverages.
-* Every once in a while there will be a cleaning day in the space, as an good upstanding member of the community you should attend one of these at least once quarterly. Lots of hands make light work.
+* Every once in a while there will be a cleaning day in the space, as a good upstanding member of the community you should attend one of these at least once quarterly. Many hands make light work.
 
 ### 3.2 Exit space
 
 * If you are the last person to leave the space, it's your responsibility to clean up. If you see people leaving, please alert them if they have left their trash in the space.
 * Switch off all power consuming things
 * Close the roof
-* Read and follow the checklist at the door
+* Read and follow the checklist at the door.
 
 ### 3.3 Throwing things away
 
@@ -92,14 +92,14 @@ Only members are allowed to take space property out of the space. If you takes s
 
 ### 4.1 Noise
 
-* People are trying to concentrate in here so
+* People are trying to concentrate in here so,
 * Mind your voice, volume. If you are talking to someone on the other side of the space everyone in between can hear you, move closer.
-* We know you like $FOO music, but use a headphone or keep the volume low.
+* We know you like $FOO music, but use headphones or keep the volume low.
 * Don't be afraid to ask if you are not intruding/disturbing.
-* Some moments are more 'loud' than others, so it's not always easy to follow. Sometimes "library/office-rules" apply, sometimes workshop-rules and sometimes bar-rules. When in doubt, check with the other members.
+* Some moments are 'louder' than others, so it's not always easy to follow. Sometimes library/office-rules apply, sometimes workshop-rules and sometimes bar-rules. When in doubt, check with the other members.
 
 ### 4.2 Network/security
 
-* Just leave other peoples stuff alone, don't post "*funny*" social network status updates on unattended logged in computers.
+* Just leave other people's stuff alone, don't post "*funny*" social network status updates on unattended logged in computers.
 * Don't sniff the network / no ssl-strip /  rogue dhcp / random script-kiddo stuff. It been done before, it's lame.
-* Don't congest the network with (legal) torrenting, just behave nicely, so we don't have to write an aup.
+* Don't congest the network with (legal) torrenting, just behave nicely, so we don't have to write an AUP.

system/README.md

@@ -12,7 +12,7 @@ A description of the decision making models used in the different entities of th
 
 ## [Work Flow](flow.md)
 
-The flow how decisions are made in the space.
+The flow of how decisions are made in the space.
 
 ## [Do-ocracy](do-ocracy.md)
 

system/board.md

@@ -4,17 +4,17 @@ The board exists to make sure the hacker environment survives. The board are not
 
 Specifically, the board has two roles, and for everything that doesn't fall into these roles, the board are regarded as regular members.
 
-1. *Custodian of the physical core infrastructure of the space.* This stems from the [infrastructure pattern](https://wiki.hackerspaces.org/The_Infrastructure_Pattern). Provide a room with power, internet, a bar and a kitchen and the hackers will come. An important aspect of this is keeping a good relationship with the surroundings as said in the [landlord and neighborhood pattern](https://wiki.hackerspaces.org/The_Landlord_and_Neighbourhood_Pattern).
-2. *Counselor for the people in the space.* When conflict happens that can't be resolved in the group, the board is responsible to resolve the conflict. A great way to do this is [the private talk pattern](https://wiki.hackerspaces.org/The_Private_Talk_Pattern): go talk to the involved parties in private, listen to the person and let them know how the group feels.
+1. *Custodian of the physical core infrastructure of the space.* This stems from [the infrastructure pattern](https://wiki.hackerspaces.org/The_Infrastructure_Pattern). Provide a room with power, internet, a bar and a kitchen and the hackers will come. An important aspect of this is keeping a good relationship with the surroundings as said in [the landlord and neighbourhood pattern](https://wiki.hackerspaces.org/The_Landlord_and_Neighbourhood_Pattern).
+2. *Counselor for the people in the space.* When conflict happens that can't be resolved in the group, the board is responsible for resolving the conflict. A great way to do this is [the private talk pattern](https://wiki.hackerspaces.org/The_Private_Talk_Pattern): go talk to the involved parties in private, listen to the person and let them know how the group feels.
 
-Both jobs are critically important to the space. Many hackerspaces disbanded because they were kicked out by their landlord and many hackerspaces fell apart because of internal conflict. It is important to get the right people in the board. **This is why the board has very little power and only in exceptional circumstances: so it doesn't attract people who want to be in power.**
+Both jobs are critically important to the space. Many hackerspaces disbanded because they were kicked out by their landlord and many hackerspaces fell apart because of internal conflict. It is important to get the right people in the board.  **This is why the board has very little power and only in exceptional circumstances: so it doesn't attract people who want to be in power.**
 
 ## Why is there a board?
 
 There are two reasons why Hackerspace Ghent has a board:
 
 - A Belgian non-profit organization (VZW) requires a board which is legally liable in case something goes wrong. In the past, we had a board on paper, but the space was completely run by consensus. This caused a bunch of issues since the board was legally liable, but it didn't actually have any power to prevent bad things from happening.
-- People don't like conflict and confrontation. If nobody speaks up and actively tries to resolve conflicts, people just ignore it until it explodes, taking down half the space with it. Hackerspace Ghent almost disbanded after such an explosion and we vowed to never have it again. Thus, the board is responsible to speak up and fix conflicts, even if that is really uncomfortable.
+- People don't like conflict and confrontation. If nobody speaks up and actively tries to resolve conflicts, people just ignore it until it explodes, taking down half the space with it. Hackerspace Ghent almost disbanded after such an explosion and we vowed to never have it again. Thus, the board is responsible for speaking up and fixing conflicts, even if that is really uncomfortable.
 
 ## What power does the board have?
 
@@ -24,14 +24,14 @@ The board can temporarily ban people from the space if they think that's necessa
 
 When there's a fire, you call the fire department to come help you. When you want to light a huge 50 meter bonfire, you check with the fire department to see if they think it's safe.
 
-The same applies to the board: talk to the them when there is a big issue and check with them when you do something that's part of their role (custodian and counselor).
+The same applies to the board, talk to the them when there is a big issue and check with them when you do something that's part of their role (custodian and counselor).
 
 Here are some examples of when you should check with the board before you do it.
 
 - If you're spending space money.
-- If you want to make changes to membership fees, the bar, the space shop,..
+- If you want to make changes to membership fees, the bar, the space shop, ...
 - If you want to make changes to the electricity, and internet.
-- If you want to make changes to the space building that affect fire safety, structural integrity, ..
+- If you want to make changes to the space building that affect fire safety, structural integrity, ...
 - People abusing the space, people in the space, or you.
 
 ## Who should be in the board?
@@ -41,4 +41,4 @@ The board does not have any say about what other members are to do, and you want
 - The "custodian" role requires people who are responsible and dependable. The kind of people who say "maybe that's not such a good idea, we might get thrown out if we do that".
 - The "counselor" role requires people who are open communicators, good listeners, and good at diffusing a situation.
 
-Both roles require people who are trusted by the members, are open for feedback, and who communicate openly about what they're doing. Since a position with power is controversial (rightly so) in the hacker community, it's incredibly important that the members trust the people in the board. The board will make difficult decisions and the members need to trust that these decisions are the right ones for the space, not just the right ones for the people in the board.
+Both roles require people who are trusted by the members, are open for feedback, and who communicate openly about what they're doing. Since a position with power is controversial (rightly so) in the hacker community, it's incredibly important that the members trust the people in the board. The board will make difficult decisions and the members need to trust that these decisions are the right ones for the space, not just the right ones for the people in the board.

system/decision.md

@@ -37,11 +37,11 @@ The required 100% consensus also means that a very small minority can block a de
 
 ### week 2
 
-The point is discussed again but now a rough consensus of %80 is applied to reach a decision (https://en.wikipedia.org/wiki/Rough_consensus). If the small minority of last week was not able to convince enough fellow members the decision will be passed with rough consensus of %80. When their viewpoint make enough sense to fellow members, critical mass must be found to reach a new compromise. All members joining the discussion must strive to reach the rough consensus, to build the compromise. Not doing so is not being excellent.
+The point is discussed again but now a rough consensus of 80% is applied to reach a decision (https://en.wikipedia.org/wiki/Rough_consensus). If the small minority of last week was not able to convince enough fellow members the decision will be passed with rough consensus of 80%. When their viewpoint makes enough sense to fellow members, critical mass must be found to reach a new compromise. All members joining the discussion must strive to reach the rough consensus, to build the compromise. Not doing so is not being excellent.
 
 ### week 3
 
-When all has failed, or the problem is too controversial, but a decision is still required the below point system will be used to reach a decision.
+When all has failed, or the problem is too controversial, but a decision is still required, the point system below will be used to reach a decision.
 
 ### Point system
 
@@ -61,7 +61,7 @@ The point system is a **last-resort** option. This should not be the general pro
 * The minority will gain from convincing the majority that their idea is not completely ridiculous.
 * People have the ability to vote for, and thereby support, multiple ideas.
 
-In the point system, every voter gets some points that he can distribute between the different options.
+In the point system, every voter gets some points that they can distribute between the different options.
 
 #### Examples
 
@@ -99,5 +99,5 @@ However, extreme ideas will not be able to "win". With extreme ideas, the outcom
 
 ## Individual
 
-* Every individual has his/her own responsibility's as a member of the group, and thus requires his/her own decision model.
+* Every individual has their own responsibilities as a member of the group, and thus requires their own decision model.
 * An individual is free to choose their own decision model, but keep in mind that you are part of a group.

system/roles.md

@@ -8,14 +8,14 @@ The role of the board is explained in detail in [the board document](board.md).
 
 *The members make and maintain the hacker environment.*
 
-When a conflict/problem can not be resolved between individuals/via do-ocracy or when it impacts the group, a decision is required by the group. Any member can request that a decision is made by the Group Of Members instead of by do-ocracy/individual members.
+When a conflict/problem can not be resolved between individuals/via do-ocracy or when it impacts the group, a group decision is required.  Any member can request that a decision is made by the Group Of Members instead of by do-ocracy/individual members.
 
 They are responsible for
 
 - Creating and patching the guidelines and the system.
 - Solve problems when do-ocracy cannot fix them.
 - Elect board, validate membership decisions made by the board.
-- Organize workshop, events, lectures.
+- Organize workshops, events, lectures.
 
 ## Individual members
 
@@ -24,11 +24,11 @@ They are responsible for
 - Follow [Do-ocracy](do-ocracy.md)
 - Actively try to fix problems
 - Maintain personal safety and that of others
-- To follow and enforce the [Guidelines](../guidelines/README.md).
+- Follow and enforce the [Guidelines](../guidelines/README.md).
 
 ## Non-members
 
 Non-members are also an important part of the space. They can contribute to the hacker environment and they can be potential members. However, non-members have less privileges than members.
 
 - Non-members are only allowed in the space when they are in company of a member. That member is responsible for the actions of the non-member.
-- Non-members have to follow the guidelines. A non-member is not allowed to challenge a decision made by the group. Does the non-member disagree with a decision made by the group, then he/she should become a member and bring the topic forward on a meeting.
+- Non-members have to follow the guidelines. A non-member is not allowed to challenge a decision made by the group. If the non-member disagree with a decision made by the group, then they should become a member and bring the topic forward on a meeting.