diff --git a/.bowerrc b/.bowerrc
deleted file mode 100644
index cc4897843..000000000
--- a/.bowerrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "directory": "assets/vendor"
-}
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 000000000..d79cdf3cc
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,39 @@
+## Overview
+
+
+
+### Extra detail
+
+
+#### Screenshots
+
+
+
+#### Reasoning
+
+
+
+### How to contribute
+
+- Comment on this issue if you'd like to work/collaborate on it!
+- Fork the [repository](https://github.com/github/training-kit).
+- Use the [GitHub Flow](https://guides.github.com/introduction/flow/) to make changes to your fork. [This](https://github.com/skills/introduction-to-github) is a refresher course if you're unsure about how to make a change on GitHub.
+- Push your changes to your repository.
+- Submit a Pull Request
+ - Base Dropdown: github/training-kit
+ - Compare Dropdown: Your fork
+
+#### Testing locally
+
+If you'd like to make and test changes locally (and see how they would look if merged), do the following:
+
+- In your command line:
+ - [Install Git](https://git-scm.com/)
+ - [Install Ruby](https://www.ruby-lang.org/en/documentation/installation/)
+ - [ ] Run `script/setup`
+ - [ ] Run `script/server`.
+ - When successful, the script will initiate a local server at `http://127.0.0.1:4000/`.
+
+### Questions?
+
+- Leave a comment on this issue! Make sure to use `@mentions` if you want a specific person's attention!
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 000000000..c41186e96
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,19 @@
+## Overview
+
+
+
+## Questions
+
+
+
+## Next steps
+
+
+
+## Review
+
+
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000..3591317b1
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,17 @@
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+
+ # Maintain dependencies for GitHub Actions
+ - package-ecosystem: "github-actions"
+ directory: "/"
+ schedule:
+ interval: "monthly"
+
+ # Maintain dependencies for Bundler
+ - package-ecosystem: "bundler"
+ directory: "/"
+ schedule:
+ interval: "monthly"
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
new file mode 100644
index 000000000..6ec816d16
--- /dev/null
+++ b/.github/workflows/codeql.yml
@@ -0,0 +1,61 @@
+name: "CodeQL"
+
+on:
+ push:
+ branches: [ "main" ]
+ pull_request:
+ # The branches below must be a subset of the branches above
+ branches: [ "main" ]
+
+jobs:
+ analyze:
+ name: Analyze
+ runs-on: ubuntu-latest
+ permissions:
+ actions: read
+ contents: read
+ security-events: write
+
+ strategy:
+ fail-fast: false
+ matrix:
+ language: [ 'ruby' ]
+ # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+ # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v3
+
+ # Initializes the CodeQL tools for scanning.
+ - name: Initialize CodeQL
+ uses: github/codeql-action/init@v2
+ with:
+ languages: ${{ matrix.language }}
+ # If you wish to specify custom queries, you can do so here or in a config file.
+ # By default, queries listed here will override any specified in a config file.
+ # Prefix the list here with "+" to use these queries and those in the config file.
+
+ # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+ # queries: security-extended,security-and-quality
+
+
+ # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
+ # If this step fails, then you should remove it and run the build manually (see below)
+ - name: Autobuild
+ uses: github/codeql-action/autobuild@v2
+
+ # ℹ️ Command-line programs to run using the OS shell.
+ # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+ # If the Autobuild fails above, remove it and uncomment the following three lines.
+ # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+ # - run: |
+ # echo "Run, Build Application using script"
+ # ./location_of_script_within_repo/buildscript.sh
+
+ - name: Perform CodeQL Analysis
+ uses: github/codeql-action/analyze@v2
+ with:
+ category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
new file mode 100644
index 000000000..fe461b424
--- /dev/null
+++ b/.github/workflows/dependency-review.yml
@@ -0,0 +1,20 @@
+# Dependency Review Action
+#
+# This Action will scan dependency manifest files that change as part of a Pull Request, surfacing known-vulnerable versions of the packages declared or updated in the PR. Once installed, if the workflow run is marked as required, PRs introducing known-vulnerable packages will be blocked from merging.
+#
+# Source repository: https://github.com/actions/dependency-review-action
+# Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement
+name: 'Dependency Review'
+on: [pull_request]
+
+permissions:
+ contents: read
+
+jobs:
+ dependency-review:
+ runs-on: ubuntu-latest
+ steps:
+ - name: 'Checkout Repository'
+ uses: actions/checkout@v3
+ - name: 'Dependency Review'
+ uses: actions/dependency-review-action@v2
diff --git a/.github/workflows/jekyll.yml b/.github/workflows/jekyll.yml
new file mode 100644
index 000000000..8c9116eec
--- /dev/null
+++ b/.github/workflows/jekyll.yml
@@ -0,0 +1,73 @@
+name: Deploy Jekyll site to Pages
+
+on:
+ # Runs on pushes targeting the default branch
+ push:
+ branches: ["main"]
+ # Runs on pull requests targeting the default branch
+ pull_request:
+ branches: [ "main" ]
+
+ # Allows us to run this workflow manually from the Actions tab
+ workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+ contents: read
+ pages: write
+ id-token: write
+
+# Allow one concurrent deployment
+concurrency:
+ group: "pages"
+ cancel-in-progress: true
+
+jobs:
+ # Build job
+ build:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v3
+ - name: Set up Node
+ uses: actions/setup-node@v3
+ with:
+ node-version: 16
+ cache: 'npm'
+ - name: Install node modules
+ run: npm install
+ - name: Set up Ruby
+ uses: ruby/setup-ruby@ece82769428359c077b5a5eaff268902a303c101
+ with:
+ bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+ - name: Set up Pages
+ id: pages
+ uses: actions/configure-pages@v2
+ - name: Build and test with Rake
+ # Only run in pull requests
+ if: github.event_name == 'pull_request'
+ run: bundle exec rake
+ - name: Build with Jekyll
+ # Don't run in pull requests
+ if: github.event_name != 'pull_request'
+ # Outputs to the './_site' directory by default
+ run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}"
+ env:
+ JEKYLL_ENV: production
+ - name: Upload artifact
+ # Automatically uploads an artifact from the './_site' directory by default
+ uses: actions/upload-pages-artifact@v1
+
+ # Deployment job
+ deploy:
+ # Only run on pushes to the default branch
+ if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+ environment:
+ name: github-pages
+ url: ${{ steps.deployment.outputs.page_url }}
+ runs-on: ubuntu-latest
+ needs: build
+ steps:
+ - name: Deploy to GitHub Pages
+ id: deployment
+ uses: actions/deploy-pages@v1
diff --git a/.gitignore b/.gitignore
index 214dd9925..cd292a85a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,13 @@
_site/
.DS_Store
/.rbenv-version
-/vendor/gems/
+/vendor/
/bin/
/.bundle/
.sass-cache/
*.*~
_release
+*.map
+.jekyll-metadata
+node_modules/
+# *.resume-burger-jokes
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index b393d3941..000000000
--- a/.gitmodules
+++ /dev/null
@@ -1,12 +0,0 @@
-[submodule "slides/dependencies/plugins"]
- path = slides/dependencies/plugins
- url = https://github.com/jordanmccullough/hydeslides-plugins.git
-[submodule "slides/dependencies/revealjs"]
- path = slides/dependencies/revealjs
- url = https://github.com/hakimel/reveal.js.git
-[submodule "slides/dependencies/snap-svg"]
- path = slides/dependencies/snap-svg
- url = https://github.com/adobe-webplatform/Snap.svg.git
-[submodule "_javascript/jquery-scrollsnap-plugin"]
- path = _javascript/jquery-scrollsnap-plugin
- url = https://github.com/benoitpointet/jquery-scrollsnap-plugin.git
diff --git a/.ruby-version b/.ruby-version
new file mode 100644
index 000000000..ef538c281
--- /dev/null
+++ b/.ruby-version
@@ -0,0 +1 @@
+3.1.2
diff --git a/CNAME b/CNAME
new file mode 100644
index 000000000..91e8be9b2
--- /dev/null
+++ b/CNAME
@@ -0,0 +1 @@
+training.github.com
\ No newline at end of file
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 000000000..8439872c6
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,46 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to make participation in our project and our community a 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.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants 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 address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [services@github.com](mailto:services@github.com). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d976bcbae..1234ee022 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,5 +1,84 @@
-# Help Us Improve These Materials
+# Contributing to training-kit
-We're always looking for contributions to help improve these materials. If you have corrections, polish, or materials contributions, please submit them via a [Pull Request](https://help.github.com/articles/using-pull-requests).
+🎉 Thank you for taking the time to contribute and for seeking out these instructions. We :heart: community contributions to these materials.
-If your contribution is larger than a syntax fix or sentence re-wording, please initiate a discussion via a new Issue (type `c` after switching focus to the [Issues](https://github.com/github/training-kit/issues) tab) so we can help guide your contribution to the right location in the materials.
+---
+
+## Code of Conduct
+
+This project and everyone who participates in it is governed by the [Contributor Covenant Code of Conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to [services@github.com](mailto:services@github.com).
+
+---
+
+## What should I know before I get started?
+
+### The goal of these resources
+
+These materials are designed to help those new to Git, GitHub and software development as a whole. By using these materials, we hope users will:
+
+- Feel welcome and become active contributors in the open source community
+- Learn best practices for using Git and GitHub
+- Learn how to use the applications within GitHub's ecosystem to build better software
+
+### Types of contributions we love
+
+We're always looking for contributions to help improve these resources. This includes:
+
+- Improving the existing cheat sheets
+- Translations of existing cheat sheets into new languages
+- Adding new courseware or resources aligned with the [goals](#the-goal-of-these-resources)
+
+---
+
+## How to contribute
+
+### Report a bug
+
+Oops, thanks for finding that! If you know how to fix it, please feel free to fork the repository and submit a change via Pull Request.
+
+If you aren't sure how to fix it or just don't have time, we invite you to open a [new Issue](https://github.com/github/training-kit/issues/new). Please be sure to provide information, so we can recreate the error.
+
+### Translate existing resources
+
+Several community members have been kind enough to translate the Git Cheat Sheets into various languages. At this time, we are only set up to serve the cheat sheets in various languages (but maybe you can help us change that 😉). If you are planning to contribute a translation, please do the following:
+
+- Fork this repository
+- Create a new folder in the [downloads directory](https://github.com/github/training-kit/tree/main/downloads) using the standard abbreviation for the language you are providing.
+- Copy the most recent [English version of the cheat sheet](https://github.com/github/training-kit/blob/main/downloads/github-git-cheat-sheet.md) to the folder you created.
+- Complete the translation
+- Add a link to the translated resource on [/index.html](https://github.com/github/training-kit/blob/main/index.html)
+- Open a pull request against the `main` branch of this repository.
+- Be sure to @ mention a couple of your friends who are native speakers and ask them to review the translation.
+- Update your translation based on feedback from your friends.
+
+When this process is complete, we will be happy to merge the completed document.
+
+### Contribute something new
+
+Whether you have an idea to make it better, or want to contribute a whole new course or resource ... we :heart: new ideas! We invite you to open a new [Issue](https://github.com/github/training-kit/issues/new) to talk about it before you invest too much time. Of course, if you want to experiment first, you can [fork this repository](https://help.github.com/articles/working-with-forks/) and submit your idea via a Pull Request.
+
+When you are contributing something new, we ask you to be familiar with our content philosophy, the structure of the repository, and building [Jekyll](https://jekyllrb.com/) sites locally. See the sections below for more information.
+
+### Not sure where to start?
+
+If you just want to help out, but don't have a particular change in mind, check out the [open issues](https://github.com/github/training-kit/issues) for projects you can tackle, review an [open pull request](https://github.com/github/training-kit/pulls), or check out [the project ROADMAP](https://github.com/github/training-kit/projects/1).
+
+---
+
+### Styling content
+
+This site uses GitHub's CSS toolkit called [Primer](https://github.com/primer/primer-css). It's easy to use, and if your contribution requires some design or front-end work you should check out the [Primer Docs](http://primercss.io/).
+
+For writing style guides, we lean on the [GitHub Brand Guide](https://brand.github.com/). The [Content](https://brand.github.com/content/) section is a great place to start.
+
+### Building and testing
+
+When you are ready to test your changes, you will want to build the repository locally. This is fully automated through a series of shell scripts based [the scripts to rule them all](https://github.com/github/scripts-to-rule-them-all)!
+
+To build the materials do the following:
+
+1. Run `script/bootstrap` to install the dependencies
+1. Run `script/build` to build the site
+1. Run `script/server`
+ - When successful, the script will initiate a local server at `http://127.0.0.1:4000/`.
+1. Simply paste that into your favorite web-browser, and you will be ready to test
diff --git a/Gemfile b/Gemfile
index bbcc80eff..11c3791f3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,17 @@
source "https://rubygems.org"
-gem 'github-pages'
+gem 'jekyll'
gem 'html-proofer'
-gem 'rack-contrib', '~> 1.1.0'
gem 'rake'
-gem 'rdiscount'
+
+group :jekyll_plugins do
+ gem 'jekyll-sass-converter', github: 'jekyll/jekyll-sass-converter'
+ gem 'sass-embedded'
+ gem 'jekyll-paginate'
+ gem 'jekyll-sitemap'
+ gem 'jekyll-gist'
+ gem 'jekyll-feed'
+ gem 'jemoji'
+ gem 'jekyll-redirect-from'
+ gem 'jekyll-octicons'
+end
diff --git a/Gemfile.lock b/Gemfile.lock
index 45576e988..2ef12e484 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,139 +1,157 @@
+GIT
+ remote: https://github.com/jekyll/jekyll-sass-converter.git
+ revision: 13d2054514b23ee3f221c4c51eb25bea9bc951f5
+ specs:
+ jekyll-sass-converter (2.2.0)
+ sass-embedded (~> 1.54)
+
GEM
remote: https://rubygems.org/
specs:
- RedCloth (4.2.9)
- activesupport (4.1.6)
- i18n (~> 0.6, >= 0.6.9)
- json (~> 1.7, >= 1.7.7)
- minitest (~> 5.1)
- thread_safe (~> 0.1)
- tzinfo (~> 1.1)
- blankslate (2.1.2.4)
- celluloid (0.16.0)
- timers (~> 4.0.0)
- classifier-reborn (2.0.1)
- fast-stemmer (~> 1.0)
- coffee-script (2.3.0)
- coffee-script-source
- execjs
- coffee-script-source (1.8.0)
- colorator (0.1)
- colored (1.2)
- ethon (0.7.1)
- ffi (>= 1.3.0)
- execjs (2.2.2)
- fast-stemmer (1.0.2)
- ffi (1.9.6)
- gemoji (2.1.0)
- github-pages (28)
- RedCloth (= 4.2.9)
- jekyll (= 2.4.0)
- jekyll-coffeescript (= 1.0.0)
- jekyll-mentions (= 0.1.3)
- jekyll-redirect-from (= 0.6.2)
- jekyll-sass-converter (= 1.2.0)
- jekyll-sitemap (= 0.6.0)
- jemoji (= 0.3.0)
- kramdown (= 1.3.1)
- liquid (= 2.6.1)
- maruku (= 0.7.0)
- pygments.rb (= 0.6.0)
- rdiscount (= 2.1.7)
- redcarpet (= 3.1.2)
- hitimes (1.2.2)
- html-pipeline (1.9.0)
+ activesupport (7.0.4)
+ concurrent-ruby (~> 1.0, >= 1.0.2)
+ i18n (>= 1.6, < 2)
+ minitest (>= 5.1)
+ tzinfo (~> 2.0)
+ addressable (2.8.1)
+ public_suffix (>= 2.0.2, < 6.0)
+ async (2.2.1)
+ console (~> 1.10)
+ io-event (~> 1.1.0)
+ timers (~> 4.1)
+ colorator (1.1.0)
+ concurrent-ruby (1.1.10)
+ console (1.16.2)
+ fiber-local
+ em-websocket (0.5.3)
+ eventmachine (>= 0.12.9)
+ http_parser.rb (~> 0)
+ ethon (0.15.0)
+ ffi (>= 1.15.0)
+ eventmachine (1.2.7)
+ faraday (2.6.0)
+ faraday-net_http (>= 2.0, < 3.1)
+ ruby2_keywords (>= 0.0.4)
+ faraday-net_http (3.0.1)
+ ffi (1.15.5)
+ fiber-local (1.0.0)
+ forwardable-extended (2.6.0)
+ gemoji (3.0.1)
+ google-protobuf (3.21.9)
+ html-pipeline (2.14.3)
activesupport (>= 2)
- nokogiri (~> 1.4)
- html-proofer (1.4.0)
- colored (~> 1.2)
- mercenary (~> 0.3.2)
- nokogiri (~> 1.5)
- parallel (~> 1.3)
- typhoeus (~> 0.6.7)
+ nokogiri (>= 1.4)
+ html-proofer (5.0.0)
+ addressable (~> 2.3)
+ async (~> 2.1)
+ nokogiri (~> 1.13)
+ rainbow (~> 3.0)
+ typhoeus (~> 1.3)
yell (~> 2.0)
- i18n (0.6.11)
- jekyll (2.4.0)
- classifier-reborn (~> 2.0)
- colorator (~> 0.1)
- jekyll-coffeescript (~> 1.0)
- jekyll-gist (~> 1.0)
- jekyll-paginate (~> 1.0)
- jekyll-sass-converter (~> 1.0)
- jekyll-watch (~> 1.1)
- kramdown (~> 1.3)
- liquid (~> 2.6.1)
- mercenary (~> 0.3.3)
- pygments.rb (~> 0.6.0)
- redcarpet (~> 3.1)
+ zeitwerk (~> 2.5)
+ http_parser.rb (0.8.0)
+ i18n (1.12.0)
+ concurrent-ruby (~> 1.0)
+ io-event (1.1.2)
+ jekyll (4.3.1)
+ addressable (~> 2.4)
+ colorator (~> 1.0)
+ em-websocket (~> 0.5)
+ i18n (~> 1.0)
+ jekyll-sass-converter (>= 2.0, < 4.0)
+ jekyll-watch (~> 2.0)
+ kramdown (~> 2.3, >= 2.3.1)
+ kramdown-parser-gfm (~> 1.0)
+ liquid (~> 4.0)
+ mercenary (>= 0.3.6, < 0.5)
+ pathutil (~> 0.9)
+ rouge (>= 3.0, < 5.0)
safe_yaml (~> 1.0)
- toml (~> 0.1.0)
- jekyll-coffeescript (1.0.0)
- coffee-script (~> 2.2)
- jekyll-gist (1.1.0)
- jekyll-mentions (0.1.3)
- html-pipeline (~> 1.9.0)
- jekyll (~> 2.0)
+ terminal-table (>= 1.8, < 4.0)
+ webrick (~> 1.7)
+ jekyll-feed (0.17.0)
+ jekyll (>= 3.7, < 5.0)
+ jekyll-gist (1.5.0)
+ octokit (~> 4.2)
+ jekyll-octicons (17.7.0)
+ jekyll (>= 3.6, < 5.0)
+ octicons (= 17.7.0)
jekyll-paginate (1.1.0)
- jekyll-redirect-from (0.6.2)
- jekyll (~> 2.0)
- jekyll-sass-converter (1.2.0)
- sass (~> 3.2)
- jekyll-sitemap (0.6.0)
- jekyll-watch (1.1.1)
- listen (~> 2.7)
- jemoji (0.3.0)
- gemoji (~> 2.0)
- html-pipeline (~> 1.9)
- jekyll (~> 2.0)
- json (1.8.1)
- kramdown (1.3.1)
- liquid (2.6.1)
- listen (2.7.11)
- celluloid (>= 0.15.2)
- rb-fsevent (>= 0.9.3)
- rb-inotify (>= 0.9)
- maruku (0.7.0)
- mercenary (0.3.4)
- mini_portile (0.6.0)
- minitest (5.4.2)
- nokogiri (1.6.3.1)
- mini_portile (= 0.6.0)
- parallel (1.3.3)
- parslet (1.5.0)
- blankslate (~> 2.0)
- posix-spawn (0.3.9)
- pygments.rb (0.6.0)
- posix-spawn (~> 0.3.6)
- yajl-ruby (~> 1.1.0)
- rack (1.5.2)
- rack-contrib (1.1.0)
- rack (>= 0.9.1)
- rake (10.3.2)
- rb-fsevent (0.9.4)
- rb-inotify (0.9.5)
- ffi (>= 0.5.0)
- rdiscount (2.1.7)
- redcarpet (3.1.2)
- safe_yaml (1.0.4)
- sass (3.4.6)
- thread_safe (0.3.4)
- timers (4.0.1)
- hitimes
- toml (0.1.2)
- parslet (~> 1.5.0)
- typhoeus (0.6.9)
- ethon (>= 0.7.1)
- tzinfo (1.2.2)
- thread_safe (~> 0.1)
- yajl-ruby (1.1.0)
- yell (2.0.5)
+ jekyll-redirect-from (0.16.0)
+ jekyll (>= 3.3, < 5.0)
+ jekyll-sitemap (1.4.0)
+ jekyll (>= 3.7, < 5.0)
+ jekyll-watch (2.2.1)
+ listen (~> 3.0)
+ jemoji (0.12.0)
+ gemoji (~> 3.0)
+ html-pipeline (~> 2.2)
+ jekyll (>= 3.0, < 5.0)
+ kramdown (2.4.0)
+ rexml
+ kramdown-parser-gfm (1.1.0)
+ kramdown (~> 2.0)
+ liquid (4.0.3)
+ listen (3.7.1)
+ rb-fsevent (~> 0.10, >= 0.10.3)
+ rb-inotify (~> 0.9, >= 0.9.10)
+ mercenary (0.4.0)
+ mini_portile2 (2.8.0)
+ minitest (5.16.3)
+ nokogiri (1.13.9)
+ mini_portile2 (~> 2.8.0)
+ racc (~> 1.4)
+ octicons (17.7.0)
+ octokit (4.25.1)
+ faraday (>= 1, < 3)
+ sawyer (~> 0.9)
+ pathutil (0.16.2)
+ forwardable-extended (~> 2.6)
+ public_suffix (5.0.0)
+ racc (1.6.0)
+ rainbow (3.1.1)
+ rake (13.0.6)
+ rb-fsevent (0.11.2)
+ rb-inotify (0.10.1)
+ ffi (~> 1.0)
+ rexml (3.2.5)
+ rouge (4.0.0)
+ ruby2_keywords (0.0.5)
+ safe_yaml (1.0.5)
+ sass-embedded (1.55.0)
+ google-protobuf (~> 3.19)
+ rake (>= 10.0.0)
+ sawyer (0.9.2)
+ addressable (>= 2.3.5)
+ faraday (>= 0.17.3, < 3)
+ terminal-table (3.0.2)
+ unicode-display_width (>= 1.1.1, < 3)
+ timers (4.3.5)
+ typhoeus (1.4.0)
+ ethon (>= 0.9.0)
+ tzinfo (2.0.5)
+ concurrent-ruby (~> 1.0)
+ unicode-display_width (2.3.0)
+ webrick (1.7.0)
+ yell (2.2.2)
+ zeitwerk (2.6.1)
PLATFORMS
ruby
DEPENDENCIES
- github-pages
html-proofer
- rack-contrib (~> 1.1.0)
+ jekyll
+ jekyll-feed
+ jekyll-gist
+ jekyll-octicons
+ jekyll-paginate
+ jekyll-redirect-from
+ jekyll-sass-converter!
+ jekyll-sitemap
+ jemoji
rake
- rdiscount
+ sass-embedded
+
+BUNDLED WITH
+ 2.3.19
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000000000..06c608dcf
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,395 @@
+Attribution 4.0 International
+
+=======================================================================
+
+Creative Commons Corporation ("Creative Commons") is not a law firm and
+does not provide legal services or legal advice. Distribution of
+Creative Commons public licenses does not create a lawyer-client or
+other relationship. Creative Commons makes its licenses and related
+information available on an "as-is" basis. Creative Commons gives no
+warranties regarding its licenses, any material licensed under their
+terms and conditions, or any related information. Creative Commons
+disclaims all liability for damages resulting from their use to the
+fullest extent possible.
+
+Using Creative Commons Public Licenses
+
+Creative Commons public licenses provide a standard set of terms and
+conditions that creators and other rights holders may use to share
+original works of authorship and other material subject to copyright
+and certain other rights specified in the public license below. The
+following considerations are for informational purposes only, are not
+exhaustive, and do not form part of our licenses.
+
+ Considerations for licensors: Our public licenses are
+ intended for use by those authorized to give the public
+ permission to use material in ways otherwise restricted by
+ copyright and certain other rights. Our licenses are
+ irrevocable. Licensors should read and understand the terms
+ and conditions of the license they choose before applying it.
+ Licensors should also secure all rights necessary before
+ applying our licenses so that the public can reuse the
+ material as expected. Licensors should clearly mark any
+ material not subject to the license. This includes other CC-
+ licensed material, or material used under an exception or
+ limitation to copyright. More considerations for licensors:
+ wiki.creativecommons.org/Considerations_for_licensors
+
+ Considerations for the public: By using one of our public
+ licenses, a licensor grants the public permission to use the
+ licensed material under specified terms and conditions. If
+ the licensor's permission is not necessary for any reason--for
+ example, because of any applicable exception or limitation to
+ copyright--then that use is not regulated by the license. Our
+ licenses grant only permissions under copyright and certain
+ other rights that a licensor has authority to grant. Use of
+ the licensed material may still be restricted for other
+ reasons, including because others have copyright or other
+ rights in the material. A licensor may make special requests,
+ such as asking that all changes be marked or described.
+ Although not required by our licenses, you are encouraged to
+ respect those requests where reasonable. More_considerations
+ for the public:
+ wiki.creativecommons.org/Considerations_for_licensees
+
+=======================================================================
+
+Creative Commons Attribution 4.0 International Public License
+
+By exercising the Licensed Rights (defined below), You accept and agree
+to be bound by the terms and conditions of this Creative Commons
+Attribution 4.0 International Public License ("Public License"). To the
+extent this Public License may be interpreted as a contract, You are
+granted the Licensed Rights in consideration of Your acceptance of
+these terms and conditions, and the Licensor grants You such rights in
+consideration of benefits the Licensor receives from making the
+Licensed Material available under these terms and conditions.
+
+
+Section 1 -- Definitions.
+
+ a. Adapted Material means material subject to Copyright and Similar
+ Rights that is derived from or based upon the Licensed Material
+ and in which the Licensed Material is translated, altered,
+ arranged, transformed, or otherwise modified in a manner requiring
+ permission under the Copyright and Similar Rights held by the
+ Licensor. For purposes of this Public License, where the Licensed
+ Material is a musical work, performance, or sound recording,
+ Adapted Material is always produced where the Licensed Material is
+ synched in timed relation with a moving image.
+
+ b. Adapter's License means the license You apply to Your Copyright
+ and Similar Rights in Your contributions to Adapted Material in
+ accordance with the terms and conditions of this Public License.
+
+ c. Copyright and Similar Rights means copyright and/or similar rights
+ closely related to copyright including, without limitation,
+ performance, broadcast, sound recording, and Sui Generis Database
+ Rights, without regard to how the rights are labeled or
+ categorized. For purposes of this Public License, the rights
+ specified in Section 2(b)(1)-(2) are not Copyright and Similar
+ Rights.
+
+ d. Effective Technological Measures means those measures that, in the
+ absence of proper authority, may not be circumvented under laws
+ fulfilling obligations under Article 11 of the WIPO Copyright
+ Treaty adopted on December 20, 1996, and/or similar international
+ agreements.
+
+ e. Exceptions and Limitations means fair use, fair dealing, and/or
+ any other exception or limitation to Copyright and Similar Rights
+ that applies to Your use of the Licensed Material.
+
+ f. Licensed Material means the artistic or literary work, database,
+ or other material to which the Licensor applied this Public
+ License.
+
+ g. Licensed Rights means the rights granted to You subject to the
+ terms and conditions of this Public License, which are limited to
+ all Copyright and Similar Rights that apply to Your use of the
+ Licensed Material and that the Licensor has authority to license.
+
+ h. Licensor means the individual(s) or entity(ies) granting rights
+ under this Public License.
+
+ i. Share means to provide material to the public by any means or
+ process that requires permission under the Licensed Rights, such
+ as reproduction, public display, public performance, distribution,
+ dissemination, communication, or importation, and to make material
+ available to the public including in ways that members of the
+ public may access the material from a place and at a time
+ individually chosen by them.
+
+ j. Sui Generis Database Rights means rights other than copyright
+ resulting from Directive 96/9/EC of the European Parliament and of
+ the Council of 11 March 1996 on the legal protection of databases,
+ as amended and/or succeeded, as well as other essentially
+ equivalent rights anywhere in the world.
+
+ k. You means the individual or entity exercising the Licensed Rights
+ under this Public License. Your has a corresponding meaning.
+
+
+Section 2 -- Scope.
+
+ a. License grant.
+
+ 1. Subject to the terms and conditions of this Public License,
+ the Licensor hereby grants You a worldwide, royalty-free,
+ non-sublicensable, non-exclusive, irrevocable license to
+ exercise the Licensed Rights in the Licensed Material to:
+
+ a. reproduce and Share the Licensed Material, in whole or
+ in part; and
+
+ b. produce, reproduce, and Share Adapted Material.
+
+ 2. Exceptions and Limitations. For the avoidance of doubt, where
+ Exceptions and Limitations apply to Your use, this Public
+ License does not apply, and You do not need to comply with
+ its terms and conditions.
+
+ 3. Term. The term of this Public License is specified in Section
+ 6(a).
+
+ 4. Media and formats; technical modifications allowed. The
+ Licensor authorizes You to exercise the Licensed Rights in
+ all media and formats whether now known or hereafter created,
+ and to make technical modifications necessary to do so. The
+ Licensor waives and/or agrees not to assert any right or
+ authority to forbid You from making technical modifications
+ necessary to exercise the Licensed Rights, including
+ technical modifications necessary to circumvent Effective
+ Technological Measures. For purposes of this Public License,
+ simply making modifications authorized by this Section 2(a)
+ (4) never produces Adapted Material.
+
+ 5. Downstream recipients.
+
+ a. Offer from the Licensor -- Licensed Material. Every
+ recipient of the Licensed Material automatically
+ receives an offer from the Licensor to exercise the
+ Licensed Rights under the terms and conditions of this
+ Public License.
+
+ b. No downstream restrictions. You may not offer or impose
+ any additional or different terms or conditions on, or
+ apply any Effective Technological Measures to, the
+ Licensed Material if doing so restricts exercise of the
+ Licensed Rights by any recipient of the Licensed
+ Material.
+
+ 6. No endorsement. Nothing in this Public License constitutes or
+ may be construed as permission to assert or imply that You
+ are, or that Your use of the Licensed Material is, connected
+ with, or sponsored, endorsed, or granted official status by,
+ the Licensor or others designated to receive attribution as
+ provided in Section 3(a)(1)(A)(i).
+
+ b. Other rights.
+
+ 1. Moral rights, such as the right of integrity, are not
+ licensed under this Public License, nor are publicity,
+ privacy, and/or other similar personality rights; however, to
+ the extent possible, the Licensor waives and/or agrees not to
+ assert any such rights held by the Licensor to the limited
+ extent necessary to allow You to exercise the Licensed
+ Rights, but not otherwise.
+
+ 2. Patent and trademark rights are not licensed under this
+ Public License.
+
+ 3. To the extent possible, the Licensor waives any right to
+ collect royalties from You for the exercise of the Licensed
+ Rights, whether directly or through a collecting society
+ under any voluntary or waivable statutory or compulsory
+ licensing scheme. In all other cases the Licensor expressly
+ reserves any right to collect such royalties.
+
+
+Section 3 -- License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the
+following conditions.
+
+ a. Attribution.
+
+ 1. If You Share the Licensed Material (including in modified
+ form), You must:
+
+ a. retain the following if it is supplied by the Licensor
+ with the Licensed Material:
+
+ i. identification of the creator(s) of the Licensed
+ Material and any others designated to receive
+ attribution, in any reasonable manner requested by
+ the Licensor (including by pseudonym if
+ designated);
+
+ ii. a copyright notice;
+
+ iii. a notice that refers to this Public License;
+
+ iv. a notice that refers to the disclaimer of
+ warranties;
+
+ v. a URI or hyperlink to the Licensed Material to the
+ extent reasonably practicable;
+
+ b. indicate if You modified the Licensed Material and
+ retain an indication of any previous modifications; and
+
+ c. indicate the Licensed Material is licensed under this
+ Public License, and include the text of, or the URI or
+ hyperlink to, this Public License.
+
+ 2. You may satisfy the conditions in Section 3(a)(1) in any
+ reasonable manner based on the medium, means, and context in
+ which You Share the Licensed Material. For example, it may be
+ reasonable to satisfy the conditions by providing a URI or
+ hyperlink to a resource that includes the required
+ information.
+
+ 3. If requested by the Licensor, You must remove any of the
+ information required by Section 3(a)(1)(A) to the extent
+ reasonably practicable.
+
+ 4. If You Share Adapted Material You produce, the Adapter's
+ License You apply must not prevent recipients of the Adapted
+ Material from complying with this Public License.
+
+
+Section 4 -- Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that
+apply to Your use of the Licensed Material:
+
+ a. for the avoidance of doubt, Section 2(a)(1) grants You the right
+ to extract, reuse, reproduce, and Share all or a substantial
+ portion of the contents of the database;
+
+ b. if You include all or a substantial portion of the database
+ contents in a database in which You have Sui Generis Database
+ Rights, then the database in which You have Sui Generis Database
+ Rights (but not its individual contents) is Adapted Material; and
+
+ c. You must comply with the conditions in Section 3(a) if You Share
+ all or a substantial portion of the contents of the database.
+
+For the avoidance of doubt, this Section 4 supplements and does not
+replace Your obligations under this Public License where the Licensed
+Rights include other Copyright and Similar Rights.
+
+
+Section 5 -- Disclaimer of Warranties and Limitation of Liability.
+
+ a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
+ EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
+ AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
+ ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
+ IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
+ WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
+ PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
+ ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
+ KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
+ ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
+
+ b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
+ TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
+ NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
+ INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
+ COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
+ USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
+ ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
+ DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
+ IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
+
+ c. The disclaimer of warranties and limitation of liability provided
+ above shall be interpreted in a manner that, to the extent
+ possible, most closely approximates an absolute disclaimer and
+ waiver of all liability.
+
+
+Section 6 -- Term and Termination.
+
+ a. This Public License applies for the term of the Copyright and
+ Similar Rights licensed here. However, if You fail to comply with
+ this Public License, then Your rights under this Public License
+ terminate automatically.
+
+ b. Where Your right to use the Licensed Material has terminated under
+ Section 6(a), it reinstates:
+
+ 1. automatically as of the date the violation is cured, provided
+ it is cured within 30 days of Your discovery of the
+ violation; or
+
+ 2. upon express reinstatement by the Licensor.
+
+ For the avoidance of doubt, this Section 6(b) does not affect any
+ right the Licensor may have to seek remedies for Your violations
+ of this Public License.
+
+ c. For the avoidance of doubt, the Licensor may also offer the
+ Licensed Material under separate terms or conditions or stop
+ distributing the Licensed Material at any time; however, doing so
+ will not terminate this Public License.
+
+ d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
+ License.
+
+
+Section 7 -- Other Terms and Conditions.
+
+ a. The Licensor shall not be bound by any additional or different
+ terms or conditions communicated by You unless expressly agreed.
+
+ b. Any arrangements, understandings, or agreements regarding the
+ Licensed Material not stated herein are separate from and
+ independent of the terms and conditions of this Public License.
+
+
+Section 8 -- Interpretation.
+
+ a. For the avoidance of doubt, this Public License does not, and
+ shall not be interpreted to, reduce, limit, restrict, or impose
+ conditions on any use of the Licensed Material that could lawfully
+ be made without permission under this Public License.
+
+ b. To the extent possible, if any provision of this Public License is
+ deemed unenforceable, it shall be automatically reformed to the
+ minimum extent necessary to make it enforceable. If the provision
+ cannot be reformed, it shall be severed from this Public License
+ without affecting the enforceability of the remaining terms and
+ conditions.
+
+ c. No term or condition of this Public License will be waived and no
+ failure to comply consented to unless expressly agreed to by the
+ Licensor.
+
+ d. Nothing in this Public License constitutes or may be interpreted
+ as a limitation upon, or waiver of, any privileges and immunities
+ that apply to the Licensor or You, including from the legal
+ processes of any jurisdiction or authority.
+
+
+=======================================================================
+
+Creative Commons is not a party to its public
+licenses. Notwithstanding, Creative Commons may elect to apply one of
+its public licenses to material it publishes and in those instances
+will be considered the “Licensor.” The text of the Creative Commons
+public licenses is dedicated to the public domain under the CC0 Public
+Domain Dedication. Except for the limited purpose of indicating that
+material is shared under a Creative Commons public license or as
+otherwise permitted by the Creative Commons policies published at
+creativecommons.org/policies, Creative Commons does not authorize the
+use of the trademark "Creative Commons" or any other trademark or logo
+of Creative Commons without its prior written consent including,
+without limitation, in connection with any unauthorized modifications
+to any of its public licenses or any other arrangements,
+understandings, or agreements concerning use of licensed material. For
+the avoidance of doubt, this paragraph does not form part of the
+public licenses.
+
+Creative Commons may be contacted at creativecommons.org.
diff --git a/LICENSE.md b/LICENSE.md
deleted file mode 100644
index 883d1a6fa..000000000
--- a/LICENSE.md
+++ /dev/null
@@ -1,191 +0,0 @@
-# License
-The prose, course text, slide layouts, class outlines, diagrams, HTML, CSS, and Markdown code in the set of educational materials located in this repository are licensed as _CC BY 4.0_. The Octocat, GitHub logo and other already-copyrighted and already-reserved trademarks and images are not covered by this license.
-
-------------------------
-
-# Attribution 4.0 International (CC BY 4.0)
-This is a [human-readable summary](http://creativecommons.org/licenses/by/4.0/) and not a substitute for the [license](http://creativecommons.org/licenses/by/4.0/legalcode).
-
-
-## You are free to:
-
-* Share — copy and redistribute the material in any medium or format
-* Adapt — remix, transform, and build upon the material
-
-for any purpose, even commercially.
-
-The licensor cannot revoke these freedoms as long as you follow the license terms.
-
-
-## Under the following terms:
-
-Attribution — You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use.
-
-No additional restrictions — You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits.
-
-## Notices
-
-You do not have to comply with the license for elements of the material in the public domain or where your use is permitted by an applicable exception or limitation.
-No warranties are given. The license may not give you all of the permissions necessary for your intended use. For example, other rights such as publicity, privacy, or moral rights may limit how you use the material.
-
---------------------------------
-
-# Attribution 4.0 International (CC BY 4.0)
-
-Creative Commons Corporation (“Creative Commons”) is not a law firm and does not provide legal services or legal advice. Distribution of Creative Commons public licenses does not create a lawyer-client or other relationship. Creative Commons makes its licenses and related information available on an “as-is” basis. Creative Commons gives no warranties regarding its licenses, any material licensed under their terms and conditions, or any related information. Creative Commons disclaims all liability for damages resulting from their use to the fullest extent possible.
-
-### Using Creative Commons Public Licenses
-
-Creative Commons public licenses provide a standard set of terms and conditions that creators and other rights holders may use to share original works of authorship and other material subject to copyright and certain other rights specified in the public license below. The following considerations are for informational purposes only, are not exhaustive, and do not form part of our licenses.
-
-* __Considerations for licensors:__ Our public licenses are intended for use by those authorized to give the public permission to use material in ways otherwise restricted by copyright and certain other rights. Our licenses are irrevocable. Licensors should read and understand the terms and conditions of the license they choose before applying it. Licensors should also secure all rights necessary before applying our licenses so that the public can reuse the material as expected. Licensors should clearly mark any material not subject to the license. This includes other CC-licensed material, or material used under an exception or limitation to copyright. [More considerations for licensors](http://wiki.creativecommons.org/Considerations_for_licensors_and_licensees#Considerations_for_licensors).
-
-* __Considerations for the public:__ By using one of our public licenses, a licensor grants the public permission to use the licensed material under specified terms and conditions. If the licensor’s permission is not necessary for any reason–for example, because of any applicable exception or limitation to copyright–then that use is not regulated by the license. Our licenses grant only permissions under copyright and certain other rights that a licensor has authority to grant. Use of the licensed material may still be restricted for other reasons, including because others have copyright or other rights in the material. A licensor may make special requests, such as asking that all changes be marked or described. Although not required by our licenses, you are encouraged to respect those requests where reasonable. [More considerations for the public](http://wiki.creativecommons.org/Considerations_for_licensors_and_licensees#Considerations_for_licensees).
-
-## Creative Commons Attribution 4.0 International Public License
-
-By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.
-
-### Section 1 – Definitions.
-
-a. __Adapted Material__ means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.
-
-b. __Adapter's License__ means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.
-
-c. __Copyright and Similar Rights__ means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
-
-d. __Effective Technological Measures__ means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements.
-
-e. __Exceptions and Limitations__ means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.
-
-f. __Licensed Material__ means the artistic or literary work, database, or other material to which the Licensor applied this Public License.
-
-g. __Licensed Rights__ means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.
-
-h. __Licensor__ means the individual(s) or entity(ies) granting rights under this Public License.
-
-i. __Share__ means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.
-
-j. __Sui Generis Database Rights__ means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.
-
-k. __You__ means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning.
-
-### Section 2 – Scope.
-
-a. ___License grant.___
-
- 1. Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
-
- A. reproduce and Share the Licensed Material, in whole or in part; and
-
- B. produce, reproduce, and Share Adapted Material.
-
- 2. __Exceptions and Limitations.__ For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.
-
- 3. __Term.__ The term of this Public License is specified in Section 6(a).
-
- 4. __Media and formats; technical modifications allowed.__ The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material.
-
- 5. __Downstream recipients.__
-
- A. __Offer from the Licensor – Licensed Material.__ Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.
-
- B. __No downstream restrictions.__ You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.
-
- 6. __No endorsement.__ Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i).
-
-b. ___Other rights.___
-
- 1. Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.
-
- 2. Patent and trademark rights are not licensed under this Public License.
-
- 3. To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties.
-
-### Section 3 – License Conditions.
-
-Your exercise of the Licensed Rights is expressly made subject to the following conditions.
-
-a. ___Attribution.___
-
- 1. If You Share the Licensed Material (including in modified form), You must:
-
- A. retain the following if it is supplied by the Licensor with the Licensed Material:
-
- i. identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);
-
- ii. a copyright notice;
-
- iii. a notice that refers to this Public License;
-
- iv. a notice that refers to the disclaimer of warranties;
-
- v. a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
-
- B. indicate if You modified the Licensed Material and retain an indication of any previous modifications; and
-
- C. indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License.
-
- 2. You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.
-
- 3. If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable.
-
- 4. If You Share Adapted Material You produce, the Adapter's License You apply must not prevent recipients of the Adapted Material from complying with this Public License.
-
-### Section 4 – Sui Generis Database Rights.
-
-Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:
-
-a. for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database;
-
-b. if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and
-
-c. You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database.
-
-For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.
-
-### Section 5 – Disclaimer of Warranties and Limitation of Liability.
-
-a. __Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.__
-
-b. __To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.__
-
-c. The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.
-
-### Section 6 – Term and Termination.
-
-a. This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.
-
-b. Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates:
-
- 1. automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or
-
- 2. upon express reinstatement by the Licensor.
-
- For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.
-
-c. For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.
-
-d. Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
-
-### Section 7 – Other Terms and Conditions.
-
-a. The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.
-
-b. Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.
-
-### Section 8 – Interpretation.
-
-a. For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.
-
-b. To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.
-
-c. No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.
-
-d. Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.
-
-```
-Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be considered the “Licensor.” Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise permitted by the Creative Commons policies published at [creativecommons.org/policies](http://creativecommons.org/policies), Creative Commons does not authorize the use of the trademark “Creative Commons” or any other trademark or logo of Creative Commons without its prior written consent including, without limitation, in connection with any unauthorized modifications to any of its public licenses or any other arrangements, understandings, or agreements concerning use of licensed material. For the avoidance of doubt, this paragraph does not form part of the public licenses.
-
-Creative Commons may be contacted at [creativecommons.org](http://creativecommons.org/).
-```
diff --git a/README.md b/README.md
index fa1c0b2cf..6142d1c11 100644
--- a/README.md
+++ b/README.md
@@ -1,43 +1,39 @@
# GitHub Training Kit
-This is the official courseware for the [GitHub Training Team](http://training.github.com). This repository provides open source materials and slides for teaching GitHub Classes under the [_CC BY 4.0_ license](http://creativecommons.org/licenses/by/4.0/).
+Open source courseware from the GitHub Professional Services team.
-We know that part of effectively sharing GitHub and Git with the world goes beyond our team's course offerings. We are pleased to provide you with this training kit that you can use to teach these same concepts at your company, for a user group, or at a conference.
+## We ❤️ contributors like you
-## Download
+**We’re eager to work with you**, our user community, to improve these materials and develop new ones. Please check out our [CONTRIBUTING guide](CONTRIBUTING.md) for more information on getting started.
-We know that many of the users of this repository are just focused on getting the materials and teaching from them. We've made that easy.
+## Looking for a resource that was once housed in training-kit?
-1. You can view and teach from the kit, hosted on GitHub, at http://training.github.com/kit
-2. You can download an offline copy of the kit via the green button at https://github.com/github/training-kit/releases
+This repository currently contains Git and GitHub cheat sheets. If you're looking for a project that used to be housed here, such as On-Demand training, reading lists, videos, and book recommendations, see [this commit](https://github.com/github/training-kit/tree/4fbf180e980ef973ba4cc4b8ef3d5f278ddc8c08) in the repository's history.
+## Projects used in training-kit
-## Contribute
+- We use [Jekyll](https://jekyllrb.com/) and [Markdown](https://guides.github.com/features/mastering-markdown/).
+- Our content is styled using the [Primer CSS toolkit](https://github.com/primer/primer-css).
-We’re eager to have your help in improving this kit. If you have an idea for a change, start by opening a new [Issue](https://github.com/github/training-kit/issues) so we can discuss and help guide your contribution to the right location. If you have corrections or kit contributions, we'd be glad to receive them via a [Pull Request](https://help.github.com/articles/using-pull-requests). For kit contributions, we ask you to share in our mindset of minimalism.
+## Packaging for viewing behind your firewall
-The slides align with the [Foundations](), [Intermediate](), and [Advanced]() classes delivered by the GitHub Training team.
+If you'd like to have a copy of the files to be served from a web server inside your firewall, start by running `script/package`.
-The three class' slides reside at top-level directories:
+1. Run `script/package` to create a release tarball. This will be in the format `release-XXXXXXX.tgz` for you to take wherever you want.
+2. To test this looks okay, create some folders `mkdir -p test_site/kit`.
+3. Extract the release, `tar -xzf release-XXXXXXX.tgz -C test_site/kit`.
+4. Switch into the test_site directory, `cd test_site`.
+5. View the site:
+ - For python version 2.x, run: `python -m SimpleHTTPServer`
+ - For python version 3.x, run: `python -m http.server`
+ - _Note: Some servers are more advanced than others and can handle redirects, smart recognition of `.html` files, etc_
-- [`foundations/`](https://github.com/github/training-kit/tree/master/foundations)
-- [`intermediate/`](https://github.com/github/training-kit/tree/master/intermediate)
-- [`advanced/`](https://github.com/github/training-kit/tree/master/advanced)
+Site content is licensed under [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/). CC-BY-4.0 gives you permission to use the content for almost any purpose but does not grant you any trademark permissions, so long as you note the license and give credit, such as follows:
+> Content based on [github.github.com/training-kit/](https://github.github.com/training-kit) used under the [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/) license.
-## File Format
+Code used to build and test the site as well as code samples on the site, if any, are licensed under [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/legalcode). CC0 waives all copyright restrictions but does not grant you any trademark permissions.
-The class materials are written in [Markdown](http://whatismarkdown.com), a [lightweight markup language](http://en.wikipedia.org/wiki/Lightweight_markup_language) supported in the GitHub web application user interface. There is a syntax guide to the original [Markdown format](http://daringfireball.net/projects/markdown/syntax) and also [GitHub Flavored Markdown](http://github.github.com/github-flavored-markdown/).
+This means you can use the content and code in this repository except for GitHub trademarks in your projects.
-The class material content possess two specialized uses of Markdown for slide-like rendering and formatting:
-
-- Full-screen slides are preceded with a `---` and followed by `---`
-- Step-by-step *lab* sections are wrapped with `{% capture lab %}` and `{% endcapture %}{% include lab %}`
-
- This repository is based on [Hydeslides](https://github.com/jordanmccullough/HydeSlides). That project offers additional information on the file and directory structure.
-
-## Build
-
-The build of this repository is fully automated through several shell scripts. To perform a build of the materials identical to that of our continuous integration server, from the top directory of this project, run `./_buildscripts/cibuild` and then inspect the output in the `_site` directory.
-
-The `_buildscripts/makerelease` script produces a zip bundle for offline use of these materials. Pre-built releases are available at https://github.com/github/training-kit/releases
+When you contribute to this repository you are doing so under the above licenses.
diff --git a/Rakefile b/Rakefile
index 15e87ba89..1fe5893dd 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,14 +1,38 @@
-require 'html/proofer'
+require 'html-proofer'
+require 'jekyll'
-desc 'Clean up generated site'
+Rake.application.options.trace = true
+
+desc 'Remove all generated files: destination folder, metadata file, Sass and Jekyll caches.'
task :clean do
- sh 'rm -rf _site'
+ Jekyll::Commands::Clean.process({})
+end
+
+desc 'Build and serve the site'
+task serve: [:build] do
+ Jekyll::Commands::Serve.process({})
end
-task :test do
- sh 'bundle exec jekyll build'
+desc 'Build the site'
+task build: [:clean] do
+ Jekyll::Commands::Build.process({})
+end
-# HTML::Proofer.new("./_site").run
+desc 'Build and test the site'
+task test: [:build] do
+ options = {
+ :check_html => true, # Validate HTML
+ :empty_alt_ignore => false, # Allow images with empty alt tags
+ :check_favicon => true, # Check whether favicons are valid
+ :check_img_http => true, # Enforce that images use HTTPS
+ typhoeus: {
+ headers: {
+ # This is required to validate links to docs.github.com
+ "Accept-Encoding" => "gzip",
+ }
+ }
+ }
+ HTMLProofer.check_directory("./_site", options).run
end
task default: :test
diff --git a/_buildscripts/bootstrap b/_buildscripts/bootstrap
deleted file mode 100755
index a0e08c37c..000000000
--- a/_buildscripts/bootstrap
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-export CC=gcc
-
-echo "==> Installing gem dependencies…"
-
-bundle check --path vendor/gems 2>&1 > /dev/null || {
- bundle install --binstubs bin --path vendor/gems --local --quiet
-}
-
-echo "==> Cloning into submodules"
-git submodule init
-git submodule update
diff --git a/_buildscripts/cibuild b/_buildscripts/cibuild
deleted file mode 100755
index 9d5f6993b..000000000
--- a/_buildscripts/cibuild
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# setup environment
-export PATH="/usr/share/rbenv/shims:$PATH"
-export RBENV_VERSION="2.0.0-github6"
-
-# write some debug info
-ruby -v
-echo "hostname: $(hostname)"
-echo "pwd: $(pwd)"
-git --version
-
-_buildscripts/bootstrap
-
-bundle exec rake test
diff --git a/_buildscripts/import-curriculum.rb b/_buildscripts/import-curriculum.rb
deleted file mode 100644
index 1ae489625..000000000
--- a/_buildscripts/import-curriculum.rb
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/ruby
-
-begin
- require 'git'
-rescue LoadError
- puts "\n#{'=' * 52}\nOops...\nIt looks like you don't have the git gem installed.\n\You can install it using: `gem install git`.\nThen try running `jekyll serve` again.\n#{'=' * 52}\n\n"
- exit
-end
-
-FileUtils.mkdir('_modules') unless File.directory?('_modules')
-FileUtils.mkdir('_courses') unless File.directory?('_courses')
-FileUtils.mkdir('images') unless File.directory?('images')
-
-def out_with_the_old(directory)
-
- puts "Removing old #{directory.sub('_', '')}..."
-
- Dir.foreach(directory) do | file |
-
- # Skip directory listings
- next if file == '.' or file == '..'
- filepath = "#{directory}/#{file}"
- File.delete(filepath)
-
- end
-
-end
-
-
-def in_with_the_new(directory)
-
- Dir.foreach("curriculum-github/#{directory}") do | file |
-
- # Only import pertinent file types
- next unless ['.jpg', '.png', '.gif', '.yml'].include?(File.extname(file))
-
- puts "Importing #{file}..."
-
- if File.extname(file) != '.yml'
-
- # File is an image. Move it to the images directory
- FileUtils.cp "curriculum-github/images/#{file}", "images/#{file}"
-
- else
-
- # We have a .yml file.
- # Read contents of current .yml file
- yml = File.open("curriculum-github/#{directory}/#{file}").read
-
- # Write .yml file contents to .md file with necessary frontmatter
- md = File.new("_#{directory}/#{File.basename(file, '.yml')}.md", "w")
- md.write("---\nlayout: #{directory.chomp('s')}\nleadingpath: ../\n#{yml}\n---")
- md.close
- end
- end
-end
-
-# Clear out old content
-out_with_the_old('_modules')
-out_with_the_old('_courses')
-
-# Clone curriculum-github repository from Certify org
-puts "Cloning curriculum-github repository from Certify organization..."
-repo = Git.clone('https://github.com/certify/curriculum-github', 'curriculum-github')
-
-# Import the fresh content from the repository
-in_with_the_new('modules')
-in_with_the_new('courses')
-in_with_the_new('images')
-
-# Remove local curriculum-github repository
-FileUtils.rm_rf("curriculum-github")
diff --git a/_buildscripts/makerelease b/_buildscripts/makerelease
deleted file mode 100755
index 6fa70d3f4..000000000
--- a/_buildscripts/makerelease
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-if ! _buildscripts/cibuild; then
- printf '%s\n' 'Build failed' >&2
- exit 1
-fi
-
-# Clean out the articles directory
-rm -rf _site/articles
-
-# Create the archive
-rm -rf _release
-mkdir _release
-cp -r _site _release/github-training-kit
-pushd _release
-zip -r github-training-kit.zip github-training-kit/
-popd
diff --git a/_buildscripts/server b/_buildscripts/server
deleted file mode 100755
index 01254c793..000000000
--- a/_buildscripts/server
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-_buildscripts/update
-_buildscripts/cibuild
-
-bundle exec jekyll serve --watch "$@"
diff --git a/_buildscripts/setup b/_buildscripts/setup
deleted file mode 100755
index fb3951426..000000000
--- a/_buildscripts/setup
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-set -e
-export CC=gcc
-
-_buildscripts/bootstrap
-
-echo "==> The app is now ready to go!"
diff --git a/_buildscripts/theme b/_buildscripts/theme
deleted file mode 100755
index ab32b7fd2..000000000
--- a/_buildscripts/theme
+++ /dev/null
@@ -1,6 +0,0 @@
-for STYLES in page home workbook
-do
- echo "- Generating $STYLES"
- sass --style compressed _stylesheets/$STYLES.scss _stylesheets/$STYLES.css
-done
-echo "Completed SASS compiling and CSS compression!"
diff --git a/_buildscripts/update b/_buildscripts/update
deleted file mode 100755
index 32ea8e0eb..000000000
--- a/_buildscripts/update
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-set -e
-export CC=gcc
-
-_buildscripts/bootstrap
diff --git a/_buildscripts/watchsass b/_buildscripts/watchsass
deleted file mode 100755
index a58f3293b..000000000
--- a/_buildscripts/watchsass
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# regenerate the CSS file each time the SCSS file is changed
-sass -w _stylesheets/page.scss
diff --git a/_config.yml b/_config.yml
index ee52a9236..1a124d15e 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,25 +1,62 @@
# For Atom Feed
-domain: training.github.com
-author: GitHub Training Team
-email: training@github.com
-title: GitHub Training
+domain: services.github.com
+author: GitHub, Inc.
+email: services@github.com
-# standard jekyll configuration
+# Site Settings
+locale: "en-US"
+# Keep original, do not replace
+title: "GitHub Cheatsheets"
+title_separator: "-"
+name: "GitHub, Inc."
+description:
+url: "https://training.github.com"
+baseurl: "" # the subpath of your site, e.g. "/blog"
+gh_repo: github/training-kit
+repository: github/training-kit
+teaser: # filename of teaser fallback teaser image placed in /images/, .e.g. "500x300.png"
+breadcrumbs: true # true, false (default)
+words_per_minute: 200
+
+analytics:
+ provider: google # false (default), "google", "google-universal", "custom"
+ google:
+ tracking_id: UA-3769691-2
+
+markdown_ext: "markdown,mkdown,mkdn,mkd,md"
+
+# Conversion
+markdown: kramdown
+highlighter: rouge
+lsi: false
+excerpt_separator: "\n\n"
+incremental: false
+
+# Standard jekyll configuration
+parentsite: https://services.github.com
+permalink: /articles/:title/
+plugins:
+ - jekyll-paginate
+ - jekyll-sitemap
+ - jekyll-gist
+ - jekyll-feed
+ - jemoji
+ - jekyll-redirect-from
+ - jekyll-octicons
-baseurl: /kit
-permalink: /articles/:title
-highlighter: pygments
exclude:
-- bin
-- config.rb
-- Gemfile
-- Gemfile.lock
-- gems
-- Procfile
-- Rakefile
-- README.md
-- script
-- vendor
+ - bin
+ - config.rb
+ - Gemfile*
+ - gems
+ - node_modules
+ - Procfile
+ - Rakefile
+ - README.md
+ - script
+ - vendor
+ - package.json
+ - package-lock.json
collections:
modules:
@@ -28,14 +65,25 @@ collections:
output: true
include:
-- _stylesheets
-- _javascript
-
-markdown: rdiscount
+ - _stylesheets
+ - _javascript
+# Primer CSS (https://primer.style/css/getting-started#for-a-jekyll-site)
sass:
- sass_dir: assets/vendor/
- style: :compressed
+ sass_dir: assets/css
+ load_paths:
+ - assets/_scss
+ - node_modules
+ style: compressed
+ implementation: sass-embedded
# Custom site configuration
lang: en
+
+defaults:
+ - scope:
+ path: ""
+ values:
+ lang: "en"
+ redirect_to:
+ - https://training.github.com
diff --git a/_courses/github-for-developers.md b/_courses/github-for-developers.md
deleted file mode 100644
index 459900c03..000000000
--- a/_courses/github-for-developers.md
+++ /dev/null
@@ -1,72 +0,0 @@
----
-layout: course
-leadingpath: ../
-title: GitHub for Developers
-description: A tour through Git and GitHub concepts for those who use the command line.
-
-sections:
- -
- title: Getting Started with Collaboration
- description: This section introduces you to GitHub and the collaboration features we will use throughout the class.
- modules:
- - COLL-00_Introducing-github
- - COLL-01_Exploring-a-repository
- - COLL-02_Using-issues
- -
- title: Creating Your First Pull Request
- description: In this section you will learn about the GitHub flow and create your first pull request.
- modules:
- - CONT-01_Understanding-github-flow
- - CONT-02_Using-branches
- - CONT-030_Creating-files-platform
- - CONT-035_Creating-pull-requests
- - POLL-01_Pace-poll-01
- - CONT-04_Editing-pull-request-files
- - CONT-05_Merging-pull-requests
- -
- title: Using GitHub Locally
- description: In this section you will learn how to clone the repository to your desktop and work locally to make changes.
- modules:
- - CONT-CLI-01_Basic-Configuration
- - CONT-CLI-02_Cloning-repository
- - CONT-CLI-03_Editing-local-files
- - CONT-CLI-04_Two_Stage_Commit
- - CONT-CLI-05_Sync-changes
- -
- title: The Workflow End-to-End
- description: In this section you will review the workflow from start-to-finish and learn a few shortcuts along the way.
- modules:
- - CONT-CLI-06_Creating-repository-github
- - CONT-CLI-07_Creating-local-branches
- - CONT-CLI-08_Workflow-review
- - CONT-CLI-09_Pulling-changes
- - POLL-02_Pace-poll-02
- -
- title: Working with Local Files
- description: In this section you will learn how to perform common file operations with git.
- modules:
- - CONT-CLI-10_Modifying-local-files
- - CONT-CLI-11_Viewing-local-diffs
- - CONT-CLI-12_Merging-changes
- - CONT-CLI-13_Viewing-project-history
- -
- title: Fixing Common Issues with Git
- description: In this section you will learn how to manipulate your repository and its history to craft a better story for your project.
- modules:
- - CONT-CLI-14_Creating-repository-local
- - CONT-CLI-21_Handling-merge-conflicts
- - CONT-CLI-15_Renaming-moving-files
- - CONT-CLI-16_Reverting-commits
- - CONT-CLI-17_Fixing-bad-commits
- - POLL-03_Pace-poll-03
- - CONT-CLI-18_Unstaging-files
- - CONT-CLI-19_Resetting-history
- - CONT-CLI-20_Discarding-changes-modified-files
- - CONT-CLI-22_Removing-tracked-files
- -
- title: Creating Shortcuts
- description: In this section you will learn how to create custom shortcuts for git commands.
- modules:
- - CONT-CLI-23_Creating-aliases
-
----
diff --git a/_courses/github-for-everyone.md b/_courses/github-for-everyone.md
deleted file mode 100644
index 43646d794..000000000
--- a/_courses/github-for-everyone.md
+++ /dev/null
@@ -1,44 +0,0 @@
----
-layout: course
-leadingpath: ../
-title: GitHub for Everyone
-description: An introduction to GitHub for those who prefer the web browser and graphical clients.
-
-sections:
- -
- title: Getting Started with Collaboration
- description: This section introduces you to GitHub and the collaboration features we will use throughout the class.
- modules:
- - COLL-00_Introducing-github
- - COLL-01_Exploring-a-repository
- - COLL-02_Using-issues
- - COLL-03_Watching-notifications-stars-explore
- -
- title: Creating Your First Pull Request
- description: In this section you will learn about the GitHub flow and create your first pull request.
- modules:
- - CONT-01_Understanding-github-flow
- - CONT-02_Using-branches
- - CONT-030_Creating-files-platform
- - CONT-035_Creating-pull-requests
- - POLL-01_Pace-poll-01
- - CONT-04_Editing-pull-request-files
- - CONT-05_Merging-pull-requests
- -
- title: Using the GitHub Desktop Application
- description: In this section you will learn how to clone the repository to your desktop and work locally to make changes.
- modules:
- - CONT-GHM-01_Basic-Configuration
- - CONT-GHM-02_Cloning-repository
- - CONT-GHM-03_Editing-local-files
- - CONT-GHM-04_Two_Stage_Commit
- - CONT-GHM-05_Sync-changes
- -
- title: Managing Projects on GitHub
- description: In this section you will learn about the project management features in GitHub.
- modules:
- - PROJ-01_Managing-issues-pull-requests
- - PROJ-02_Using-milestones
- - PROJ-03_Using-pulse-graphs
-
----
diff --git a/_includes/analytics-providers/google.html b/_includes/analytics-providers/google.html
new file mode 100644
index 000000000..b591b9954
--- /dev/null
+++ b/_includes/analytics-providers/google.html
@@ -0,0 +1,11 @@
+
\ No newline at end of file
diff --git a/_includes/analytics.html b/_includes/analytics.html
index 112bcbdaf..64a3359aa 100644
--- a/_includes/analytics.html
+++ b/_includes/analytics.html
@@ -1,13 +1,12 @@
-
-
+{% case site.analytics.provider %}
+{% when "google" %}
+ {% include /analytics-providers/google.html %}
+{% when "google-universal" %}
+ {% include /analytics-providers/google-universal.html %}
+{% when "custom" %}
+ {% include /analytics-providers/custom.html %}
+{% endcase %}
+
+{% endif %}
\ No newline at end of file
diff --git a/_includes/attention.html b/_includes/attention.html
deleted file mode 100644
index e2544de10..000000000
--- a/_includes/attention.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{% if page.attention_message %}
-
-
- {{page.attention_message | markdownify}}
-
-
-{% endif %}
diff --git a/_includes/base_path b/_includes/base_path
new file mode 100644
index 000000000..8c7dc62b5
--- /dev/null
+++ b/_includes/base_path
@@ -0,0 +1 @@
+{% capture base_path %}{{ site.url }}{{ site.baseurl }}{% endcapture %}
\ No newline at end of file
diff --git a/_includes/breadcrumbs.html b/_includes/breadcrumbs.html
new file mode 100644
index 000000000..79d242a64
--- /dev/null
+++ b/_includes/breadcrumbs.html
@@ -0,0 +1,55 @@
+{% case site.categories.type %}
+ {% when "liquid" %}
+ {% assign path_type = "#" %}
+ {% when "jekyll-archives" %}
+ {% assign path_type = nil %}
+{% endcase %}
+
+{% if page.collection != 'posts' %}
+ {% assign path_type = nil %}
+ {% assign crumb_path = '/' %}
+{% else %}
+ {% assign crumb_path = site.categories.path %}
+{% endif %}
+
+{% if page.breadcrumbColor %}
+ {% assign breadClass = page.breadcrumbColor %}
+{% else %}
+ {% assign breadClass = "bg-blue-light" %}
+{% endif %}
+
+{% if page.breadcrumbSize %}
+ {% assign size = page.breadcrumbSize %}
+{% else %}
+ {% assign size = "md" %}
+{% endif %}
+
+
diff --git a/_includes/comments-providers/scripts.html b/_includes/comments-providers/scripts.html
new file mode 100644
index 000000000..0e45cb7fb
--- /dev/null
+++ b/_includes/comments-providers/scripts.html
@@ -0,0 +1,16 @@
+{% if site.comments.provider and page.comments %}
+
+{% case site.comments.provider %}
+{% when "disqus" %}
+ {% include /comments-providers/disqus.html %}
+{% when "discourse" %}
+ {% include /comments-providers/discourse.html %}
+{% when "facebook" %}
+ {% include /comments-providers/facebook.html %}
+{% when "google-plus" %}
+ {% include /comments-providers/google-plus.html %}
+{% when "custom" %}
+ {% include /comments-providers/custom.html %}
+{% endcase %}
+
+{% endif %}
diff --git a/_includes/dependencies b/_includes/dependencies
deleted file mode 100644
index 293101498..000000000
--- a/_includes/dependencies
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-{% include analytics.html %}
-
-
-
-
-
-
-
-
-
diff --git a/_includes/footer.html b/_includes/footer.html
index 14ed828a4..c76945977 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,28 +1,18 @@
-