Merge pull request #7 from 0x20/bug/grammar_nazi

Fixes some grammar issues.

README.md

@@ -20,7 +20,7 @@ This is a description of the system that will run our hackerspace. You will find
 
 *In the series, the order is a book that describes how the silos should be managed. The order is clearly "bad" because all control is an infringement to the freedom of the people. Still, if you progress further in the series, you see that the order is still a good way to manage the people.*
 
-In the series, the order is used to control the people, and to limit their ability to progress. They want to keep the people dumb, so they're easy to manage. However, in our hackerspace, we want to do the exact opposite. Our order should empower people to get the best out of themselves. Our order should stimulate collaboration, and should enable people to think creatively and to solve problems creatively. We know that this system will be flawed from the start. We know that control of people is evil. But a flawed system is better than no system, and we will continuously patch this system to make it better. That is why this is on github. So we can learn from our past mistakes and other people can stand on our shoulders to see further than anyone else.
+In the series, the order is used to control the people, and to limit their ability to progress. They want to keep the people dumb, so they're easy to manage. However, in our hackerspace, we want to do the exact opposite. Our order should empower people to get the best out of themselves. Our order should stimulate collaboration, and should enable people to think creatively and to solve problems creatively. We know that this system will be flawed from the start. We know that control of people is evil. But a flawed system is better than no system, and we will continuously patch this system to make it better. That is why this is on GitHub. So we can learn from our past mistakes and other people can stand on our shoulders to see further than anyone else.
 
 #### [2. The Pact](https://github.com/0x20/HTH/tree/master/pact)
 
@@ -31,7 +31,7 @@ This is the Code of Conduct. This is intended to be a very broad enforced guidel
 Unlike in the series, our pact will be made by the group, and enforced by the group. The group can change the pact as they see fit.
 
 #### [3. The Legacy](https://github.com/0x20/HTH/tree/master/legacy)
-Because every good idea that was once written down has been misinterpreted, we included all the information that led us to the Order and the Pact in this repository as The Legacy. This should by used as a "cypher" to interpret these correctly and to explain a bit of the rationale behind them.
+Because every good idea that was once written down has been misinterpreted, we included all the information that led us to the Order and the Pact in this repository as The Legacy. This should by used as a "cipher" to interpret these correctly and to explain a bit of the rationale behind them.
 
 *In the series, the legacy is a collection of all the information that remains in the old world. It serves as a warning for the people questioning the order. The legacy is only available to a selected number of people, just like the order. The legacy does not include all of history, only certain parts chosen by the people who built the silo.*
 

legacy/The_Fall_of_Hacker_Groups

@@ -51,7 +51,7 @@ The nature of the hacker interests intrinsically poses difficulties:
 growing knowledge on anything is hard. It requires heavy research,
 experimentation, and can turn into an endless journey if objectives are not
 carefully set. Just like in any field of scientific studies, it calls for a
-good amount of colaboration, an attitude which, luckily for hackers, was
+good amount of collaboration, an attitude which, luckily for hackers, was
 greatly enabled by the advent of computer networks and, most notably, the
 Internet.
 
@@ -65,7 +65,7 @@ communities, definitely not. So what went wrong?
 
 --[ 3 - Nowadays
 
-We live in days of limited creativity. Moreover, as contraditory as it may
+We live in days of limited creativity. Moreover, as contradictory as it may
 seem, it looks particularly rare for creativity to arise from groups or
 teams. Communities, rather than individuals, should be more intellectually
 empowered to create, but lately we have been watching the force of the
@@ -76,7 +76,7 @@ In "Time Wars" [1], Mark Fisher explains that post-fordism has taken us to
 this catatonic inability to innovate. Our nearly obsessive compulsion for
 work consumes not only our time, in the literal form of labor hours, but
 our minds, by distracting us from everything else we could be doing
-otherwise. These distractions include our unceasing connection to ubiquous
+otherwise. These distractions include our unceasing connection to ubiquitous
 media (e.g. the frequent checks for new e-mail, or accesses to social
 networks on mobile devices) as well as an increased concern with financial
 stability and provisioning, a concern that grows as welfare is invariably
@@ -124,7 +124,7 @@ Jones [3].
 Well, following (or despite) the prosperous adoption of atheism and
 agnosticism as professed in the Internet and other popular media, it is
 understood that religious beliefs are in a low, taking a bit of what
-socities traditionally saw as a point of unity. In fact, there seems to be
+societies traditionally saw as a point of unity. In fact, there seems to be
 an ever growing search for uniqueness in the modern man, especially that
 from the apparently overpopulated metropolises (see note "B"). In this
 never-ending crowd of interesting, outstanding personas, we want to shine
@@ -139,7 +139,7 @@ Modern life nearly conspires against the collective. We are tormented by a
 relentless flow of information as well as the daily worries of an eternally
 insecure, unwarranted life. Furthermore, we dread the thought of being
 alike, of sharing multiple views and opinions. As such, we are turning
-progressively judgemental of who we should be partnering with, on the basis
+progressively judgmental of who we should be partnering with, on the basis
 that "they do not understand". In hacking, it yet implicates on the
 delicate subject of trust, which would require an essay on itself, given
 the undeniable importance the matter has acquired over the years.
@@ -153,7 +153,7 @@ the mediocracy that our society has condemned our leisure time to.
 
 --[ 5 - Shouts
 
-My only acknowledgements go to whoever reads this through and puts his/her
+My only acknowledgments go to whoever reads this through and puts his/her
 thoughts to it. I eagerly await for your comments.
 
 --[ 6 - Bibliography
@@ -235,7 +235,7 @@ they shift around over time (and will continue shifting).
 The author describes the shifting, at least for hacker groups, as the focus
 has changed from group to solo.
 
-The author makes a difference between collaboration (many, many succesfull 
+The author makes a difference between collaboration (many, many successful 
 open-source projects) and collectives.
 Are we as a hackerspace a collective, working together to achieve a common 
 objective, to have an impact?

order/README.md

@@ -4,7 +4,7 @@ Defines the roles of the different entities that are present in the space.
 
 # [Decision Making Model](decision.md)
 
-A description of the decision making models used in the different enteties of the space.
+A description of the decision making models used in the different entities of the space.
 
 # [Work Flow](flow.md)
 
@@ -12,4 +12,4 @@ The flow how decisions are made in the space.
 
 # [Do-ocracy](do-ocracy.md)
 
-The definition and boundraries of the Do-ocracy
+The definition and boundaries of the Do-ocracy

order/decision.md

@@ -18,9 +18,9 @@ Below outlines the decision making model to be used by this group.
 | Week 3  |     Discuss in group, listen, learn and build compromise      |  Point system    |
 
 ##### week 0: 
-the point is put on the agenda of the weekly meeting and is announced on the mailinglist. This needs to be at least 3 days in advance.
+the point is put on the agenda of the weekly meeting and is announced on the mailing-list. This needs to be at least 3 days in advance.
 ##### week 1: 
-the point is discussed in group and requires a 100% consensus to reach a group decision. The motivation for striving for consensus is because consensus comes with characterics that benefits the hackerspace:
+the point is discussed in group and requires a 100% consensus to reach a group decision. The motivation for striving for consensus is because consensus comes with characteristics that benefits the hackerspace:
   * encourages discussion
   * forced to listen to apposing ideas that can give new insights
   * they can bring smarter compromises
@@ -42,7 +42,7 @@ The point system is a **last-resort** option. This should not be the general pro
   * The proposal with the most points wins
   * In case of tie; revote.
   * ** Number of points per voter  = ** `(#_of_options * 2 ) + 1 `
-  * Results should be given to the group in binary format: what proposal won and what lost. This is to strengten the support of the decision.
+  * Results should be given to the group in binary format: what proposal won and what lost. This is to strengthen the support of the decision.
   
 
 "No decision" is worse than a "bad decision". Conflict has to be solved eventually. That is why there is this last-resort option. However, we want to discourage people from blocking consensus. The point system has the following advantages:
@@ -67,7 +67,7 @@ In the point system, every voter gets some points that he can distribute between
 | B              |                          1   | 4   |
 | TOTAL    |     24                    | **26**   |
 
-As you can see in this example, a less-extreme proposal that, on first sight, has the minority of the votes, can still win. This gives the minority the incentive to come up with moderate ideas that everybode can agree with.
+As you can see in this example, a less-extreme proposal that, on first sight, has the minority of the votes, can still win. This gives the minority the incentive to come up with moderate ideas that everyone can agree with.
 
 | Vote without points        |  Points to A                    | Points to B  |
 | ------------------------------- |:------------------------------:| --------------:|
@@ -83,7 +83,7 @@ As you can see in this example, a less-extreme proposal that, on first sight, ha
 | B              |                          0   | 5   |
 | TOTAL    |   **32**                    | 18   |
 
-However, extreme ideas will not be able to "win". With extreme ideas, the outcome of this model will be the same als with a +50% majority.
+However, extreme ideas will not be able to "win". With extreme ideas, the outcome of this model will be the same as with a +50% majority.
 
 ## Individual
 

order/do-ocracy.md

@@ -2,7 +2,7 @@
 
 ## In short
  * If you want something done: **Just do it!**
- * Have you done something? **Great!, now tell others about it.** Tell them what you did, and why you did it. The mailinglist is a great place to do so. Telling other people about your actions lets them know who to thank and will give you more support.
+ * Have you done something? **Great!, now tell others about it.** Tell them what you did, and why you did it. The mailing-list is a great place to do so. Telling other people about your actions lets them know who to thank and will give you more support.
  * If somebody complains: Either **revert it**, or work out a solution with the person who is complaining.
 
 ## Vision behind it

order/roles.md

@@ -9,14 +9,14 @@ The core group is responsible for
 
   * Finance     
   * Core infrastructure (including safety of core infrastructure)
-  * Extreme conflict between members such as harrasment
+  * Extreme conflict between members such as harassment
   * Communication about these things with Group Of Members
 
 This does not mean that the core group has to do everything themselves. They can "outsource" tasks to other people. However, the core group has to check if these tasks are done properly.
 
-The core group can temporarely ban people from the space as a means of enforcing their responsibility. If they do that, however, they have to send a notice to all members, explaining what they did and why. In the next meeting, the problem has to be discussed so the group can decide upon a permanent solution.
+The core group can temporarily ban people from the space as a means of enforcing their responsibility. If they do that, however, they have to send a notice to all members, explaining what they did and why. In the next meeting, the problem has to be discussed so the group can decide upon a permanent solution.
 
-In certain sensitive cases, like harrasment and conflict between individual members, it is advised that the core group sits down with the concerning parties and tries to find a resolution. When a resolution is found, and it concerns the Group Of Members, the core group proposes the resolution to the Group Of Members. The Group Of Members then has to approve the proposal.
+In certain sensitive cases, like harassment and conflict between individual members, it is advised that the core group sits down with the concerning parties and tries to find a resolution. When a resolution is found, and it concerns the Group Of Members, the core group proposes the resolution to the Group Of Members. The Group Of Members then has to approve the proposal.
       
 # Group Of Members
 
@@ -42,7 +42,7 @@ They are responsible for
 
 # 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 priviliges than 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 Pact. 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.

pact/README.md

@@ -5,7 +5,7 @@ The pact == code of conduct.
 **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](../order/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 eachother 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, 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. 
 
 So the need for basic rules arose, this is an attempt to define these rules.
 
@@ -35,7 +35,7 @@ There is a clear distinction between Personal vs Space projects.
 
 Only members are allowed to have personal property in the space. You get one box where you can leave your stuff. If you need more space for your projects, bring it up in a group meeting.
 
-If you break personal property of another member, you have to fully reïmburse the member's losses.
+If you break personal property of another member, you have to fully reimburse the member's losses.
 
 All personal property that is not in a members box has to be labeled (including tools and machines).
 
@@ -54,28 +54,28 @@ 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!)
- * Tablesaw
+ * Table-saw
 
 #### 2.2.2 Damaging or losing space property
 
-If you damage or lose space property, you have to notice the Group Of Members immediately via the mailinglist. In the mail, you say what happend and if/how you will fix it. If the Group Of Members do not agree to this, they will have to put it forward on the next meeting.
+If you damage or lose space property, you have to notice the Group Of Members immediately via the mailing-list. In the mail, you say what happened and if/how you will fix it. If the Group Of Members do not agree to this, they will have to put it forward on the next meeting.
 
 #### 2.2.3 Taking space property out of the space
 
-Only members are allowed to take space property out of the space. If you takes space property out of the space, you have to notice the Group Of Members imediately via the mailinglist. In the mail, you have to include when you'll return it. If any other member disagrees, you put it back.
+Only members are allowed to take space property out of the space. If you takes space property out of the space, you have to notice the Group Of Members immediately via the mailing-list. In the mail, you have to include when you'll return it. If any other member disagrees, you put it back.
 
 ## 3 Space maintenance
 
 ### 3.1 Cleaning
 
 * 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 thoere untill the next morning. 
+* 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.
 
 ### 3.2 Exit space 
 
-* If you are the last person to leave the space, it's your resposibility to clean up. If you see people leaving, please alert them if they have left their trash in the 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
@@ -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 
- * Mind your voice, volume. If you are talking to someone on the other side of the space everyone inbetween can hear you, move closer.
+ * 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.
  * 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 "libary/office-rules" apply,
+ * 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.
 
 ### 4.2 Network/security
 
-* Just leave other peoples stuff alone, don't post "*funny*" social network statusupdates on unattended logged in computers.
+* Just leave other peoples stuff alone, don't post "*funny*" social network status updates on unattended logged in computers.
-* Don't sniff the network / no ssl-strip /  rougue dhcp / random script-kiddo stuff. It been done before, it's lame.
+* 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.