Make cheatsheets easier to maintain and discover

.github/ISSUE_TEMPLATE.md

@@ -26,7 +26,7 @@ If you'd like to make and test changes locally (and see how they would look if m
   - [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/on-demand`.
+    - 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!

CONTRIBUTING.md

@@ -2,29 +2,6 @@
 
 :tada: Thank you for taking the time to contribute and for seeking out these instructions. We :heart: community contributions to these materials.
 
-### Table of Contents
-
-[Code of Conduct](#code-of-conduct)
-
-[I just want to see the published resources!](https://services.github.com/on-demand/)
-
-[What should I know before I contribute?](#what-should-i-know-before-i-contribute?)
-- [The goal of these resources](#the-goal-of-these-resources)
-- [Types of contributions we love](#types-of-contributions-we-love)
-
-[How to contribute](#how-to-contribute)
-- [Report a bug](#report-a-bug)
-- [Translate existing resources](#translate-existing-resources)
-- [Contribute a new resource or course](#contribute-something-new)
-- [Not sure where to start?](#not-sure-where-to-start?)
-
-[Step-by-step contribution guide](#step-by-step-contribution-guide)
-- [Our content philosophy](#our-content-philosophy)
-- [Content structure](#content-structure)
-- [Writing new content](#writing-new-content)
-- [Styling content](#styling-content)
-- [Building and testing](#building-and-testing)
-
 <hr>
 
 ## Code of Conduct
@@ -37,19 +14,18 @@ This project and everyone who participates in it is governed by the [Contributor
 
 ### 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 resources, we hope users will:
+These materials are designed to help those new to Git, GitHub and software development as a whole. By using these cheatsheets, we hope users will:
 
 - Feel welcome and become active contributors in the open source community
-- Complete hands-on activities and receive immediate support from [Teacherbot](https://github.com/teacher-bot/teacherbot), members of the community, and [GitHub's Training team](community.md/#github-trainers)
 - Learn best practices for using Git, GitHub and other GitHub supported projects such as Electron, Atom, etc
 - 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 classes and resources
-- Translations of existing resources such as the [cheatsheets](/downloads/) into new languages
+- Improving the existing cheatsheets
+- Translations of existing cheatsheets into new languages
 - Adding new classes or resources aligned with the [goals](#the-goal-of-these-resources)
 
 <hr>
@@ -58,13 +34,13 @@ We're always looking for contributions to help improve these resources. This inc
 
 ### 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 (Not sure how to do that? [We have a course for you](https://services.github.com/on-demand/)).
+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](https://github.com/github/training-kit/tree/master/downloads) 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 :wink:) If you are planning to contribute a translation, please do the following:
+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 :wink:) 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/master/downloads) using the standard abbreviation for the language you are providing.
@@ -89,48 +65,6 @@ If you just want to help out, but don't have a particular change in mind, check
 
 <hr>
 
-## Step-by-step contribution guide
-
-### Our content philosophy
-
-We are eager to create materials that are easy to use and follow! To that end, here are a few guidelines we ask you to keep in mind:
-
-- We focus on providing friendly and clear, step-by-step instructions.
-- Courses should include a project repository that allows each students to complete an activity.
-- We focus on minimalism in our instructions, giving the learner the opportunity to study the concept in greater detail with the Tell Me Why feature.
-- We appeal to multiple learning styles. Some learners like to read, some like to watch videos, and others just want a recipe.
-
-### Content structure
-
-This repository contains two major collections: [on-demand training courses](https://services.github.com/on-demand/) and listings of [our favorite resources](/resources). We help users navigate these collections sequentially with the [learning path](/resources/learning-path).
-
-#### On-demand course structure
-
-Adding an on-demand course requires you to do the following:
-
-- Add a folder in the [paths directory](/paths) based on the course name
-- Add the course pages in the new folder you created. For an example of a sequential course, check out the [Introduction to GitHub course](/paths/intro-to-github). For a non-sequential course, check out [Git Out of Trouble](/paths/git-trouble)
-- Add the course to the `main` navigation in [_data/navigation.yml](_data/navigation.yml) and add your course navigation in a new section at the end of the files
-
-### Writing new content
-
-If you are contributing content, stay consistent with the existing courses by following these guidelines.
-
-- Vocabulary is italicized to help learners identify their importance and help with cognition.
-  - Example: A *query* is a request for specific information.
-- Button names are bolded to indicate they should be clicked.
-  - Example: Accept the filler text and click **Commit Changes**.
-- Names of repositories, files, branches, variables, or user handles are wrapped in \`backticks\`.
-  - Example: Initialize the repository with a `README.md` file.
-- Code that the learner should type, copy, or execute should be in a fenced code block:
-  - Example: To see the version of your Git installation, type:
-
-          git --version
-- Use given names for complicated concepts, and then explain them. After you've explained them once, use only the given name.
-  - Example: Any Electron app has 2 types of processes: the *main process*, initialized by `package.json`, and a *renderer process* generated by each web page [...] Running `src/index.js` runs the app's main process.
-- Use relevant descriptions of your links, and avoid "click here".
-  - Example: On GitHub.com, [create a new repository](https://github.com/new).
-
 ### 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/).
@@ -144,6 +78,5 @@ To build of the materials do the following:
 1. Run `script/setup`
 1. Run `sass --watch assets/_scss/main.scss:assets/css/main.css` to compile the SCSS
 1. Run `script/server`
-    - When successful, the script will initiate a local server at `http://127.0.0.1:4000/on-demand`.
-    - The `/on-demand/` directory is a result of the [`baseurl` variable](https://byparker.com/blog/2014/clearing-up-confusion-around-baseurl/) provided by Jekyll. If you'd like to serve your site under a different directory, change it in [`_config.yml`](https://github.com/github/training-kit/blob/contrib-guide/_config.yml).
+    - 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

Gemfile

@@ -3,4 +3,5 @@ source "https://rubygems.org"
 gem 'github-pages'
 gem 'html-proofer'
 gem 'rack-contrib', '~> 1.1.0'
-gem 'rake'
+gem 'rake'
+gem 'jekyll-octicons'

Gemfile.lock

@@ -134,6 +134,9 @@ GEM
     jekyll-mentions (1.4.1)
       html-pipeline (~> 2.3)
       jekyll (~> 3.0)
+    jekyll-octicons (8.5.0)
+      jekyll (~> 3.1)
+      octicons (= 8.5.0)
     jekyll-optional-front-matter (0.3.0)
       jekyll (~> 3.0)
     jekyll-paginate (1.1.0)
@@ -217,6 +220,8 @@ GEM
     multipart-post (2.0.0)
     nokogiri (1.10.1)
       mini_portile2 (~> 2.4.0)
+    octicons (8.5.0)
+      nokogiri (>= 1.6.3.1)
     octokit (4.13.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     parallel (1.14.0)
@@ -260,6 +265,7 @@ PLATFORMS
 DEPENDENCIES
   github-pages
   html-proofer
+  jekyll-octicons
   rack-contrib (~> 1.1.0)
   rake
 

README.md

@@ -1,21 +1,19 @@
-![servicesbanner](https://cloud.githubusercontent.com/assets/13326548/21035994/ad40c19c-bd77-11e6-97fa-78b068050c05.jpg)
-
 [![Build Status](https://travis-ci.org/github/training-kit.svg?branch=master)](https://travis-ci.org/github/training-kit)
 
-# GitHub Training Kit
-### Home of GitHub's On-Demand training
-
-This repository contains the completely open source on-demand training hosted at https://services.github.com/on-demand/. These materials are provided under a [_Creative Commons License_ license](https://github.com/github/training-kit/blob/master/LICENSE).
+# GitHub Training Kit: Cheatsheets
 
 ## We :heart: Contributors Like You!
 
 **We’re eager to work with you**, our user community to improve these materials and develop new ones. Please check out our [CONTRIBUTING guide](https://github.com/github/training-kit/blob/master/CONTRIBUTING.md) for more information on getting started.
 
+## Looking for a resource that was once housed in training-kit?
+
+This repository currently contains the Git and GitHub Cheatsheets. 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
 
 - 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).
-- The corner badge of an Octocat is from [tholman.com](http://tholman.com/github-corners/)
 
 ## Packaging for Viewing Behind Your Firewall
 
@@ -32,7 +30,7 @@ If you'd like to have a copy of the files to be served from a web server inside
 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 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
-> <a href="https://services.github.com/on-demand/">services.github.com/on-demand/</a>
+> <a href="https://github.github.com/training-kit/">github.github.com/training-kit/</a>
 > used under the
 > <a href="https://creativecommons.org/licenses/by/4.0/">CC-BY-4.0</a>
 > license.</a>

_config.yml

@@ -7,12 +7,12 @@ email: services@github.com
 # Site Settings
 locale                   : "en-US"
 # Keep original, do not replace
-title                    : "On Demand Training"
+title                    : "GitHub Cheatsheets"
 title_separator          : "-"
 name                     : "GitHub, Inc."
-description              : "You're in control. We're with you along the way."
-baseurl                  : "/on-demand" # the subpath of your site, e.g. "/blog"
-gh_repo                  :
+description              : 
+baseurl                  :  # the subpath of your site, e.g. "/blog"
+gh_repo                  : 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
@@ -56,6 +56,7 @@ plugins:
   - jekyll-feed
   - jemoji
   - jekyll-redirect-from
+  - jekyll-octicons
 
 exclude:
 - bin
@@ -94,4 +95,4 @@ defaults:
     values:
       lang: "en"
       redirect_to:
-        - https://lab.github.com
+        - https://lab.github.com