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
index f5688f943..17bb40993 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -13,7 +13,7 @@
### 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://services.github.com/on-demand/intro-to-github/) is a refresher course if you're unsure about how to make a change on GitHub.
+- [ ] Use the [GitHub Flow](https://guides.github.com/introduction/flow/) to make changes to your fork. [This](https://services.github.com{{site.baseurl}}/intro-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
@@ -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{{site.baseurl}}`.
### Questions?
- Leave a comment on this issue! Make sure to use @ mentions if you want a specific person's attention!
diff --git a/.gitignore b/.gitignore
index 214dd9925..a1bca9e76 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@ _site/
.sass-cache/
*.*~
_release
+*.map
+.jekyll-metadata
diff --git a/.travis.yml b/.travis.yml
index d0d589d89..048a849e9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
language: ruby
rvm:
- - 2.0
+ - 2.3.1
script:
- script/cibuild
diff --git a/Gemfile.lock b/Gemfile.lock
index cd79501ce..5252aae87 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,144 +1,226 @@
GEM
remote: https://rubygems.org/
specs:
- RedCloth (4.2.9)
- activesupport (4.2.6)
+ activesupport (4.2.8)
i18n (~> 0.7)
- json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
- addressable (2.4.0)
+ addressable (2.5.1)
+ public_suffix (~> 2.0, >= 2.0.2)
coffee-script (2.4.1)
coffee-script-source
execjs
- coffee-script-source (1.10.0)
- colorator (0.1)
+ coffee-script-source (1.12.2)
+ colorator (1.1.0)
colored (1.2)
- ethon (0.9.0)
+ ethon (0.10.1)
ffi (>= 1.3.0)
- execjs (2.6.0)
- faraday (0.9.2)
+ execjs (2.7.0)
+ faraday (0.13.0)
multipart-post (>= 1.2, < 3)
- ffi (1.9.10)
- gemoji (2.1.0)
- github-pages (77)
- RedCloth (= 4.2.9)
- github-pages-health-check (= 1.1.0)
- jekyll (= 3.0.5)
+ ffi (1.9.18)
+ forwardable-extended (2.6.0)
+ gemoji (3.0.0)
+ github-pages (151)
+ activesupport (= 4.2.8)
+ github-pages-health-check (= 1.3.5)
+ jekyll (= 3.5.1)
+ jekyll-avatar (= 0.4.2)
jekyll-coffeescript (= 1.0.1)
- jekyll-feed (= 0.5.1)
- jekyll-gist (= 1.4.0)
- jekyll-github-metadata (= 1.11.1)
- jekyll-mentions (= 1.1.2)
+ jekyll-default-layout (= 0.1.4)
+ jekyll-feed (= 0.9.2)
+ jekyll-gist (= 1.4.1)
+ jekyll-github-metadata (= 2.6.0)
+ jekyll-mentions (= 1.2.0)
+ jekyll-optional-front-matter (= 0.2.0)
jekyll-paginate (= 1.1.0)
- jekyll-redirect-from (= 0.10.0)
- jekyll-sass-converter (= 1.3.0)
- jekyll-seo-tag (= 1.4.0)
- jekyll-sitemap (= 0.10.0)
- jekyll-textile-converter (= 0.1.0)
- jemoji (= 0.6.2)
- kramdown (= 1.10.0)
- liquid (= 3.0.6)
+ jekyll-readme-index (= 0.1.0)
+ jekyll-redirect-from (= 0.12.1)
+ jekyll-relative-links (= 0.4.1)
+ jekyll-sass-converter (= 1.5.0)
+ jekyll-seo-tag (= 2.2.3)
+ jekyll-sitemap (= 1.0.0)
+ jekyll-swiss (= 0.4.0)
+ jekyll-theme-architect (= 0.1.0)
+ jekyll-theme-cayman (= 0.1.0)
+ jekyll-theme-dinky (= 0.1.0)
+ jekyll-theme-hacker (= 0.1.0)
+ jekyll-theme-leap-day (= 0.1.0)
+ jekyll-theme-merlot (= 0.1.0)
+ jekyll-theme-midnight (= 0.1.0)
+ jekyll-theme-minimal (= 0.1.0)
+ jekyll-theme-modernist (= 0.1.0)
+ jekyll-theme-primer (= 0.4.0)
+ jekyll-theme-slate (= 0.1.0)
+ jekyll-theme-tactile (= 0.1.0)
+ jekyll-theme-time-machine (= 0.1.0)
+ jekyll-titles-from-headings (= 0.4.0)
+ jemoji (= 0.8.0)
+ kramdown (= 1.13.2)
+ liquid (= 4.0.0)
listen (= 3.0.6)
mercenary (~> 0.3)
- rdiscount (= 2.1.8)
- redcarpet (= 3.3.3)
- rouge (= 1.10.1)
+ minima (= 2.1.1)
+ rouge (= 1.11.1)
terminal-table (~> 1.4)
- github-pages-health-check (1.1.0)
+ github-pages-health-check (1.3.5)
addressable (~> 2.3)
net-dns (~> 0.8)
octokit (~> 4.0)
- public_suffix (~> 1.4)
+ public_suffix (~> 2.0)
typhoeus (~> 0.7)
- html-pipeline (2.4.0)
- activesupport (>= 2, < 5)
+ html-pipeline (2.6.0)
+ activesupport (>= 2)
nokogiri (>= 1.4)
- html-proofer (3.0.5)
- activesupport (~> 4.2)
+ html-proofer (3.7.2)
+ activesupport (>= 4.2, < 6.0)
addressable (~> 2.3)
colored (~> 1.2)
mercenary (~> 0.3.2)
- nokogiri (~> 1.5)
+ nokogiri (~> 1.7)
parallel (~> 1.3)
typhoeus (~> 0.7)
yell (~> 2.0)
- i18n (0.7.0)
- jekyll (3.0.5)
- colorator (~> 0.1)
+ i18n (0.8.6)
+ jekyll (3.5.1)
+ addressable (~> 2.4)
+ colorator (~> 1.0)
jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 1.1)
kramdown (~> 1.3)
- liquid (~> 3.0)
+ liquid (~> 4.0)
mercenary (~> 0.3.3)
+ pathutil (~> 0.9)
rouge (~> 1.7)
safe_yaml (~> 1.0)
+ jekyll-avatar (0.4.2)
+ jekyll (~> 3.0)
jekyll-coffeescript (1.0.1)
coffee-script (~> 2.2)
- jekyll-feed (0.5.1)
- jekyll-gist (1.4.0)
+ jekyll-default-layout (0.1.4)
+ jekyll (~> 3.0)
+ jekyll-feed (0.9.2)
+ jekyll (~> 3.3)
+ jekyll-gist (1.4.1)
octokit (~> 4.2)
- jekyll-github-metadata (1.11.1)
- octokit (~> 4.0)
- jekyll-mentions (1.1.2)
+ jekyll-github-metadata (2.6.0)
+ jekyll (~> 3.1)
+ octokit (~> 4.0, != 4.4.0)
+ jekyll-mentions (1.2.0)
+ activesupport (~> 4.0)
html-pipeline (~> 2.3)
jekyll (~> 3.0)
+ jekyll-optional-front-matter (0.2.0)
+ jekyll (~> 3.0)
jekyll-paginate (1.1.0)
- jekyll-redirect-from (0.10.0)
- jekyll (>= 2.0)
- jekyll-sass-converter (1.3.0)
- sass (~> 3.2)
- jekyll-seo-tag (1.4.0)
+ jekyll-readme-index (0.1.0)
jekyll (~> 3.0)
- jekyll-sitemap (0.10.0)
- jekyll-textile-converter (0.1.0)
- RedCloth (~> 4.0)
- jekyll-watch (1.4.0)
+ jekyll-redirect-from (0.12.1)
+ jekyll (~> 3.3)
+ jekyll-relative-links (0.4.1)
+ jekyll (~> 3.3)
+ jekyll-sass-converter (1.5.0)
+ sass (~> 3.4)
+ jekyll-seo-tag (2.2.3)
+ jekyll (~> 3.3)
+ jekyll-sitemap (1.0.0)
+ jekyll (~> 3.3)
+ jekyll-swiss (0.4.0)
+ jekyll-theme-architect (0.1.0)
+ jekyll (~> 3.5)
+ jekyll-seo-tag (~> 2.0)
+ jekyll-theme-cayman (0.1.0)
+ jekyll (~> 3.5)
+ jekyll-seo-tag (~> 2.0)
+ jekyll-theme-dinky (0.1.0)
+ jekyll (~> 3.5)
+ jekyll-seo-tag (~> 2.0)
+ jekyll-theme-hacker (0.1.0)
+ jekyll (~> 3.5)
+ jekyll-seo-tag (~> 2.0)
+ jekyll-theme-leap-day (0.1.0)
+ jekyll (~> 3.5)
+ jekyll-seo-tag (~> 2.0)
+ jekyll-theme-merlot (0.1.0)
+ jekyll (~> 3.5)
+ jekyll-seo-tag (~> 2.0)
+ jekyll-theme-midnight (0.1.0)
+ jekyll (~> 3.5)
+ jekyll-seo-tag (~> 2.0)
+ jekyll-theme-minimal (0.1.0)
+ jekyll (~> 3.5)
+ jekyll-seo-tag (~> 2.0)
+ jekyll-theme-modernist (0.1.0)
+ jekyll (~> 3.5)
+ jekyll-seo-tag (~> 2.0)
+ jekyll-theme-primer (0.4.0)
+ jekyll (~> 3.5)
+ jekyll-seo-tag (~> 2.2)
+ jekyll-theme-slate (0.1.0)
+ jekyll (~> 3.5)
+ jekyll-seo-tag (~> 2.0)
+ jekyll-theme-tactile (0.1.0)
+ jekyll (~> 3.5)
+ jekyll-seo-tag (~> 2.0)
+ jekyll-theme-time-machine (0.1.0)
+ jekyll (~> 3.5)
+ jekyll-seo-tag (~> 2.0)
+ jekyll-titles-from-headings (0.4.0)
+ jekyll (~> 3.3)
+ jekyll-watch (1.5.0)
listen (~> 3.0, < 3.1)
- jemoji (0.6.2)
- gemoji (~> 2.0)
+ jemoji (0.8.0)
+ activesupport (~> 4.0)
+ gemoji (~> 3.0)
html-pipeline (~> 2.2)
jekyll (>= 3.0)
- json (1.8.3)
- kramdown (1.10.0)
- liquid (3.0.6)
+ kramdown (1.13.2)
+ liquid (4.0.0)
listen (3.0.6)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9.7)
mercenary (0.3.6)
- mini_portile2 (2.0.0)
- minitest (5.8.4)
+ mini_portile2 (2.2.0)
+ minima (2.1.1)
+ jekyll (~> 3.3)
+ minitest (5.10.3)
multipart-post (2.0.0)
net-dns (0.8.0)
- nokogiri (1.6.7.2)
- mini_portile2 (~> 2.0.0.rc2)
- octokit (4.3.0)
- sawyer (~> 0.7.0, >= 0.5.3)
- parallel (1.8.0)
- public_suffix (1.5.3)
- rack (1.5.2)
+ nokogiri (1.8.0)
+ mini_portile2 (~> 2.2.0)
+ octokit (4.7.0)
+ sawyer (~> 0.8.0, >= 0.5.3)
+ parallel (1.12.0)
+ pathutil (0.14.0)
+ forwardable-extended (~> 2.6)
+ public_suffix (2.0.5)
+ rack (2.0.3)
rack-contrib (1.1.0)
rack (>= 0.9.1)
- rake (10.3.2)
- rb-fsevent (0.9.7)
- rb-inotify (0.9.7)
- ffi (>= 0.5.0)
- rdiscount (2.1.8)
- redcarpet (3.3.3)
- rouge (1.10.1)
+ rake (12.0.0)
+ rb-fsevent (0.10.2)
+ rb-inotify (0.9.10)
+ ffi (>= 0.5.0, < 2)
+ rouge (1.11.1)
safe_yaml (1.0.4)
- sass (3.4.22)
- sawyer (0.7.0)
- addressable (>= 2.3.5, < 2.5)
- faraday (~> 0.8, < 0.10)
- terminal-table (1.5.2)
- thread_safe (0.3.5)
+ sass (3.5.1)
+ sass-listen (~> 4.0.0)
+ sass-listen (4.0.0)
+ rb-fsevent (~> 0.9, >= 0.9.4)
+ rb-inotify (~> 0.9, >= 0.9.7)
+ sawyer (0.8.1)
+ addressable (>= 2.3.5, < 2.6)
+ faraday (~> 0.8, < 1.0)
+ terminal-table (1.8.0)
+ unicode-display_width (~> 1.1, >= 1.1.1)
+ thread_safe (0.3.6)
typhoeus (0.8.0)
ethon (>= 0.8.0)
- tzinfo (1.2.2)
+ tzinfo (1.2.3)
thread_safe (~> 0.1)
- yell (2.0.6)
+ unicode-display_width (1.3.0)
+ yell (2.0.7)
PLATFORMS
ruby
@@ -150,4 +232,4 @@ DEPENDENCIES
rake
BUNDLED WITH
- 1.12.0
+ 1.15.3
diff --git a/README.md b/README.md
index f3b870e85..1467abd3c 100644
--- a/README.md
+++ b/README.md
@@ -5,13 +5,13 @@
# 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).
+This repository contains the completely open source on-demand training hosted at https://services.github.com{{site.baseurl}}/. These materials are provided under a [_Creative Commons License_ license](https://github.com/github/training-kit/blob/master/LICENSE).
## We :heart: Contributors Like You!
**We’re eager to work with you**, our user community to improve these materials and develop new ones. Here's how you can help:
-- **You spotted a mistake:** 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)).
+- **You spotted a mistake:** 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{{site.baseurl}})).
- **You have an idea to make it better:** we :heart: new ideas! We invite you to open a new [Issue](https://github.com/github/training-kit/issues) if you want to talk about it, or you can [fork this repository](https://help.github.com/articles/working-with-forks/) and submit your idea via a Pull Request.
- **You just want to help:** 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).
@@ -21,9 +21,9 @@ For more information on contributing to this repository, check out our [CONTRIBU
This repository contains three primary resources:
-- Our current [on-demand courses](https://services.github.com/on-demand/) can be found in the [paths directory](/paths)
-- The translations of our popular [Git Cheat Sheets](https://services.github.com/on-demand/downloads/github-git-cheat-sheet.pdf) can be found in the [downloads directory](/downloads). We're always looking for more. _P.S._ Right now the PDF generation is a manual process so please mention @github/services-training for assistance in getting your translation moved to the PDF.
-- The recommended [Training Path](https://services.github.com/on-demand/path/) can be found [here](/self-study.md).
+- Our current [on-demand courses](https://services.github.com{{site.baseurl}}/) can be found in the [paths directory](/paths)
+- The translations of our popular [Git Cheat Sheets](https://services.github.com{{site.baseurl}}/downloads/github-git-cheat-sheet.pdf) can be found in the [downloads directory](/downloads). We're always looking for more. _P.S._ Right now the PDF generation is a manual process so please mention @github/services-training for assistance in getting your translation moved to the PDF.
+- The recommended Training Path can be found [here](https://services.github.com/resources/learning-path/).
## Our Content Philosophy
@@ -31,9 +31,11 @@ We are eager to create materials that are easy to use and follow! To that end, h
- We focus on providing clear, step-by-step instructions for completing an activity, giving the learner the opportunity to study the concept in greater detail with the Tell Me Why feature.
- We focus on minimalism.
+
+## Projects Used in Training-Kit
- We use [Jekyll](https://jekyllrb.com/) and [Markdown](https://guides.github.com/features/mastering-markdown/).
- The theme for the on-demand training is [Minimal Mistakes](https://mmistakes.github.io/minimal-mistakes/) and has some [amazing documentation](https://mmistakes.github.io/minimal-mistakes/docs/quick-start-guide/).
-
+- The corner badge of an Octocat is from [tholman.com](http://tholman.com/github-corners/)
## Building and Packaging
@@ -45,8 +47,12 @@ To perform a build of the materials perform the following:
1. Run `script/setup`
1. 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{{site.baseurl}}`.
1. Simply paste that into your favorite web-browser and you will be ready to test.
+1. You'll also need to run the following script to compile the SCSS (you can remove the `watch` flag if desired):
+```
+sass --watch assets/_scss/main.scss:assets/css/main.css
+```
#### Packaging for Viewing Behind Your Firewall
@@ -63,7 +69,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
-> github.com/github/on-demand
+> services.github.com{{site.baseurl}}
> used under the
> CC-BY-4.0
> license.
diff --git a/Rakefile b/Rakefile
index f51886d5a..a2e66a52a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -8,4 +8,4 @@ task :test do
end
-task default: :test
+task default: :test
\ No newline at end of file
diff --git a/_config.yml b/_config.yml
index a17b073bc..66ce34c3d 100644
--- a/_config.yml
+++ b/_config.yml
@@ -49,7 +49,7 @@ incremental: false
parentsite: https://services.github.com
permalink: /articles/:title/
-gems:
+plugins:
- jekyll-paginate
- jekyll-sitemap
- jekyll-gist
@@ -78,7 +78,7 @@ include:
- _stylesheets
- _javascript
sass:
- sass_dir: assets/vendor/
+ sass_dir: assets/_scss
style: :compressed
# Custom site configuration
diff --git a/_data/navigation.yml b/_data/navigation.yml
index d738db241..dc35543d7 100644
--- a/_data/navigation.yml
+++ b/_data/navigation.yml
@@ -3,123 +3,236 @@ main:
# Keep original nav, do not replace
- title: "Introduction to GitHub"
url: /intro-to-github/
- - title: "Using GitHub Desktop"
- beta: true
+ - title: "GitHub Pages from GitHub Desktop"
url: /github-desktop/
- - title: "Using the Command Line"
- beta: true
+ - title: "GitHub Pages from the Command Line"
url: /github-cli/
- - title: "Community"
+ - title: "Git Out of Trouble"
+ url: /git-trouble/
+ - title: "GitHub for Windows Users"
+ url: /windows/
+ - title: "Introduction to GraphQL"
+ url: /graphql/
+ - title: "Electron Suite"
+ url: /electron/
+ - title: "Git & GitHub Training Path"
+ url: /path/
+ - title: "GitHub Training Community"
url: /community/
# When creating new sidebar navs, remember the url in this document needs to match the url assigned in the permalink field.
intro-nav:
- - title: "Welcome"
+ - title: "Introduction to GitHub"
url: /intro-to-github/
- title: "Create a GitHub Account"
- url: /intro-to-github/01/
+ url: /intro-to-github/create-github-account
- title: "Join the Class Repository"
- url: /intro-to-github/02/
- - title: "Manage Notifications"
- url: /intro-to-github/03/
- - title: "Exploring the Repository"
- url: /intro-to-github/04/
- - title: "Using GitHub Flow"
- url: /intro-to-github/05/
- - title: "Creating a Branch"
- url: /intro-to-github/06/
+ url: /intro-to-github/join-class-repository
+ - title: "Explore the GitHub Repository"
+ url: /intro-to-github/explore-github-repository
+ - title: "Use GitHub Flow"
+ url: /intro-to-github/use-github-flow
+ - title: "Create a Branch"
+ url: /intro-to-github/create-a-branch
- title: "Find Your Coordinates"
- url: /intro-to-github/07/
- - title: "Working on GitHub"
- url: /intro-to-github/08/
- - title: "Creating a Pull Request"
- url: /intro-to-github/09/
- - title: "Collaborating on GitHub"
- url: /intro-to-github/10/
- - title: "Editing Files"
- url: /intro-to-github/11/
- - title: "Merging Pull Requests"
- url: /intro-to-github/12/
- - title: "Celebrate"
- url: /intro-to-github/13/
-
-gh-pages:
- - title: "Introduction to GitHub Pages"
- url: /patchwork/gh-pages/
- - title: "Editing Your GitHub Page"
- url: /patchwork/gh-pages/02/
- - title: "Creating Pages and Posts in Jekyll"
- url: /patchwork/gh-pages/03/
- - title: "Templates and Design"
- url: /patchwork/gh-pages/04/
- - title: "Installing Jekyll Locally"
- url: /patchwork/gh-pages/05/
+ url: /intro-to-github/find-your-coordinates
+ - title: "Work on GitHub"
+ url: /intro-to-github/work-on-github
+ - title: "Create a Pull Request"
+ url: /intro-to-github/create-pull-request
+ - title: "Collaborate on GitHub"
+ url: /intro-to-github/collaborate-on-github
+ - title: "Edit Files on GitHub"
+ url: /intro-to-github/edit-files-on-github
+ - title: "Merge Your Pull Request"
+ url: /intro-to-github/merge-pull-request
+ - title: "You Completed the GitHub Flow"
+ url: /intro-to-github/you-completed-github-flow
github-desktop-nav:
- - title: "Welcome"
- url: /github-desktop/
- - title: "Install GitHub Desktop"
- url: /github-desktop/02/
- - title: "Create the Remote Repository"
- url: /github-desktop/03/
- - title: "Clone the Repository"
- url: /github-desktop/04/
- - title: "Create Local Branches"
- url: /github-desktop/05/
- - title: "Make Local Changes"
- url: /github-desktop/06/
- - title: "Add Local Commits"
- url: /github-desktop/07/
- - title: "Open a Pull Request"
- url: /github-desktop/08/
- - title: "Merge Your Pull Request"
- url: /github-desktop/09/
- - title: "View Your site"
- url: /github-desktop/10/
- - title: "Keep Things in Sync"
- url: /github-desktop/11/
- - title: "Add Your Site to the Showcase"
- url: /github-desktop/12/
- - title: "Review the Local Workflow"
- url: /github-desktop/13/
- - title: "Review Pushing and Opening Pull Requests"
- url: /github-desktop/14/
- - title: "Let's Collaborate!"
- url: /github-desktop/15/
- - title: "Merge Your PR"
- url: /github-desktop/16/
+ - title: "GitHub Pages & GitHub Desktop"
+ url: /github-desktop/
+ - title: "Install GitHub Desktop"
+ url: /github-desktop/install-github-desktop
+ - title: "Create the Remote Repository on GitHub"
+ url: /github-desktop/create-remote-repository
+ - title: "Choose a GitHub Pages Theme"
+ url: /github-desktop/choose-github-pages-theme
+ - title: "Clone the Repository with GitHub Desktop"
+ url: /github-desktop/clone-repository-github-desktop
+ - title: "Create Local Branches With GitHub Desktop"
+ url: /github-desktop/create-branches-github-desktop
+ - title: "Make Local Changes With GitHub Desktop"
+ url: /github-desktop/make-changes-github-desktop
+ - title: "Add Local Commits With GitHub Desktop"
+ url: /github-desktop/add-commits-github-desktop
+ - title: "Open a Pull Request With GitHub Desktop"
+ url: /github-desktop/pull-request-github-desktop
+ - title: "Merge Your Pull Request on GitHub"
+ url: /github-desktop/merge-pull-request-github
+ - title: "View Your GitHub Pages Site"
+ url: /github-desktop/view-github-pages-site
+ - title: "Push to GitHub with GitHub Desktop"
+ url: /github-desktop/push-with-github-desktop
+ - title: "Add Your GitHub Pages Site to the Showcase"
+ url: /github-desktop/add-github-pages-site-showcase
+ - title: "Review the Local GitHub Flow"
+ url: /github-desktop/review-github-flow
+ - title: "Push to GitHub & Create a Pull Request"
+ url: /github-desktop/push-pull-request-github-desktop
+ - title: "Collaborate With GitHub Pull Requests"
+ url: /github-desktop/collaborate-github-pull-requests
+ - title: "Merge Your Pull Request on GitHub"
+ url: /github-desktop/merge-pull-request-showcase
github-cli:
- - title: "Welcome"
+ - title: "GitHub Pages & Git in the Command Line"
url: /github-cli/
- title: "Git Configuration"
- url: /github-cli/02
- - title: "Create the Remote Repository"
- url: /github-cli/03
- - title: "Clone the Repository"
- url: /github-cli/04
- - title: "Create Local Branches"
- url: /github-cli/05
- - title: "Make Local Changes"
- url: /github-cli/06
- - title: "Add Local Commits"
- url: /github-cli/07
- - title: "Open a Pull Request"
- url: /github-cli/08
- - title: "Merge Your Pull Request"
- url: /github-cli/09
- - title: "View Your site"
- url: /github-cli/10
- - title: "Keep Things in Sync"
- url: /github-cli/11
- - title: "Add Your Site to the Showcase"
- url: /github-cli/12
- - title: "Review the Local Workflow"
- url: /github-cli/13
+ url: /github-cli/git-configuration
+ - title: "Create the Remote Repository on GitHub"
+ url: /github-cli/create-remote-repository
+ - title: "Choose a GitHub Pages Theme"
+ url: /github-cli/choose-github-pages-theme
+ - title: "Clone the Repository Using the Command Line"
+ url: /github-cli/clone-repo-cli
+ - title: "Create Local Branches With Git"
+ url: /github-cli/create-branches-git
+ - title: "Make Local Changes With Git"
+ url: /github-cli/make-local-changes-git
+ - title: "Add Local Commits With Git"
+ url: /github-cli/add-commits-git
+ - title: "Open a Pull Request on GitHub"
+ url: /github-cli/open-pull-request-github
+ - title: "Merge Your Pull Request on GitHub"
+ url: /github-cli/merge-pull-request-github
+ - title: "View Your GitHub Pages Site"
+ url: /github-cli/view-github-pages-site
+ - title: "Git Push & Git Pull"
+ url: /github-cli/git-push-git-pull
+ - title: "Add Your GitHub Pages Site to the Showcase"
+ url: /github-cli/add-github-pages-site-showcase
+ - title: "Review the Local GitHub Flow in the Command Line"
+ url: /github-cli/github-flow-cli
- title: "Review Pushing and Opening Pull Requests"
- url: /github-cli/14
- - title: "Let's Collaborate!"
- url: /github-cli/15
- - title: "Merge Your PR"
- url: /github-cli/16
+ url: /github-cli/git-push-open-pull-request
+ - title: "Collaborate With GitHub Pull Requests"
+ url: /github-cli/collaborate-github-pull-requests
+ - title: "Merge Your Pull Request on GitHub"
+ url: /github-cli/merge-pull-request-github-showcase
+
+advanced:
+ - title: "Welcome to Git Out Of Trouble"
+ url: /git-trouble/
+ - title: "Set Up Your Git Scenario Environment"
+ url: /git-trouble/git-set-up
+ - title: "Git Trouble Scenarios"
+ url: /git-trouble/git-scenarios
+ children:
+ - title: "Too Many (small) Git Commits"
+ url: /git-trouble/too-many-commits
+ - title: "Git Commit Message Sucks"
+ url: /git-trouble/git-commit-message
+ - title: "Git Committed to Wrong Branch"
+ url: /git-trouble/git-commit-wrong-branch
+ - title: "Accidental Git Commit"
+ url: /git-trouble/accidental-git-commit
+ - title: "Just Make it Go Away - Breaking Things With Git"
+ url: /git-trouble/breaking-things-with-git
+
+windows:
+ - title: "Welcome to GitHub for Windows Users"
+ url: /windows/
+ - title: "Get Started"
+ url: /windows/getting-started
+ children:
+ - title: "Install Git"
+ url: /windows/installing-git
+ - title: "Configure Git"
+ url: /windows/configure-git
+ - title: "Configure Line Endings"
+ url: /windows/git-crlf
+ - title: "Store Your Password"
+ url: /windows/git-credentials
+ - title: "Editors"
+ url: /windows/editors
+ children:
+ - title: "vi Basics"
+ url: /windows/vi-basics
+ - title: "Configure Other Editors"
+ url: /windows/configure-editors
+ - title: "Visual Studio Integration"
+ url: /windows/visual-studio
+ children:
+ - title: "Install the GitHub Extension"
+ url: /windows/install-visual-studio
+ - title: "Start a Project"
+ url: /windows/vs-start-project
+ - title: "Make a Commit"
+ url: /windows/vs-make-commit
+ - title: "What is Sync?"
+ url: /windows/vs-sync
+ - title: "Congratulations"
+ url: /windows/congrats
+
+
+github-graphql:
+ - title: "Introduction to GraphQL"
+ url: /graphql/
+ - title: "Use GraphQL for the First Time"
+ url: /graphql/first-use
+ - title: "Build a Query"
+ url: /graphql/first-query
+ - title: "Grab a Query's Response"
+ url: /graphql/query-info
+ - title: "Use a Query to Find Specific Information"
+ url: /graphql/another-query
+ - title: "Create a Mutation"
+ url: /graphql/mutation
+
+
+create-an-app-in-electron:
+ - title: "Get Started with Electron"
+ url: /electron/create-an-app/
+ - title: "Create your app"
+ url: /electron/create-an-app/create-your-app/
+ - title: "Push your project to GitHub"
+ url: /electron/create-an-app/push-your-project-to-github/
+ - title: "Create your App's Files"
+ url: /electron/create-an-app/create-your-apps-files/
+ - title: "Run Your First Electron App"
+ url: /electron/create-an-app/run-your-first-electron-app/
+ - title: "Add your index.html"
+ url: /electron/create-an-app/add-your-index-html/
+ - title: "Add CSS"
+ url: /electron/create-an-app/add-css/
+ - title: "Add JavaScript"
+ url: /electron/create-an-app/add-javascript/
+ - title: "Celebrate"
+ url: /electron/create-an-app/celebrate/
+
+
+electron-package-your-app:
+ - title: "Package Your App for Downloads"
+ url: /electron/package-your-app/
+ - title: "Use electron-packager"
+ url: /electron/package-your-app/use-electron-packager/
+ - title: "Add an icon"
+ url: /electron/package-your-app/add-an-icon/
+ - title: "Test Your App"
+ url: /electron/package-your-app/test-your-app/
+ - title: "Celebrate"
+ url: /electron/package-your-app/celebrate/
+
+
+
+electron-share-your-app:
+ - title: "Share Your App"
+ url: /electron/share-your-app/
+ - title: "List on App Stores"
+ url: /electron/share-your-app/list-on-app-stores/
+ - title: "Share on Websites"
+ url: /electron/share-your-app/share-on-websites/
+ - title: "Celebrate"
+ url: /electron/share-your-app/celebrate/
diff --git a/_includes/activity/gh-pages/02-create-profile.md b/_includes/activity/gh-pages/02-create-profile.md
index 9e4057c0c..774727159 100644
--- a/_includes/activity/gh-pages/02-create-profile.md
+++ b/_includes/activity/gh-pages/02-create-profile.md
@@ -30,5 +30,5 @@ Don't worry if you don't want to put your actual information up online. It's OK
{{ activity-text | markdownify }}
-Need help? Click **open chat** below for answers from GitHub trainers!
+Need help? **Open an issue** [in our class repository](https://github.com/githubschool{{site.baseurl}}-github-pages/issues/new) for answers from GitHub trainers!
{: .notice--success}
diff --git a/_includes/activity/gh-pages/03-create-new-page.md b/_includes/activity/gh-pages/03-create-new-page.md
index cdd33d5fe..1af1ec8b6 100644
--- a/_includes/activity/gh-pages/03-create-new-page.md
+++ b/_includes/activity/gh-pages/03-create-new-page.md
@@ -15,5 +15,5 @@ Time to add our work history as a page to our Jekyll site.
{{ activity-text | markdownify }}
-Need help? Click **open chat** below for answers from GitHub trainers!
+Need help? **Open an issue** [in our class repository](https://github.com/githubschool{{site.baseurl}}-github-pages/issues/new) for answers from GitHub trainers!
{: .notice--success}
diff --git a/_includes/activity/gh-pages/04-more-content.md b/_includes/activity/gh-pages/04-more-content.md
index ca13994d6..a7dadf990 100644
--- a/_includes/activity/gh-pages/04-more-content.md
+++ b/_includes/activity/gh-pages/04-more-content.md
@@ -24,5 +24,5 @@ You might also look into the "collections" functionality in Jekyll. This would l
{{ activity-text | markdownify }}
-Need help? Click **open chat** below for answers from GitHub trainers!
+Need help? **Open an issue** [in our class repository](https://github.com/githubschool{{site.baseurl}}-github-pages/issues/new) for answers from GitHub trainers!
{: .notice--success}
diff --git a/_includes/activity/github-CLI/05-make-commits.md b/_includes/activity/github-CLI/05-make-commits.md
index f30469fb0..851679e0b 100644
--- a/_includes/activity/github-CLI/05-make-commits.md
+++ b/_includes/activity/github-CLI/05-make-commits.md
@@ -6,6 +6,6 @@ Your file is listed under the heading _Untracked files_.
1. Type `git status` again to see what has changed. Your file is now listed under the heading _Changes to be committed_. This tells us that the file is in the staging area. It also indicates this is a new file.
1. Type `git commit`. This tells git to collect all of the files in the staging area and commit them to version control as a single unit of work. Git will open your default text editor where you can enter the commit message.
1. Type the commit message, save and quit your editor.
- - The default text editor associated with git is `vi` in most cases, which requires that you type `:wq` to save and quit after entering your commit message.
+ - The default text editor associated with git is `vi` in most cases, which requires that you press the `Esc` key then type `:wq` to save and quit after entering your commit message.
- Alternatively, you can bypass `vi` altogether and enter your commit message inline with `git commit -m "your message"`
1. To see the history of commits, type `git log`.
diff --git a/_includes/activity/github-CLI/clisurvey.md b/_includes/activity/github-CLI/clisurvey.md
new file mode 100644
index 000000000..152a301d7
--- /dev/null
+++ b/_includes/activity/github-CLI/clisurvey.md
@@ -0,0 +1,2 @@
+## We Love Feedback :heart:
+ Please take _literally less than a minute_ to let us know what you think of this course. You may also choose to opt-in for updates on future classes. [Start Survey](http://www.surveygizmo.com/s3/3288550/cli)!
diff --git a/_includes/activity/github-desktop/01-create-repository.md b/_includes/activity/github-desktop/01-create-repository.md
index 74a44fb67..2ac1957f0 100644
--- a/_includes/activity/github-desktop/01-create-repository.md
+++ b/_includes/activity/github-desktop/01-create-repository.md
@@ -1,7 +1,7 @@
Now that you have what you need for Git and GitHub installed locally, let's create the repository that will hold your new website.
1. On GitHub.com, [create a new repository](https://github.com/new).
-1. Name your repository `YOUR-USERNAME.github.io`. Why the funny name? Click the **Tell me why** section below to learn more.
+1. Name your repository. The name of your repository will be part of the link to your website.
1. Enter a description for your repository.
1. We recommend you create a public repository. Public repositories are free. Even if you select a private repository, your published website will be public.
1. Check the box to initialize the repository with a README.
diff --git a/_includes/activity/github-desktop/02-clone-locally.md b/_includes/activity/github-desktop/02-clone-locally.md
index cb151da14..9b0342c13 100644
--- a/_includes/activity/github-desktop/02-clone-locally.md
+++ b/_includes/activity/github-desktop/02-clone-locally.md
@@ -4,5 +4,5 @@ After you've created a repository on the remote, the next step is to clone it to
1. On GitHub.com, navigate to the Code tab of the repository.
1. On the right side of the screen, click `Clone or download`.
1. Click `Open in Desktop`. This will open GitHub Desktop.
-1. Verify the location on your hard drive where you would like to copy the repository.
+1. Select where you'd like to save it locally under `Local Path`
1. Click `Clone`.
diff --git a/_includes/activity/github-desktop/03-create-branch.md b/_includes/activity/github-desktop/03-create-branch.md
index 21e11b8e4..a42a29d3f 100644
--- a/_includes/activity/github-desktop/03-create-branch.md
+++ b/_includes/activity/github-desktop/03-create-branch.md
@@ -1,7 +1,7 @@
Now that you have a local copy of the repository, let's use the steps of [GitHub Flow](https://guides.github.com/introduction/flow/) to make a change in your project. First we will create a branch:
-1. At the top of GitHub Desktop, click the button.
+1. Within GitHub Desktop, click "File", then click "New Branch".
1. In the `Name` field, type a meaningful name for your branch. Something like `add-index-page` will work nicely.
-1. Click `Create branch`.
+1. If you have been following the directions exactly, GitHub Desktop knows to create the new branch based on `master` because it is the branch you were checked out to when you clicked the "New Branch" option.
1. GitHub Desktop will automatically create your new branch and switch you to it.
diff --git a/_includes/activity/github-desktop/04-make-changes-locally.md b/_includes/activity/github-desktop/04-make-changes-locally.md
index 91ba7011f..43379d3bc 100644
--- a/_includes/activity/github-desktop/04-make-changes-locally.md
+++ b/_includes/activity/github-desktop/04-make-changes-locally.md
@@ -1,8 +1,20 @@
It's time to create the home page for your website.
-1. Make sure you are checked out to the new branch you just created.
+1. Make sure you are checked out to the new branch you just created. You change branches by clicking the **Current Branch** button at the top of the application, then selecting a branch.
1. Open your preferred text editor.
+
+The next steps are determined by if you used a GitHub Pages theme or decided to just enable GitHub Pages on your repository.
+
+### I am using a GitHub Pages theme
+
+1. Open the file named `README.md`.
+1. Remove the template text that was added to the `README.md` when you selected your theme.
+1. In the `README.md` file include at least the following two lines: `# Hello World!` and `My name is GITHUB_USERNAME`. Bonus points for including more information.
+1. When you are finished, save your changes and close the text editor.
+
+### I am not using a GitHub Pages theme
+
1. Create a new file named `index.html`.
1. In your `index.html` file, include at least the following two lines: `
Hello World!
` and ` My name is GITHUB_USERNAME
`. Bonus points for including more information, or using [Jekyll Themes](http://jekyllthemes.org/) to create a more robust site.
1. When you are finished, save your file inside your repository folder, and close the text editor.
diff --git a/_includes/activity/github-desktop/05-committing-locally.md b/_includes/activity/github-desktop/05-committing-locally.md
index 9a9544dbc..0e9b54e33 100644
--- a/_includes/activity/github-desktop/05-committing-locally.md
+++ b/_includes/activity/github-desktop/05-committing-locally.md
@@ -1,8 +1,10 @@
After you have finished making your changes, it is time to commit them.
-1. Click the changes tab to see a list of the files that have been changed or added since the last commit.
+1. Click the **changes** tab in the left sidebar to see a list of the files that have been changed or added since the last commit.
1. Use the checkboxes to indicate which files should be part of the commit. In this activity, you'll select the `index.html` file.
-*Note: It is a good idea to group files together based on the type of changes or the file content. For example, if you fixed the same formatting issue in several documents, you should group them into one commit.*
+
+ *Note: It is a good idea to group files together based on the type of changes or the file content. For example, if you fixed the same formatting issue in several documents, you should group them into one commit.*
+
1. Type your commit message in the Summary field.
1. You will notice that GitHub Desktop has already populated the commit button with the current branch. Simply click the button to commit your changes.
diff --git a/_includes/activity/github-desktop/06-pull-request.md b/_includes/activity/github-desktop/06-pull-request.md
index 4f136b8c6..b4e3d6ba4 100644
--- a/_includes/activity/github-desktop/06-pull-request.md
+++ b/_includes/activity/github-desktop/06-pull-request.md
@@ -1,6 +1,7 @@
-Now that you have made some local commits, it is time to send your changes to the remote copy of your repository on GitHub.com:
+Now that you have made some local commits, it is time to send your changes to the remote copy of your repository on GitHub.com and open a pull request:
-1. On GitHub Desktop, click the Pull Request button.
-1. Complete the fields of the Pull Request just like you would on GitHub.com. Ensure the `base` branch (the one on the left) is `master` and that the `compare` branch (the one on the right) is the one you created on GitHub Desktop.
-1. Click `Send Pull Request`. GitHub Desktop will send your changes and create a pull request.
-1. You will receive a confirmation message including the link to your Pull Request. Click the link to view your newly created Pull Request on GitHub.com!
+1. On GitHub Desktop, click the button to sync changes. This button changes states based on the changes that have been made in your local repository and on the remote. If no other changes have been made, it will read **Publish Branch**.
+1. In your browser, go to the ['Pull Requests' tab of the class repository](https://github.com/githubschool{{site.baseurl}}-github-pages/pulls).
+1. Click ['New pull request'](https://github.com/githubschool{{site.baseurl}}-github-pages/compare).
+1. Ensure the `base` branch (the one on the left) is `master` and that the `compare` branch (the one on the right) is the one you created on GitHub Desktop.
+1. Complete the fields of the pull request.
diff --git a/_includes/activity/github-desktop/08-sync-desktop.md b/_includes/activity/github-desktop/08-sync-desktop.md
index a6f6bb6d2..10272d4f1 100644
--- a/_includes/activity/github-desktop/08-sync-desktop.md
+++ b/_includes/activity/github-desktop/08-sync-desktop.md
@@ -2,4 +2,5 @@ After you merge your Pull Request, you will need to update your local copy of th
1. Navigate back to GitHub Desktop.
1. Select the `master` branch at the top of the app.
-1. Click the **Sync** button on the top right side of the app to update your local copy of the repository with the changes from the remote repository.
+1. Click the button that displays **Fetch Origin** to get an updated status for the remote repository.
+1. Then click **Pull Origin** to retrieve the changes to your local repository.
diff --git a/_includes/activity/github-desktop/12-add-class-repo.md b/_includes/activity/github-desktop/12-add-class-repo.md
index af1de91d2..4dd093fa0 100644
--- a/_includes/activity/github-desktop/12-add-class-repo.md
+++ b/_includes/activity/github-desktop/12-add-class-repo.md
@@ -1,5 +1,5 @@
It's time to share your page with the world! To do that, you will follow the same steps of the GitHub workflow, but this time you will do it on the class repository:
-1. Visit the [class repository](https://github.com/githubschool/on-demand-github-pages/).
+1. Visit the [class repository](https://github.com/githubschool{{site.baseurl}}-github-pages/).
1. Click the **Issues** tab.
-1. Request push access by leaving a comment on [Issue #1](https://github.com/githubschool/on-demand-github-pages/issues/1).
+1. Request push access by creating an [Issue](https://github.com/githubschool{{site.baseurl}}-github-pages/issues/).
diff --git a/_includes/activity/github-desktop/13-review-workflow.md b/_includes/activity/github-desktop/13-review-workflow.md
index 8327c5341..1e5d091d9 100644
--- a/_includes/activity/github-desktop/13-review-workflow.md
+++ b/_includes/activity/github-desktop/13-review-workflow.md
@@ -1,14 +1,21 @@
Now that you are a collaborator, let's use the local workflow we just learned to make changes to this repository:
-1. Start from the Code tab of the [class repository on GitHub.com](https://github.com/githubschool/on-demand-github-pages/).
-1. Click on `Clone or Download` and select `Open in Desktop`.
-1. Confirm where you'd like to save your project on GitHub Desktop.
-1. Create a branch and label it with your username, something like `yourUsername-add-page`.
+1. Start from the Code tab of the [class repository on GitHub.com](https://github.com/githubschool{{site.baseurl}}-github-pages/).
+1. Click on `Clone or Download`.
+1. Click `Open in Desktop`. This will open GitHub Desktop.
+1. Confirm the `Local Path` as the place you'd like to store the repository locally.
+1. Create a branch by clicking "File > New Branch" and label it with your username, something like `yourUsername-add-page`.
1. In your favorite text editor, add a file to the `_pages` directory. Include your GitHub handle in the filename: `username.yaml`.
1. Enter the following content into your file:
- {: .align-center}
+
+ ---
+ githubHandle: YOUR-USERNAME
+ pageUrl: YOUR-HANDLE.github.io
+ timestamp: TODAYS-DATE-YYYY-MM-DD
+ ---
+
1. Ensure you've replaced `YOUR-USERNAME` with your GitHub Username, `YOUR-SITES-URL` with the URL to your site (which should be `YOUR-USERNAME.github.io`), and `TODAYS-DATE-YYYY-MM-DD` with today's date, using a 4-digit year, 2-digit month, and 2-digit day. For example, if today is October 17, 2016, you would enter: `2016-10-17`.
-1. On GitHub Desktop, within the `Uncommitted Changes` tab, ensure your file is checked.
+1. On GitHub Desktop, within the `Changes` side bar, ensure your file is checked.
1. On GitHub Desktop, enter a commit message describing the change you're introducing to the project.
1. On GitHub Desktop, click the `Commit to YOUR-BRANCH` button -- ensure `YOUR-BRANCH` includes your username.
diff --git a/_includes/activity/github-desktop/15-collaborate-prs.md b/_includes/activity/github-desktop/15-collaborate-prs.md
index ccf74f2cd..586427ef9 100644
--- a/_includes/activity/github-desktop/15-collaborate-prs.md
+++ b/_includes/activity/github-desktop/15-collaborate-prs.md
@@ -1,6 +1,6 @@
-It's now time to collaborate with other learners taking this class around the :earth_americas:.
+It's now time to collaborate with other learners taking this class around the world :earth_americas:.
-1. In the [class repository on GitHub.com](https://github.com/githubschool/on-demand-github-pages/), navigate to the [Pull Requests tab](https://github.com/githubschool/on-demand-github-pages/pulls).
+1. In the [class repository on GitHub.com](https://github.com/githubschool{{site.baseurl}}-github-pages/), navigate to the [Pull Requests tab](https://github.com/githubschool{{site.baseurl}}-github-pages/pulls).
1. Look through other pull requests. Do they look like good changes, with CI passing? Feel free to post an encouraging message!
1. In your own pull request, wait to see if the branch passes the Travis CI tests and is ready to merge.
diff --git a/_includes/activity/github-desktop/choose-a-theme.md b/_includes/activity/github-desktop/choose-a-theme.md
new file mode 100644
index 000000000..7a5512da5
--- /dev/null
+++ b/_includes/activity/github-desktop/choose-a-theme.md
@@ -0,0 +1,11 @@
+This course is going to use GitHub Pages to create your website. To initialize GitHub Pages we need to perform a few more steps:
+
+1. With your repository created, click the **Settings** tab.
+1. On the Options section (default information displayed), scroll down to the **GitHub Pages** section.
+1. Click **Choose a theme**.
+1. Decide which theme you would like to use, and click **Select theme**.
+
+ *Note: If you don't like the themes available, later in the course we identify how you can build a website without using a GitHub Pages theme.*
+
+1. Accept the filler text by scrolling to the bottom of the page and click on **Commit Changes**.
+1. Your site is published at: `USERNAME.github.io/REPONAME`.
diff --git a/_includes/activity/github-desktop/desktopsurvey.md b/_includes/activity/github-desktop/desktopsurvey.md
new file mode 100644
index 000000000..9202bf02d
--- /dev/null
+++ b/_includes/activity/github-desktop/desktopsurvey.md
@@ -0,0 +1,2 @@
+## We Love Feedback :heart:
+ Please take _literally less than a minute_ to let us know what you think of this course. You may also choose to opt-in for updates on future classes. [Start Survey](http://www.surveygizmo.com/s3/3288550/desktop)!
diff --git a/_includes/activity/intro-to-github/00-create-github-account.md b/_includes/activity/intro-to-github/00-create-github-account.md
index 458910874..3dd82c7af 100644
--- a/_includes/activity/intro-to-github/00-create-github-account.md
+++ b/_includes/activity/intro-to-github/00-create-github-account.md
@@ -7,4 +7,4 @@ If you already have a Github.com account you are ready to get started. Otherwise
3. You will receive a verification email at the address provided.
4. Click the emailed link to complete the verification process.
-If you are wondering where to go from here, click **Tell my why** for a quick tour of your dashboard.
+If you are wondering where to go from here, click **Tell me why** for a quick tour of your dashboard.
diff --git a/_includes/activity/intro-to-github/01-join-intro-repo.md b/_includes/activity/intro-to-github/01-join-intro-repo.md
index db11aa0de..a6a363817 100644
--- a/_includes/activity/intro-to-github/01-join-intro-repo.md
+++ b/_includes/activity/intro-to-github/01-join-intro-repo.md
@@ -1,4 +1,4 @@
It's time to get your hands dirty! Use these steps to access our shared project:
1. Sign in with your GitHub account.
-2. Navigate to our shared project and become a collaborator. Click on [this link](https://github.com/githubschool/open-enrollment-classes-introduction-to-github/issues/927) and leave a comment. The GitHubTeacher user will auto-magically add you to our project as a collaborator.
+2. Navigate to our shared project and become a collaborator. Click on [this link](https://github.com/githubschool/open-enrollment-classes-introduction-to-github/issues/) and create an issue. The GitHubTeacher user will auto-magically add you to our project as a collaborator.
diff --git a/_includes/activity/intro-to-github/04-create-a-file-on-github.md b/_includes/activity/intro-to-github/04-create-a-file-on-github.md
index b23e8d0a5..892da4cc6 100644
--- a/_includes/activity/intro-to-github/04-create-a-file-on-github.md
+++ b/_includes/activity/intro-to-github/04-create-a-file-on-github.md
@@ -3,11 +3,11 @@ It's time to add your file to the repository:
1. In your new branch, add a new file named: `_pins/YOUR-USERNAME.json`.
1. Enter the following content into your file:
- ---
- githubHandle: YOUR-USERNAME
- latitude: YOUR_LATITUDE
- longitude: YOUR_LONGITUDE
- ---
+ ---
+ githubHandle: YOUR-USERNAME
+ latitude: YOUR_LATITUDE
+ longitude: YOUR_LONGITUDE
+ ---
1. Scroll down and enter a commit message that describes your addition.
diff --git a/_includes/archive-single.html b/_includes/archive-single.html
index ee46c724f..397258ab5 100644
--- a/_includes/archive-single.html
+++ b/_includes/archive-single.html
@@ -10,7 +10,7 @@
{% if post.link %}
{% else %}
-
+
{% endif %}
{% if include.type == "grid" and teaser != blank %}
diff --git a/_includes/breadcrumbs.html b/_includes/breadcrumbs.html
index ded8bd6e0..e8aad1556 100644
--- a/_includes/breadcrumbs.html
+++ b/_includes/breadcrumbs.html
@@ -21,7 +21,7 @@
{% for crumb in crumbs offset: 1 %}
{% if forloop.first %}
- {{ site.data.ui-text[site.locale].breadcrumb_home_label }}
+ {{ site.data.ui-text[site.locale].breadcrumb_home_label }}
{{ site.data.ui-text[site.locale].breadcrumb_separator }}
@@ -31,7 +31,7 @@
{% else %}
{% assign i = i | plus: 1 %}
- {{ crumb | replace: '-', ' ' | replace: '%20', ' ' | capitalize }}
+ {{ crumb | replace: '-', ' ' | replace: '%20', ' ' | capitalize }}
{{ site.data.ui-text[site.locale].breadcrumb_separator }}
diff --git a/_includes/category-list.html b/_includes/category-list.html
index 5b79aef72..173d6b873 100644
--- a/_includes/category-list.html
+++ b/_includes/category-list.html
@@ -23,7 +23,7 @@
{% for hash in category_hashes %}
{% assign keyValue = hash | split: '#' %}
{% capture category_word %}{{ keyValue[1] | strip_newlines }}{% endcapture %}
- {{ category_word }}{% unless forloop.last %}, {% endunless %}
+ {{ category_word }}{% unless forloop.last %}, {% endunless %}
{% endfor %}
diff --git a/_includes/comments-providers/discourse.html b/_includes/comments-providers/discourse.html
index 1d23b6f21..bd9c3332a 100644
--- a/_includes/comments-providers/discourse.html
+++ b/_includes/comments-providers/discourse.html
@@ -1,6 +1,6 @@
{% if site.comments.discourse.server %}
{% include base_path %}
-{% capture canonical %}{{ base_path }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' | strip_slash }}{% endif %}{% endcapture %}
+{% capture canonical %}{{ site.baseurl }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' | strip_slash }}{% endif %}{% endcapture %}
+
+
+
+
+
+
+
+
+
+ -
+
+

+
+
+
+
+
Learn how to turn a web app into a cross-platform native app with Electron.
+
+
+
+
+ -
+
+

+
+
+
+
+
If you want to share your awesome app with the world, you will need to package it for easy download and installation.
+
+
+
+ -
+
+

+
+
+
+
+
Recommendations for sharing your app with potential end users.
+
+
+
+ -
+
+

+
+
+
+
+
+
+