Merge pull request #38 from NottingHack/membership

Added definitions of visitors and guests, other minor changes
NottingHack · Mar 22, 2016 · fa835b9 · fa835b9
2 parents ce2c34f + 05285d7
commit fa835b9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/definitions.rst b/definitions.rst
@@ -7,7 +7,9 @@ The following definitions are used throughout the rules. Where these definitions
 * **Nottinghack** refers to the organisation Nottingham Hackspace Ltd
 * **The Space** refers to the physical area, building or buildings leased or purchased by Nottinghack
 * **Trustee** refers to members elected to ensure the adequate running of Nottinghack
-* **Member** refers to any person currently a member of Nottinghack as defined in section 2 of the Articles. The board maintains a list of all members.
+* **Member** refers to any person currently a member of Nottinghack as defined in section 2 of the Articles. The board maintains a list of all members
 * **Resolution** A resolution of the Board means at least 4 board members agree
-* **N-1 Majority** refers to a majority of the trustees with 0 or 1 trustees disagreeing.
+* **N-1 Majority** refers to a majority of the Trustees with 0 or 1 Trustees disagreeing
 * **Name** refers to the name that a person uses to identify themselves to others
+* A **guest** is a non-member in the space that a current member is wholly responsible for
+* A **visitor** is a non-member who comes to the space during an open event. The responsible Trustee, or workshop facilitator, is wholly responsible for them
diff --git a/guests-and-visitors.rst b/guests-and-visitors.rst
@@ -1,9 +1,9 @@
 Guests & Visitors
 =================
 
-Guests & visitors are **welcome in the Hackspace**, however whoever brings them into the space or lets them into the space is **wholly responsible for them**.
+Guests & visitors are **welcome in the Hackspace**.
 
-You should not let people into the space if you don’t know them, or are unsure if they are a member. If you do then you are responsible for them. Feel free to challenge people to authenticate to GateKeeper (by swiping their card against the door) if you don’t know that they are a member.
+You should not let people into the space if you don't know them, or are unsure if they are a member. If you do then they become your guest and you are responsible for them. Feel free to challenge people to authenticate to GateKeeper (by swiping their card against the door) if you don't know that they are a member.
 
 Included in this are both **children** and **animals** - it is common courtesy to ask on the Google Group before attending the Hackspace with either an animal or a child. The exception to this notification is on open days and nights - members should assume that animals or children may be present at those times.