Merge pull request #369 from Relequestual/2020-12-update

2020 12 update

.gitmodules

@@ -26,3 +26,7 @@
 [submodule "_includes/draft/2019-09"]
 	path = _includes/draft/2019-09
 	url = https://github.com/json-schema-org/json-schema-spec.git
+[submodule "_includes/draft/2020-12"]
+	path = _includes/draft/2020-12
+	url = https://github.com/json-schema-org/json-schema-spec.git
+	branch = 2020-12

Gemfile.lock

@@ -247,4 +247,4 @@ DEPENDENCIES
   github-pages
 
 BUNDLED WITH
-   1.16.1
+   2.2.7

README.md

@@ -12,10 +12,36 @@ For the current status of issues and pull requests, please see the following bad
 [![Available](https://img.shields.io/github/issues/json-schema-org/json-schema-org.github.io/Status:%20Available.svg?color=brightgreen)](https://github.com/json-schema-org/json-schema-org.github.io/issues?q=is%3Aopen+is%3Aissue+label%3A%22Status%3A+Available%22) [![In Progress](https://img.shields.io/github/issues/json-schema-org/json-schema-org.github.io/Status:%20In%20Progress.svg)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Status:%20In%20Progress) [![Review Needed](https://img.shields.io/github/issues/json-schema-org/json-schema-org.github.io/Status:%20Review%20Needed.svg)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Status%3A%20Review%20Needed)
 
 [![Critical](https://img.shields.io/github/issues/json-schema-org/json-schema-org.github.io/Priority:%20Critical.svg?color=critical
-)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Priority%3A%20Critical) [![High](https://img.shields.io/github/issues/json-schema-org/json-schema-org.github.io/Priority:%20High.svg?color=important)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Priority%3A%20High) [![Medium](https://img.shields.io/github/issues/json-schema-org/json-schema-org.github.io/Priority:%20Medium.svg)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Priority%3A%20Medium) [![Low](https://img.shields.io/github/issues/json-schema-org/json-schema-org.github.io/Priority:%20Low.svg)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Priority%3A%20Low) 
+)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Priority%3A%20Critical) [![High](https://img.shields.io/github/issues/json-schema-org/json-schema-org.github.io/Priority:%20High.svg?color=important)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Priority%3A%20High) [![Medium](https://img.shields.io/github/issues/json-schema-org/json-schema-org.github.io/Priority:%20Medium.svg)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Priority%3A%20Medium) [![Low](https://img.shields.io/github/issues/json-schema-org/json-schema-org.github.io/Priority:%20Low.svg)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Priority%3A%20Low)
 
 Labels are assigned based on [Sensible Github Labels](https://github.com/Relequestual/sensible-github-labels).
 
+## Compile and run locally
+
+This site runs via github pages, with automatically building PR previews via netlify.
+If you wish to compile and run this site locally, you will need to have ruby installed.
+
+If you're not familiar with ruby, consider using `rvm` (https://rvm.io/).
+Once you have Ruby installed, follow these instructions while in the project directory
+
+> Instructions
+>
+>     1. Install the jekyll and bundler gems.
+>
+>     `gem install jekyll bundler`
+>
+>     2. Create a new Jekyll site at ./myblog.
+>
+>     ...
+>
+>     3. Build the site and make it available on a local server.
+>
+>     `bundle exec jekyll serve`
+>
+>     4. Browse to http://localhost:4000
+
+Adapted from https://jekyllrb.com/docs/
+
 ## License
 
-The source material in this repository is licensed under the AFL or BSD license. 
+The source material in this repository is licensed under the AFL or BSD license.

_includes/footer.html

@@ -12,7 +12,7 @@ <h2 class="footer-heading">{{ site.title | escape }}</h2>
             {% include icon-github.html username=site.github_username %}
           </li>
           {% endif %}
-          <li>Discussion: <a href="https://join.slack.com/t/json-schema/shared_invite/enQtNjc5NTk0MzkzODg5LTVlZGIxNmVhMGY2MWFlYTdiNDQ5NWFiZGUwOThhNmYxZDE0YzA5YjRiOTA5MGY4ZTZlZGZhZDFmYTY4NWM2N2Y">Slack</a> | <a href="https://groups.google.com/forum/#!forum/json-schema">Google Groups</a></li>
+          <li>Discussion: <a href="/slack">Slack</a> | <a href="https://groups.google.com/forum/#!forum/json-schema">Google Groups</a></li>
           <li>Site edits: <a href="https://github.com/json-schema-org/json-schema-org.github.io">GitHub repo for site</a></li>
         </ul>
       </div>

_includes/header.html

@@ -25,7 +25,7 @@
             <a class="page-link" href="{{ my_page.url | relative_url }}">{{ my_page.title | escape }}</a>
             {%- endif -%}
           {% endfor -%}
-          <a class="page-link" href="https://join.slack.com/t/json-schema/shared_invite/enQtNjc5NTk0MzkzODg5LTVlZGIxNmVhMGY2MWFlYTdiNDQ5NWFiZGUwOThhNmYxZDE0YzA5YjRiOTA5MGY4ZTZlZGZhZDFmYTY4NWM2N2Y">Join our Slack</a>
+          <a class="page-link" href="/slack">Join our Slack</a>
         </div>
       </nav>
     {%- endif -%}