Merge branch 'master' into contrib-guide

.github/ISSUE_TEMPLATE.md

@@ -11,10 +11,10 @@
 <If new idea or direction, please create a checklist of proposed ideas or next steps. [Example](https://github.com/github/training-kit/issues/415).>
 
 ### How to Contribute
-- [ ] Comment on this issue if you'd like to work/collaborate on it! 
+- [ ] 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{{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. 
+- [ ] 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.
+- [ ] Push your changes to your repository.
 - [ ] Submit a Pull Request
   - Base Dropdown: github/training-kit
   - Compare Dropdown: Your fork
@@ -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{{site.baseurl}}`.
+    - When successful, the script will initiate a local server at `http://127.0.0.1:4000/on-demand`.
 
 ### Questions?
 - Leave a comment on this issue! Make sure to use @ mentions if you want a specific person's attention!

.gitignore

@@ -9,3 +9,4 @@ _site/
 _release
 *.map
 .jekyll-metadata
+# *.resume-burger-jokes

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 making 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 [[email protected]](mailto:[email protected]). 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/

README.md

@@ -5,7 +5,7 @@
 # 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{{site.baseurl}}/. 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/on-demand/. These materials are provided under a [_Creative Commons License_ license](https://github.com/github/training-kit/blob/master/LICENSE).
 
 ## We :heart: Contributors Like You!
 
@@ -32,7 +32,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{{site.baseurl}}/">services.github.com{{site.baseurl}}</a>
+> <a href="https://services.github.com/on-demand/">services.github.com/on-demand/</a>
 > used under the
 > <a href="https://creativecommons.org/licenses/by/4.0/">CC-BY-4.0</a>
 > license.</a>

_config.yml

@@ -85,3 +85,10 @@ sass:
 
 # Custom site configuration
 lang: en
+
+defaults:
+  -
+    scope:
+      path: ""
+    values:
+      lang: "en"

_data/navigation.yml

@@ -1,24 +1,31 @@
-# main links links
+banner:
+  en:
+    title: On Demand Training
+    url: /
+  es:
+    title: Aprende a tu ritmo
+    url: /es/
+
 main:
-# Keep original nav, do not replace
-  - title: "Introduction to GitHub"
-    url: /intro-to-github/
-  - title: "GitHub Pages from GitHub Desktop"
-    url: /github-desktop/
-  - title: "GitHub Pages from the Command Line"
-    url: /github-cli/
-  - 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/
+  en:
+    - title: Resources
+      url: /resources/
+    - title: Learning Path
+      url: /resources/learning-path/
+    - title: Upcoming Events
+      abs: https://services.github.com/#upcoming-events
+    - title: Customized Training
+      abs: https://services.github.com/customized-training
+
+  es:
+    - title: Resources
+      url: /resources/
+    - title: Itinerario de aprendizaje
+      url: /resources/learning-path/es/
+    - title: Upcoming Events
+      abs: https://services.github.com/#upcoming-events
+    - title: Customized Training
+      abs: https://services.github.com/customized-training
 
 # When creating new sidebar navs, remember the url in this document needs to match the url assigned in the permalink field.
 
@@ -50,6 +57,35 @@ intro-nav:
   - title: "You Completed the GitHub Flow"
     url: /intro-to-github/you-completed-github-flow
 
+
+intro-nav-es:
+  - title: "Introducción a GitHub"
+    url: /intro-to-github/es/
+  - title: "Crear cuenta GitHub"
+    url: /intro-to-github/es/crear-cuenta-github
+  - title: "Únete al repositorio de la clase"
+    url: /intro-to-github/es/unete-repo-clase
+  - title: "Explora el repositorio GitHub"
+    url: /intro-to-github/es/explora-repositorio
+  - title: "Utiliza el flujo de trabajo GitHub"
+    url: /intro-to-github/es/flujo-github
+  - title: "Creando una rama o branch"
+    url: /intro-to-github/es/creando-rama-branch
+  - title: "Busca tus coordenadas"
+    url: /intro-to-github/es/buscar-coordenadas
+  - title: "Trabajar en GitHub"
+    url: /intro-to-github/es/trabajar-en-github
+  - title: "Crear un Pull Request"
+    url: /intro-to-github/es/crear-pull-request
+  - title: "Colaborar en GitHub"
+    url: /intro-to-github/es/colaborar-en-github
+  - title: "Editar archivos en GitHub"
+    url: /intro-to-github/es/editar-en-github
+  - title: "Hacer Merge de tu Pull Request"
+    url: /intro-to-github/es/merge-pull-requests
+  - title: "Has completado el Flujo GitHub"
+    url: /intro-to-github/es/celebrar
+
 github-desktop-nav:
     - title: "GitHub Pages & GitHub Desktop"
       url: /github-desktop/
@@ -86,6 +122,42 @@ github-desktop-nav:
     - title: "Merge Your Pull Request on GitHub"
       url: /github-desktop/merge-pull-request-showcase
 
+github-desktop-nav-es:
+    - title: "GitHub Pages y GitHub Desktop"
+      url: /github-desktop/es/
+    - title: "Instalar GitHub Desktop"
+      url: /github-desktop/es/instalar-github-desktop
+    - title: "Crear el repositorio remoto en GitHub"
+      url: /github-desktop/es/crear-repo-remoto
+    - title: "Elegir un tema de GitHub Pages"
+      url: /github-desktop/es/elegir-tema-github-pages
+    - title: "Clonar el repositorio con GitHub Desktop"
+      url: /github-desktop/es/clonar-repositorio-github-desktop
+    - title: "Crear branches en local con GitHub Desktop"
+      url: /github-desktop/es/crear-branches-github-desktop
+    - title: "Hacer cambios en local con GitHub Desktop"
+      url: /github-desktop/es/hacer-cambios-github-desktop
+    - title: "Añadir commits locales con GitHub Desktop"
+      url: /github-desktop/es/nuevos-commits-github-desktop
+    - title: "Abrir un Pull Request con GitHub Desktop"
+      url: /github-desktop/es/pull-request-github-desktop
+    - title: "Hacer merge de tu Pull Request en GitHub"
+      url: /github-desktop/es/merge-pull-request-github
+    - title: "Ver tu sitio hecho con GitHub Pages"
+      url: /github-desktop/es/ver-sitio-github-pages
+    - title: "Hacer Push a GitHub con GitHub Desktop"
+      url: /github-desktop/es/push-con-github-desktop
+    - title: "Añadir tu sitio hecho con GitHub Pages al Escaparate"
+      url: /github-desktop/es/añadir-github-pages-escaparate
+    - title: "Revisar el Flujo GitHub local"
+      url: /github-desktop/es/revisar-github-flow
+    - title: "Push a GitHub y crear un Pull Request"
+      url: /github-desktop/es/push-pull-request-github-desktop
+    - title: "Colaborar con Pull Requests en GitHub"
+      url: /github-desktop/es/colaborar-github-pull-requests
+    - title: "Hacer merge de tu Pull Request en GitHub"
+      url: /github-desktop/es/merge-pull-request-showcase
+
 github-cli:
   - title: "GitHub Pages & Git in the Command Line"
     url: /github-cli/
@@ -171,6 +243,8 @@ windows:
       url: /windows/vs-start-project
     - title: "Make a Commit"
       url: /windows/vs-make-commit
+    - title: "Sharing and Receiving Changes"
+      url: /windows/vs-push-changes
     - title: "What is Sync?"
       url: /windows/vs-sync
   - title: "Congratulations"
@@ -236,3 +310,32 @@ electron-share-your-app:
     url: /electron/share-your-app/share-on-websites/
   - title: "Celebrate"
     url: /electron/share-your-app/celebrate/
+
+merge-conflicts:
+  - title: "Managing Merge Conflicts"
+    url: /merge-conflicts/
+  - title: "Set Up the Repository"
+    url: /merge-conflicts/setup/
+  - title: "A Normal Merge"
+    url: /merge-conflicts/normal-merge/
+  - title: "Merge Conflict Description"
+    url: /merge-conflicts/mc-description/
+  - title: "Your First Conflict"
+    url: /merge-conflicts/first-conflict/
+  - title: "Skatetocat's Simple Conflict"
+    url: /merge-conflicts/example-01/
+  - title: "Shoptocat and Supportcat Help"
+    url: /merge-conflicts/example-02/
+  - title: "Momtocat and Poptocat Lend a Hand"
+    url: /merge-conflicts/example-03/
+  - title: "What Next?"
+    url: /merge-conflicts/what-next/
+  - title: "Using GUIs to Handle Merge Conflicts"
+    url: /merge-conflicts/ide-intro/
+    children:
+    - title: "Atom"
+      url: /merge-conflicts/ide-atom/
+    - title: "Visual Studio Code"
+      url: /merge-conflicts/ide-vs-code/
+    - title: "GitHub Extension for Visual Studio"
+      url: /merge-conflicts/ide-vs-ext/

_data/ui-text.yml

@@ -3,6 +3,7 @@
 # English (default)
 # -----------------
 en: &DEFAULT_EN
+  name                  : "English"
   page                  : "Page"
   pagination_previous   : "Previous"
   pagination_next       : "Next"
@@ -27,6 +28,15 @@ en: &DEFAULT_EN
   website_label         : "Website"
   email_label           : "Email"
   recent_posts          : "Recent Posts"
+  didnt-push            : "I didn't push"
+  pushed                : "I pushed"
+  refresh               : "I need a refresher"
+  show-me-how           : "Show me how"
+  troubleshooting       : "Help me troubleshoot"
+  tell-me-why           : "Tell me why"
+  get-help              : "Get Help"
+  stuck                 : "Stuck? Open an issue in the repository for this class and mention <strong>@githubteacher</strong> for help from one of the GitHub trainers!"
+  continue              : "Continue"
 en-US:
   <<: *DEFAULT_EN
 en-UK:
@@ -35,6 +45,7 @@ en-UK:
 # Spanish
 # --------------
 es: &DEFAULT_ES
+  name                  : "Español"
   page                  : "Página"
   pagination_previous   : "Anterior"
   pagination_next       : "Siguiente"
@@ -59,6 +70,15 @@ es: &DEFAULT_ES
   website_label         : "Sitio web"
   email_label           : "Email"
   recent_posts          : "Entradas recientes"
+  didnt-push            : "No hice push"
+  pushed                : "Hice push"
+  refresh               : "Necesito un recordatorio"
+  show-me-how           : "Enséñame cómo"
+  troubleshooting       : "Ayúdame a resolver"
+  tell-me-why           : "Dime por qué"
+  get-help              : "Pide Ayuda"
+  stuck                 : "¿Atascado? Abre un tema (issue) en el repositorio para esta clase y menciona a <strong>@githubteacher</strong> para obtener ayuda de uno de los instructores de GitHub."
+  continue              : "Continuar"
 es-ES:
   <<: *DEFAULT_ES
 es-CO:

_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 }}
 </div>
 
-Need help? **Open an issue** [in our class repository](https://github.com/githubschool{{site.baseurl}}-github-pages/issues/new) for answers from GitHub trainers!
+Need help? **Open an issue** [in our class repository](https://github.com/githubschool/on-demand-github-pages/issues/new) for answers from GitHub trainers!
 {: .notice--success}

_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 }}
 </div>
 
-Need help? **Open an issue** [in our class repository](https://github.com/githubschool{{site.baseurl}}-github-pages/issues/new) for answers from GitHub trainers!
+Need help? **Open an issue** [in our class repository](https://github.com/githubschool/on-demand-github-pages/issues/new) for answers from GitHub trainers!
 {: .notice--success}

_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 }}
 </div>
 
-Need help? **Open an issue** [in our class repository](https://github.com/githubschool{{site.baseurl}}-github-pages/issues/new) for answers from GitHub trainers!
+Need help? **Open an issue** [in our class repository](https://github.com/githubschool/on-demand-github-pages/issues/new) for answers from GitHub trainers!
 {: .notice--success}