Merge pull request #18 from komidore64/bylaw-improvements

Bylaw improvements

Gemfile

@@ -1,2 +1,12 @@
 source 'https://rubygems.org'
-gem 'github-pages', group: :jekyll_plugins
+
+require 'json'
+require 'open-uri'
+
+ghp_vers = JSON.parse(::URI.open('https://pages.github.com/versions.json').read)
+
+ruby "~> #{ghp_vers['ruby']}"
+
+group :jekyll_plugins do
+  gem 'github-pages', "~> #{ghp_vers['github-pages']}"
+end

Gemfile.lock

@@ -1,13 +1,14 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.11.1)
+    activesupport (6.0.3.2)
-      i18n (~> 0.7)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.6.0)
+      zeitwerk (~> 2.2, >= 2.2.2)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
@@ -15,8 +16,8 @@ GEM
     colorator (1.1.0)
     commonmarker (0.17.13)
       ruby-enum (~> 0.5)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
-    dnsruby (1.61.2)
+    dnsruby (1.61.3)
       addressable (~> 2.5)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
@@ -25,33 +26,32 @@ GEM
       ffi (>= 1.3.0)
     eventmachine (1.2.7)
     execjs (2.7.0)
-    faraday (0.15.4)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
-    ffi (1.10.0)
+    ffi (1.13.1)
     forwardable-extended (2.6.0)
     gemoji (3.0.1)
-    github-pages (198)
+    github-pages (206)
-      activesupport (= 4.2.11.1)
       github-pages-health-check (= 1.16.1)
-      jekyll (= 3.8.5)
+      jekyll (= 3.8.7)
-      jekyll-avatar (= 0.6.0)
+      jekyll-avatar (= 0.7.0)
       jekyll-coffeescript (= 1.1.1)
-      jekyll-commonmark-ghpages (= 0.1.5)
+      jekyll-commonmark-ghpages (= 0.1.6)
       jekyll-default-layout (= 0.1.4)
-      jekyll-feed (= 0.11.0)
+      jekyll-feed (= 0.13.0)
       jekyll-gist (= 1.5.0)
-      jekyll-github-metadata (= 2.12.1)
+      jekyll-github-metadata (= 2.13.0)
-      jekyll-mentions (= 1.4.1)
+      jekyll-mentions (= 1.5.1)
-      jekyll-optional-front-matter (= 0.3.0)
+      jekyll-optional-front-matter (= 0.3.2)
       jekyll-paginate (= 1.1.0)
-      jekyll-readme-index (= 0.2.0)
+      jekyll-readme-index (= 0.3.0)
-      jekyll-redirect-from (= 0.14.0)
+      jekyll-redirect-from (= 0.15.0)
-      jekyll-relative-links (= 0.6.0)
+      jekyll-relative-links (= 0.6.1)
-      jekyll-remote-theme (= 0.3.1)
+      jekyll-remote-theme (= 0.4.1)
       jekyll-sass-converter (= 1.5.2)
-      jekyll-seo-tag (= 2.5.0)
+      jekyll-seo-tag (= 2.6.1)
-      jekyll-sitemap (= 1.2.0)
+      jekyll-sitemap (= 1.4.0)
-      jekyll-swiss (= 0.4.0)
+      jekyll-swiss (= 1.0.0)
       jekyll-theme-architect (= 0.1.1)
       jekyll-theme-cayman (= 0.1.1)
       jekyll-theme-dinky (= 0.1.1)
@@ -61,19 +61,18 @@ GEM
       jekyll-theme-midnight (= 0.1.1)
       jekyll-theme-minimal (= 0.1.1)
       jekyll-theme-modernist (= 0.1.1)
-      jekyll-theme-primer (= 0.5.3)
+      jekyll-theme-primer (= 0.5.4)
       jekyll-theme-slate (= 0.1.1)
       jekyll-theme-tactile (= 0.1.1)
       jekyll-theme-time-machine (= 0.1.1)
-      jekyll-titles-from-headings (= 0.5.1)
+      jekyll-titles-from-headings (= 0.5.3)
-      jemoji (= 0.10.2)
+      jemoji (= 0.11.1)
       kramdown (= 1.17.0)
-      liquid (= 4.0.0)
+      liquid (= 4.0.3)
-      listen (= 3.1.5)
       mercenary (~> 0.3)
-      minima (= 2.5.0)
+      minima (= 2.5.1)
-      nokogiri (>= 1.8.5, < 2.0)
+      nokogiri (>= 1.10.4, < 2.0)
-      rouge (= 2.2.1)
+      rouge (= 3.19.0)
       terminal-table (~> 1.4)
     github-pages-health-check (1.16.1)
       addressable (~> 2.3)
@@ -81,13 +80,13 @@ GEM
       octokit (~> 4.0)
       public_suffix (~> 3.0)
       typhoeus (~> 1.3)
-    html-pipeline (2.11.0)
+    html-pipeline (2.13.0)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.8.5)
+    jekyll (3.8.7)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -100,49 +99,50 @@ GEM
       pathutil (~> 0.9)
       rouge (>= 1.7, < 4)
       safe_yaml (~> 1.0)
-    jekyll-avatar (0.6.0)
+    jekyll-avatar (0.7.0)
-      jekyll (~> 3.0)
+      jekyll (>= 3.0, < 5.0)
     jekyll-coffeescript (1.1.1)
       coffee-script (~> 2.2)
       coffee-script-source (~> 1.11.1)
     jekyll-commonmark (1.3.1)
       commonmarker (~> 0.14)
       jekyll (>= 3.7, < 5.0)
-    jekyll-commonmark-ghpages (0.1.5)
+    jekyll-commonmark-ghpages (0.1.6)
       commonmarker (~> 0.17.6)
-      jekyll-commonmark (~> 1)
+      jekyll-commonmark (~> 1.2)
-      rouge (~> 2)
+      rouge (>= 2.0, < 4.0)
     jekyll-default-layout (0.1.4)
       jekyll (~> 3.0)
-    jekyll-feed (0.11.0)
+    jekyll-feed (0.13.0)
-      jekyll (~> 3.3)
+      jekyll (>= 3.7, < 5.0)
     jekyll-gist (1.5.0)
       octokit (~> 4.2)
-    jekyll-github-metadata (2.12.1)
+    jekyll-github-metadata (2.13.0)
-      jekyll (~> 3.4)
+      jekyll (>= 3.4, < 5.0)
       octokit (~> 4.0, != 4.4.0)
-    jekyll-mentions (1.4.1)
+    jekyll-mentions (1.5.1)
       html-pipeline (~> 2.3)
-      jekyll (~> 3.0)
+      jekyll (>= 3.7, < 5.0)
-    jekyll-optional-front-matter (0.3.0)
+    jekyll-optional-front-matter (0.3.2)
-      jekyll (~> 3.0)
+      jekyll (>= 3.0, < 5.0)
     jekyll-paginate (1.1.0)
-    jekyll-readme-index (0.2.0)
+    jekyll-readme-index (0.3.0)
-      jekyll (~> 3.0)
+      jekyll (>= 3.0, < 5.0)
-    jekyll-redirect-from (0.14.0)
+    jekyll-redirect-from (0.15.0)
-      jekyll (~> 3.3)
+      jekyll (>= 3.3, < 5.0)
-    jekyll-relative-links (0.6.0)
+    jekyll-relative-links (0.6.1)
-      jekyll (~> 3.3)
+      jekyll (>= 3.3, < 5.0)
-    jekyll-remote-theme (0.3.1)
+    jekyll-remote-theme (0.4.1)
-      jekyll (~> 3.5)
+      addressable (~> 2.0)
-      rubyzip (>= 1.2.1, < 3.0)
+      jekyll (>= 3.5, < 5.0)
+      rubyzip (>= 1.3.0)
     jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
-    jekyll-seo-tag (2.5.0)
+    jekyll-seo-tag (2.6.1)
-      jekyll (~> 3.3)
+      jekyll (>= 3.3, < 5.0)
-    jekyll-sitemap (1.2.0)
+    jekyll-sitemap (1.4.0)
-      jekyll (~> 3.3)
+      jekyll (>= 3.7, < 5.0)
-    jekyll-swiss (0.4.0)
+    jekyll-swiss (1.0.0)
     jekyll-theme-architect (0.1.1)
       jekyll (~> 3.5)
       jekyll-seo-tag (~> 2.0)
@@ -170,8 +170,8 @@ GEM
     jekyll-theme-modernist (0.1.1)
       jekyll (~> 3.5)
       jekyll-seo-tag (~> 2.0)
-    jekyll-theme-primer (0.5.3)
+    jekyll-theme-primer (0.5.4)
-      jekyll (~> 3.5)
+      jekyll (> 3.5, < 5.0)
       jekyll-github-metadata (~> 2.9)
       jekyll-seo-tag (~> 2.0)
     jekyll-theme-slate (0.1.1)
@@ -183,43 +183,42 @@ GEM
     jekyll-theme-time-machine (0.1.1)
       jekyll (~> 3.5)
       jekyll-seo-tag (~> 2.0)
-    jekyll-titles-from-headings (0.5.1)
+    jekyll-titles-from-headings (0.5.3)
-      jekyll (~> 3.3)
+      jekyll (>= 3.3, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    jemoji (0.10.2)
+    jemoji (0.11.1)
       gemoji (~> 3.0)
       html-pipeline (~> 2.2)
-      jekyll (~> 3.0)
+      jekyll (>= 3.0, < 5.0)
     kramdown (1.17.0)
-    liquid (4.0.0)
+    liquid (4.0.3)
-    listen (3.1.5)
+    listen (3.2.1)
-      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-fsevent (~> 0.10, >= 0.10.3)
-      rb-inotify (~> 0.9, >= 0.9.7)
+      rb-inotify (~> 0.9, >= 0.9.10)
-      ruby_dep (~> 1.2)
     mercenary (0.3.6)
     mini_portile2 (2.4.0)
-    minima (2.5.0)
+    minima (2.5.1)
-      jekyll (~> 3.5)
+      jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    minitest (5.11.3)
+    minitest (5.14.1)
     multipart-post (2.1.1)
-    nokogiri (1.10.8)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    octokit (4.14.0)
+    octokit (4.18.0)
+      faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (3.0.3)
+    public_suffix (3.1.1)
-    rb-fsevent (0.10.3)
+    rb-fsevent (0.10.4)
-    rb-inotify (0.10.0)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rouge (2.2.1)
+    rouge (3.19.0)
-    ruby-enum (0.7.2)
+    ruby-enum (0.8.0)
       i18n
-    ruby_dep (1.5.0)
+    rubyzip (2.3.0)
-    rubyzip (2.0.0)
     safe_yaml (1.0.5)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
@@ -232,17 +231,21 @@ GEM
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
-    typhoeus (1.3.1)
+    typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.7.0)
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  github-pages
+  github-pages (~> 206)
+
+RUBY VERSION
+   ruby 2.5.8p224
 
 BUNDLED WITH
-   2.0.1
+   2.1.4

_config.yml

@@ -1,9 +1,9 @@
 title: Zargon
-email: webmaster@zargon.us
+email: webmaster@zrgn.github.io
 description: >- # this means to ignore newlines until "baseurl:"
   The home for Zargon on the web
 baseurl: "" # the subpath of your site, e.g. /blog
-url: "https://zargon.us"
+url: "https://zrgn.github.io/"
 
 # Exclude from processing.
 # The following items will not be processed, by default. Create a custom list

index.md

@@ -11,53 +11,58 @@ Good humored, cooperative, competitive, consensual torture, for the purposes of
 exploring strategies, design, progress and history of gaming
 
 ### Members
-* You may invite new members to join in gaming, but they are your responsibility
+* There is no single leader of the Zargon community. Zargon is a community run
-* New invitees should come to provisional games (e.g., Friday games) for the
+  effort. All members are encouraged to participate in this effort.
-  sake of the invitee and the group
+* You may invite new members to join in gaming, but they are your
-* If the group at large does not like a guest then that guest may not be allowed
+  responsibility.
-  at future events
+* New invitees should come to provisional games (e.g., Friday games, or similar
-* Players are expected to maintain basic personal hygiene
+  virtual games) for the sake of the invitee and the community.
-* Guests are expected to be gracious and respect additional restrictions of
+* If community members at large do not like a guest then that guest may not be
-  venue (e.g. no smoking inside; no young children; allergy considerations)
+  invited to future events.
+* Members are expected to maintain basic personal hygiene.
+* Members are expected to be gracious and respect additional restrictions of
+  venue (e.g. no smoking inside; no young children; allergy considerations).
 
 ### Games
-* Exhibit good sportsmanship. Be gracious in both victory and defeat
+* Exhibit good sportsmanship. Be gracious in both victory and defeat.
-* Players shall play to the best of their abilities (and not for the purpose of
+* Members shall play to the best of their abilities (and not for the purpose of
-  antagonizing or targeting others)
+  antagonizing or targeting others).
 * Cheating is prohibited and viewed as a grievous violation of the Spirit of
-  Zargon
+  Zargon.
-* If after a few initial explanations of a game's rule, a player requires
+* If after a few initial explanations of a game's rule, a member requires
-  continual clarification, that player may be expected to abstain from the game
+  continual clarification, that member may be expected to abstain from the game
-  until he or she can master the rules outside of gaming sessions.  Watching
+  until they can master the rules outside of a gaming sessions. Watching video
-  video tutorials, private study, or explicit "learning games" are the onus of
+  tutorials, private study, or explicit "learning games" are the onus of the
-  the individual, not the group
+  individual, not the community.
-* Treat game components with respect and care, especially if it is not your game
+* Treat game components with respect and care, especially if it is not your
-* Players shall not repeatedly gripe, grouse, whinge, or whine about the design
+  game.
-  of a game.  Players are expected to have the self-awareness to abstain from
+* Members shall not repeatedly gripe, grouse, whinge, or whine about the design
-  games that they dislike
+  of a game. Members are expected to have the self-awareness to abstain from
-* Players seeking to make improvements to a game should offer suggestions
+  games that they dislike.
-  constructively by making concrete proposals for house rules
+* Members seeking to make improvements to a game should offer suggestions
+  constructively by making concrete proposals for house rules.
 
 ### Infractions
-* It is incumbent on players to bring issues to the attention of the general 
+It is incumbent on members to bring issues to the attention of the community.
-  group.  An issue can't be addressed if no one else is aware it exists.  Either 
+An issue can't be addressed if no one else is aware it exists. Either bring up
-  bring up the issue directly with the other player or speak to some of the 
+the issue directly with the other member or speak to some of the other members
-  other members that you are close with.  If they agree that it's an issue that 
+that you are close with. If they agree that it's an issue that needs
-  needs addressing, the matter should be brought to a group as a whole for discussion.
+addressing, the matter should be brought to the community as a whole for
+discussion.
 
 ### Sanctions
 * Apologize when appropriate
 * Ameliorate the situation (e.g. repair or replace a damaged game; buy person a
   lunch to mend things)
 
-Continued violations may result in ejection from the group, by process of
+Continued violations may result in ejection from the community, by process of
 consensus of active and long-standing members.
 
 ### Code of Conduct
 
 #### Our Pledge
 In the interest of fostering an open and welcoming environment, we pledge to
-making participation in our community a consent based, harassment-free
+make participation in our community a consent based, harassment-free
 experience for everyone, regardless of age, body size, disability, ethnicity,
 gender identity and expression, level of experience, nationality, personal
 appearance, race, religion, or sexual identity and orientation.
@@ -72,22 +77,21 @@ include:
 * Focusing on what is best for the community
 * Showing empathy towards other community members
 
-Examples of unacceptable behavior by participants include:
+Examples of unacceptable behavior by members include:
 
 * The use of sexualized language or imagery and unwelcome sexual attention or
   advances
 * Trolling, insulting/derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing others' private information, such as a physical or electronic
+* Publishing another member's private information, such as a physical or electronic
   address, without explicit permission
 * Other conduct which could reasonably be considered inappropriate in a
   professional setting
 
-Participants asked to stop any harassing behavior are expected to comply
+Members asked to stop any unacceptable behavior are expected to comply
 immediately.
 
 #### Thanks
 This code of conduct is adapted from the [Contributor
-Covenant](http://contributor-covenant.org/), version 1.4, available at
+Covenant](http://contributor-covenant.org/), specifically [version
-http://contributor-covenant.org/version/1/4.
+1.4](http://contributor-covenant.org/version/1/4).
-

zargcon.md

@@ -1,52 +0,0 @@
----
-title: ZargCon Rules
-layout: standard-page
----
-
-# ZargCon
-
-ZargCon is an annual weekend of gaming: board, video, roleplaying, and otherwise. It began with a small group in 2015. ZargCon is a volunteer effort and our fees are always intended to cover our bare minimum expenses.
-
-## When is it?
-
-7—8 December 2019 from 9 a.m to 9 p.m. both days. [Add to Google Cal](https://calendar.google.com/calendar/r/eventedit?text=ZargCon&dates=20191207T140000Z/20191209T020000Z&ctz=America/New_York&details=For+details:+https://zrgn.github.io/zargcon.html&location=Red+Hat+Annex).
-
-## Where is it?
-
-In 2019, we are being hosted by the [Red Hat Tower
-Annex](https://goo.gl/maps/1xa2pdhQokqDxsq57).
-
-* Because this is the place of employment for many of our members, we ask that all attendees take extra care to respect the venue
-* Drinks and snacks provided by Red Hat will not be available to our attendees
-
-
-## How do I register?
-
-Use [this link](https://www.paypal.me/smunilla) and send $5 USD per person in your group. In the payment notes, provide the full name of each attendee you are paying for. Badges will be provided at the door.
-
-## Event Rules
-
-1. No children under 13 years of age may attend
-1. Everyone, regardless of age, should act in a mature, polite, and empathetic manner at all times
-    * Failure to do so will result in a warning, followed by being asked to leave the event for its duration
-1. Label any homemade dishes with allergen information
-1. Label any games you bring as belonging to you somehow.
-    * e.g. a sticker on the inside box cover, a business card in the game components
-1. All attendees are expected to adhere to the Zargon Organization bylaws (https://zrgn.github.io/)
-
-## What should I bring?
-
-* Yourself
-* Any games you want to play
-    * Make a list of the games you are bringing so you can double check that you don't forget to bring anything home
-* Snacks & Beverages
-
-## FAQ
-
-### Can I invite other people?
-
-As long as you're cool with them and you think they won't be jerks, sure! They'll still have to pay however. We will also need a list names for any of your guests.
-
-### Is there a registration cut off?
-
-Yes. Monday Dec 2. Have your registration fee paid and provide your guest list by then.