diff --git a/.gitignore b/.gitignore deleted file mode 100644 index d89c6382..00000000 --- a/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -/.bundle/ -/.ruby-version -/bin/ -/vendor/gems/ -.DS_Store -.sass-cache/ -_site -teach-github.sublime-project -teach-github.sublime-workspace -*.*~ diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index db2a1beb..00000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "presentations/dependencies/plugins"] - path = presentations/dependencies/plugins - url = https://github.com/jordanmccullough/hydeslides-plugins.git diff --git a/.sass-cache/0c1169699ba05226e2fe0970644e7dab17278809/page.scssc b/.sass-cache/0c1169699ba05226e2fe0970644e7dab17278809/page.scssc deleted file mode 100644 index f87f00b7..00000000 Binary files a/.sass-cache/0c1169699ba05226e2fe0970644e7dab17278809/page.scssc and /dev/null differ diff --git a/ATTRIBUTION.md b/ATTRIBUTION.md deleted file mode 100644 index da7b44e4..00000000 --- a/ATTRIBUTION.md +++ /dev/null @@ -1,10 +0,0 @@ -# CC-BY Attribution Requirement - -The teaching materials on this site are licensed under a -[Creative Commons Attribution 3.0 License](http://creativecommons.org/licenses/by/3.0/). - -As stated in the license: -> Attribution — You must attribute the work in the manner specified by the author or licensor (but not -> in any way that suggests that they endorse you or your use of the work). - -For any use of the materials we require a prominently placed link to . diff --git a/CNAME b/CNAME deleted file mode 100644 index ca62c337..00000000 --- a/CNAME +++ /dev/null @@ -1,2 +0,0 @@ -teach.github.com - diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index 03da6a4e..00000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,5 +0,0 @@ -# Help Us Improve These Materials - -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). - -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/teach.github.com/issues) tab) so we can help guide your contribution to the right location in the materials. diff --git a/Gemfile b/Gemfile deleted file mode 100644 index d9745230..00000000 --- a/Gemfile +++ /dev/null @@ -1,8 +0,0 @@ -source 'https://rubygems.org' - -gem 'rake', '~> 10.0' -gem 'jekyll' -gem 'compass' -gem 'anemone' -gem 'rdiscount' -gem 'RedCloth' \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index d33715ee..00000000 --- a/Gemfile.lock +++ /dev/null @@ -1,50 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - RedCloth (4.2.9) - anemone (0.7.2) - nokogiri (>= 1.3.0) - robotex (>= 1.0.0) - chunky_png (1.2.7) - classifier (1.3.3) - fast-stemmer (>= 1.0.0) - compass (0.12.2) - chunky_png (~> 1.2) - fssm (>= 0.2.7) - sass (~> 3.1) - directory_watcher (1.4.1) - fast-stemmer (1.0.1) - fssm (0.2.10) - jekyll (0.12.0) - classifier (~> 1.3) - directory_watcher (~> 1.1) - kramdown (~> 0.13.4) - liquid (~> 2.3) - maruku (~> 0.5) - pygments.rb (~> 0.3.2) - kramdown (0.13.8) - liquid (2.4.1) - maruku (0.6.1) - syntax (>= 1.0.0) - nokogiri (1.5.6) - posix-spawn (0.3.6) - pygments.rb (0.3.7) - posix-spawn (~> 0.3.6) - yajl-ruby (~> 1.1.0) - rake (10.0.3) - rdiscount (2.0.7.1) - robotex (1.0.0) - sass (3.2.5) - syntax (1.0.0) - yajl-ruby (1.1.0) - -PLATFORMS - ruby - -DEPENDENCIES - RedCloth - anemone - compass - jekyll - rake (~> 10.0) - rdiscount diff --git a/README.md b/README.md index a6abf0f5..f3a4592a 100644 --- a/README.md +++ b/README.md @@ -1,36 +1,17 @@ -# GitHub Official Git Teaching Materials +# We've Moved -This is the official set of [GitHub Training](http://github.com/training/) courseware, including outlines, topic-specific guides, examples, and slides provided under the [_CC BY 3.0_ license](http://creativecommons.org/licenses/by/3.0/) to aid schools, universities, user groups, hackathons, corporate lunch-and-learns and other educational outlets in teaching Git and GitHub. In short, you should take these materials and [make the development world a better place](http://en.wikipedia.org/wiki/A_rising_tide_lifts_all_boats) by leveraging them to teach a class or give a conference talk. Do a quick check that you are using the materials in the [spirit of the license](https://github.com/github/teach.github.com/blob/gh-pages/LICENSE.md) and then go forth and spread the good Git and GitHub news. +The [teach.github.com](https://teach.github.com) GitHub and Git +materials have moved to +[training.github.com](https://training.github.com). All of our +open source education is now easier to discover all in one +location. -> A rising tide lifts all boats -> – John F. Kennedy +## Contributions -GitHub believes, as a company, that educational materials should be free and improved by the wisdom of the community whenever possible. Inspiration for this comes from more places than we can list, but, to name just a few: [Khan Academy](http://www.khanacademy.org), [Git Immersion](http://gitimmersion.com), [Ruby Koans](http://rubykoans.com), [Coursera](https://www.coursera.org), and [MIT Open Courseware](http://ocw.mit.edu/index.htm). +All commits within this repository were preserved during the move +and maintain attribution for our wonderful community's contribution to the repo. -## Original Authors +## Getting Involved -These materials were lovingly donated to the OSS community by [GitHub](https://github.com/about) because it is an awesome company that has a [passion for open sourcing](http://tom.preston-werner.com/2011/11/22/open-source-everything.html) a significant portion [of their work](https://github.com/github). The original authors of these materials include [Matthew McCullough](http://github.com/matthewmccullough), [Tim Berglund](https://github.com/tlberglund), and [Jared Koumentis](https://github.com/ShepBook), but we eagerly look forward to seeing those contributions overwhelmed by a [community effort](https://github.com/github/teach.github.com/wiki/Hall-Of-Appreciation) to improve and grow these materials for the benefit of the Git-learning community. - -## Spread the Love - -We’ve already seen our materials in use by tens of thousands of individuals, but we’re excited to take this next step of open sourcing our curriculum and seeing where it gets put to great use. If you are using these materials, we’d love to [see you say so in the Wiki](https://github.com/github/teach.github.com/wiki/Hall-Of-Appreciation). - -## Help Us Improve These Materials - -We’re always looking for contributions to 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). 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/teach.github.com/issues) tab) so we can help guide your contribution to the right location in the materials. In the highly unlikely case you merely want to rant or denigrate our open materials, please resist that urge and turn that energy into a world-benefitting contribution. - -## Materials Format - -The majority of these materials will be in [Markdown](http://whatismarkdown.com), a [lightweight markup language](http://en.wikipedia.org/wiki/Lightweight_markup_language) strongly 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/). - -## Developing - -To get started, please ensure you have a recent version of Ruby installed (we currently use 1.9.3-p327). - -Then: - -``` bash -script/bootstrap -bin/rake build -bin/rake server -``` +If you have something to offer, head over to the [repository](https://github.com/github/training.github.com) to open an [Issue](https://github.com/github/training.github.com/issues) or create +a [Pull Request](https://github.com/github/training.github.com/pulls). diff --git a/Rakefile b/Rakefile deleted file mode 100644 index e2dde748..00000000 --- a/Rakefile +++ /dev/null @@ -1,69 +0,0 @@ -# Kris Brown -# https://raw.github.com/krisb/jekyll-template/ - -task :default => :server - -desc 'Clean up generated site' -task :clean do - cleanup -end - -desc 'Build site with Jekyll' -task :build => :clean do -# compass - jekyll -end - -desc 'Start server with --auto' -task :server => :clean do -# compass - jekyll('--server --auto') -end - -#desc 'Build and deploy' -#task :deploy => :build do -# sh 'rsync -rtzh --progress --delete _site/ username@servername:/var/www/websitename/' -#end - -desc 'Check links for site already running on localhost:4000' -task :check_links do - begin - require 'anemone' - root = 'http://localhost:4000/' - Anemone.crawl(root, :discard_page_bodies => true) do |anemone| - anemone.after_crawl do |pagestore| - broken_links = Hash.new { |h, k| h[k] = [] } - pagestore.each_value do |page| - if page.code != 200 - referrers = pagestore.pages_linking_to(page.url) - referrers.each do |referrer| - broken_links[referrer] << page - end - end - end - broken_links.each do |referrer, pages| - puts "#{referrer.url} contains the following broken links:" - pages.each do |page| - puts " HTTP #{page.code} #{page.url}" - end - end - end - end - - rescue LoadError - abort 'Install anemone gem: gem install anemone' - end -end - -def cleanup - sh 'rm -rf _site' -end - -def jekyll(opts = '') - sh 'jekyll ' + opts -end - -def compass(opts = '') - # sh 'compass compile -c config.rb --force ' + opts -end - diff --git a/_config.yml b/_config.yml deleted file mode 100644 index f89f9eb7..00000000 --- a/_config.yml +++ /dev/null @@ -1,28 +0,0 @@ -# standard jekyll configuration - -permalink: /articles/:title -pygments: true -exclude: ['Rakefile', 'config.rb', 'README.md'] -markdown: rdiscount - -# configuration required for some pages - -domain: teach.github.com -title: Teaching Materials for Git and GitHub -author: The GitHub Training Team -email: training@github.com - -# configuration for enhancements, uncomment to enable - -# feedburner: -# id: feedburnerid - -# google_analytics: -# account: UA-XXXXX-X - -github: - username: github/teach.github.com - -disqus: - id: githubteachingmaterials - diff --git a/_includes/JB/categories_list b/_includes/JB/categories_list deleted file mode 100644 index 90737b3f..00000000 --- a/_includes/JB/categories_list +++ /dev/null @@ -1,37 +0,0 @@ -{% comment %}{% endcomment %} - -{% if site.JB.categories_list.provider == "custom" %} - {% include custom/categories_list %} -{% else %} - {% if categories_list.first[0] == null %} - {% for category in categories_list %} -
  • - {{ category | join: "/" }} {{ site.categories[category].size }} -
    • - {% endfor %} - {% else %} - {% for category in categories_list %} -
  • - {{ category[0] | join: "/" }} {{ category[1].size }} -
    • - {% endfor %} - {% endif %} -{% endif %} -{% assign categories_list = nil %} diff --git a/_includes/JB/pages_list b/_includes/JB/pages_list deleted file mode 100644 index 42f827a8..00000000 --- a/_includes/JB/pages_list +++ /dev/null @@ -1,39 +0,0 @@ -{% comment %}{% endcomment %} - -{% if site.JB.pages_list.provider == "custom" %} - {% include custom/pages_list %} -{% else %} - {% for node in pages_list %} - {% if node.title != null %} - {% if group == null or group == node.group %} - {% if page.url == node.url %} -
  • {{node.title}}
    • - {% else %} -
  • {{node.title}}
    • - {% endif %} - {% endif %} - {% endif %} - {% endfor %} -{% endif %} -{% assign pages_list = nil %} -{% assign group = nil %} \ No newline at end of file diff --git a/_includes/JB/posts_collate b/_includes/JB/posts_collate deleted file mode 100644 index f612ade8..00000000 --- a/_includes/JB/posts_collate +++ /dev/null @@ -1,55 +0,0 @@ -{% comment %}{% endcomment %} - -{% if site.JB.posts_collate.provider == "custom" %} - {% include custom/posts_collate %} -{% else %} - {% for post in posts_collate %} - {% capture this_year %}{{ post.date | date: "%Y" }}{% endcapture %} - {% capture this_month %}{{ post.date | date: "%B" }}{% endcapture %} - {% capture next_year %}{{ post.previous.date | date: "%Y" }}{% endcapture %} - {% capture next_month %}{{ post.previous.date | date: "%B" }}{% endcapture %} - - {% if forloop.first %} -

    {{this_year}}

    -

    {{this_month}}

    - - {% else %} - {% if this_year != next_year %} - -

    {{next_year}}

    -

    {{next_month}}

    - -

    {{next_month}}

    -