diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 4d0a3aac1..121c2cb94 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -2,7 +2,7 @@ Please make sure to: - add (fixes #issue_number) to the end of pull request title when applicable, -- drop a link to your new pull request in our gitter chat. +- drop a link to your new pull request in our discord server. Thank you for contributing! --> diff --git a/README.md b/README.md index 102932ab1..90d3402ae 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Welcome to treehouses ===================== [![Website treehouses.io](https://img.shields.io/website?url=https%3A%2F%2Ftreehouses.io)](https://treehouses.io) -[![Gitter chatroom](https://img.shields.io/gitter/room/treehouses/Lobby)](https://gitter.im/treehouses/Lobby) +[![chat on discord](https://img.shields.io/discord/1079980988421132369?logo=discord&color=%237785cc)](https://discord.gg/NdrumrSNSA) What is treehouses? ------------------- diff --git a/index.md b/index.md index 9066698fc..f7e4cdc79 100644 --- a/index.md +++ b/index.md @@ -12,7 +12,7 @@ The project is divided into several parts to meet the needs of different users, ![OLE Raspberry Pi](./images/OLE_RPi.png) More information about the internship and treehouses can be found in our [FAQ](https://treehouses.io/#!./pages/vi/faq.md#General_Internship_Questions). -Should you wish to reach out for information or assistance, feel free to contact us in the [Gitter chatroom](https://gitter.im/treehouses/Lobby). Feel free to direct message our [members](./pages/vi/team.md) in Gitter if you'd like. +Should you wish to reach out for information or assistance, feel free to contact us in [our Discord server](https://discord.gg/NdrumrSNSA). --- diff --git a/navigation.md b/navigation.md index 9f163c069..2e9615389 100644 --- a/navigation.md +++ b/navigation.md @@ -34,9 +34,9 @@ * [**Introduction**](pages/docs/chat.md) - - - - - * [General Chat (Open to Public)](https://gitter.im/treehouses/Lobby) - * [Virtual Interns](https://gitter.im/open-learning-exchange/interns) - * [RaspberryPi](https://gitter.im/open-learning-exchange/raspberrypi) + * [Discord Chat (Open to Public)](https://discord.gg/NdrumrSNSA) + * [Discord - Virtual Interns Lounge](https://discord.com/channels/1079980988421132369/1229436065090371616) + * [RaspberryPi](https://discord.gg/NdrumrSNSA) diff --git a/pages/blog/20191202-blogfornewintern.md b/pages/blog/20191202-blogfornewintern.md index 895b1bdfc..4d1bbbbc7 100644 --- a/pages/blog/20191202-blogfornewintern.md +++ b/pages/blog/20191202-blogfornewintern.md @@ -6,11 +6,11 @@ This blog is about how to help aspiring interns complete the First Steps. -As an intern, your job is to look in the Gitter chat for: -• New aspiring virtual interns in the chat to welcome them +As an intern, your job is to look in the Discord server for: +• New aspiring virtual interns in the server to welcome them • New pull requests by them in [treehouses.github.io](https://github.com/treehouses/treehouses.github.io) that are ready for review • Pull requests ready to be merged (2 approvals) -• Questions and problems they are stuck on (they might send you a private message so please regularly check your Gitter) +• Questions and problems they are stuck on (they might send you a private message so please regularly check your Discord) ## How to welcome all new aspiring virtual interns If you see this message `@/all Hello Team my name is .... I'd like to become a virtual intern. What is the next step?`, you need to welcome the new intern and send this link `https://treehouses.io/#!./pages/vi/firststeps.md` so they can start working on the First Steps. @@ -28,7 +28,7 @@ One of your responsibilities as an intern is to review and help aspiring virtual 1. **Review files:** you can comment, approve, and request changes in the 'Files Changed' tab on their pull request. For this step, you should take your time to review a file. Do not rush :) -Every time you comment on an issue or review a pull request, message those involved on the Gitter chat with a link to the issue or the pull request so the aspiring virtual intern can see the comment. For example: +Every time you comment on an issue or review a pull request, message those involved on the Discord channel with a link to the issue or the pull request so the aspiring virtual intern can see the comment. For example: ``` @username_of_intern please see my comment (URL link of the issue or pull request) ``` @@ -43,7 +43,7 @@ The pull request can be merged if at least two other people have approved it and * if you accidently merge a PR that does not include closing keywords, you need to manually close the issue and link it to the original pull request. * The title should also be in lowercase letters `we do not want uppercase letters in the title of PRs` -Every time you merge a pull request, please send a message to the intern on the Gitter chat with a link to the issue and merged link. For example: +Every time you merge a pull request, please send a message to the intern on the Discord channel with a link to the issue and merged link. For example: ``` @username_of_intern please look at (URL link of the issue) and (URL link of the merged link) @@ -52,7 +52,7 @@ Every time you merge a pull request, please send a message to the intern on the ## Work Routine We recommend you to follow this basic daily routine: -1. [Check gitter chat](https://gitter.im/treehouses/Lobby) +1. Check our Discord server 1. Review any issues or pull requests that have been added or changed on [treehouses.github.io](https://github.com/treehouses/treehouses.github.io) since the last time you reviewed. 1. Make pull requests as early as possible so you can get feedback as you work. 1. Join the Google hangout sessions at [http://talk.ole.org]( http://talk.ole.org). At the Hangout meeting, we will discuss our projects. If you have any questions, you can also ask the team at the meeting. For the Treehouses meeting, we have three sessions which are ... diff --git a/pages/blog/20200110-androidstudiosetup.md b/pages/blog/20200110-androidstudiosetup.md index 586d31c21..762dbd9ad 100644 --- a/pages/blog/20200110-androidstudiosetup.md +++ b/pages/blog/20200110-androidstudiosetup.md @@ -91,9 +91,9 @@ Run the app on an emulator as follows: ## Run into problems? - * Google your errors and post them in [Gitter](https://treehouses.io/#!pages/chat.md) if you need help. + * Google your errors and post them in our Discord server if you need help. * You might need to reinstall Android Studio to fix your problem. --- -Portions of this page are reproduced from work created and shared by the Android Open Source Project and used according to terms described in the Creative Commons 2.5 Attribution License. \ No newline at end of file +Portions of this page are reproduced from work created and shared by the Android Open Source Project and used according to terms described in the Creative Commons 2.5 Attribution License. diff --git a/pages/chat.md b/pages/chat.md index f5a4bde54..7c906dc42 100644 --- a/pages/chat.md +++ b/pages/chat.md @@ -1,14 +1,14 @@ # treehouses / chat -## Gitter +## Discord -Our **Gitter** chat is a great place to learn, discuss, and collaborate with other members to build a better treehouses platform. The chat lets our development team and interns communicate easily, and signup is through each member’s GitHub account. +Our **Discord** server is a great place to learn, discuss, and collaborate with other members to build a better treehouses platform. The chat lets our development team and interns communicate easily. -Communication is key in every collaborative project, and treehouses is no different. Gitter provides tight integration with *Github* and provides full rich text support through **Markdown** an important tool for clean and efficient communication. Combining these features allows members to mention other members in a message, format text, share images and code, and directly link to GitHub issues and repositories. +Communication is key in every collaborative project, and treehouses is no different. Discord provides integration with *Github* and provides full rich text support through **Markdown**, an important tool for clean and efficient communication. Combining these features allows members to mention other members in a message, format text, share images and code, and directly link to GitHub issues and repositories. ## Best Practices -As you complete the [First Steps](vi/firststeps.md), we want you to keep us updated in the Gitter chat. Generally, you should comment in the chat when you make an issue or pull request, and then link to it. Make a mention (@*name*) of someone when you comment on their issue/pull request, then link to it. For example: +As you complete the [First Steps](vi/firststeps.md), we want you to keep us updated in the Discord channel. Generally, you should comment in the chat when you make an issue or pull request, and then link to it. Make a mention (@*name*) of someone when you comment on their issue/pull request, then link to it. For example: > Hey @dogi, just commented on your issue: [https://github.com/treehouses/treehouses.github.io/issues/2](https://github.com/treehouses/treehouses.github.io/issues/2) @@ -16,9 +16,4 @@ This good etiquette helps streamline communication between internship candidates You may want to include clarifying *images* with your messages. To add an image in the chat, either drag and drop or copy and paste it into the messaging area. -Below is the preview of our Gitter chat room. [Click here](https://gitter.im/treehouses/Lobby/) for the full Gitter chat page. We also encourage the use of Gitter chat apps for Windows, macOS, Linux, Android and iPhone, visit the download [page here](https://gitter.im/apps). - -## Gitter Chat Room Preview - - - +We also encourage the use of Discord apps for Windows, macOS, Linux, Android and iPhone, visit the download [page here](https://discord.com/download). diff --git a/pages/vi/dockertutorial.md b/pages/vi/dockertutorial.md index 4db8a5d43..332290026 100644 --- a/pages/vi/dockertutorial.md +++ b/pages/vi/dockertutorial.md @@ -115,8 +115,8 @@ A few common Docker CLI commands you might need for working with `treehouses` ar Compose is a tool for defining and running multi-container Docker applications. With Compose, you use a YAML file to configure your application’s [services](https://docs.docker.com/get-started/part3/#about-services). Then, with a single command, you create and start all the services from your configuration. You can read more about Docker Compose at [Overview of Docker Compose](https://docs.docker.com/compose/overview/). -**NOTE**: At the end of this step, when you have completed all the sections and executed the `docker-compose --version` command go to the Gitter [chat](https://gitter.im/treehouses/Lobby) and post which version of docker you are running. +**NOTE**: At the end of this step, when you have completed all the sections and executed the `docker-compose --version` command, go to the [Discord #seednest channel](https://discord.com/channels/1079980988421132369/1081433296333963274) and post which version of docker you are running. " @/all I'm on step 4 - Docker Tutorial, I am running `docker version` and `docker compose version` " --- -#### Return to [First Steps](firststeps.md#Step_4_-_System_Tutorial) \ No newline at end of file +#### Return to [First Steps](firststeps.md#Step_4_-_System_Tutorial) diff --git a/pages/vi/faq.md b/pages/vi/faq.md index c17180ff0..7606e3ded 100644 --- a/pages/vi/faq.md +++ b/pages/vi/faq.md @@ -36,7 +36,7 @@ #### Q4: What are the hours of the internship? -+ This is an intensive internship that requires 16 hours of work each week. Work with your fellow interns and keep us updated in the [Gitter chat](https://gitter.im/treehouses/Lobby). ++ This is an intensive internship that requires 16 hours of work each week. Work with your fellow interns and keep us updated in [our Discord server](https://discord.com/channels/1079980988421132369). + The reason we have a 16 hour minimal commitment per week is that things are moving forward quickly and it might be hard for virtual interns to catch up with changes. Basically, we would have a few hours of Google Hangout sessions per week where everyone shares their screen, discusses problems, and works on issues together. Then the rest of the time is for catching up with the changes and working on issues assigned. #### Q5: Is this a paid internship? @@ -45,7 +45,7 @@ #### Q6: What happens after the initial steps? -+ The initial steps are meant to introduce potential interns to the Treehouses system and begin assigning you assignments! To be more clear: the initial 10 steps are a vetting process to determine whether or not people are fit for the internship, so consider it an interview for the internship. Once you have completed the 10 steps and are approved, you have officially joined the OLE interns team! We’ll add you to the interns Gitter chatroom and assign you to a team. You and your team will be working on an assignment, and we’ll switch up the assignments each week. ++ The initial steps are meant to introduce potential interns to the Treehouses system and begin assigning you assignments! To be more clear: the initial 10 steps are a vetting process to determine whether or not people are fit for the internship, so consider it an interview for the internship. Once you have completed the 10 steps and are approved, you have officially joined the OLE interns team! We’ll add you to the interns Discord channel and assign you to a team. You and your team will be working on an assignment, and we’ll switch up the assignments each week. #### Q7: If I'm an international student, how soon can I get my paperwork required by my visa? diff --git a/pages/vi/firststeps.md b/pages/vi/firststeps.md index bcf9ca2ac..5fefb89f1 100644 --- a/pages/vi/firststeps.md +++ b/pages/vi/firststeps.md @@ -4,14 +4,14 @@ Welcome to the first steps for becoming a Systems Engineering Virtual Intern at OLE! After completing these steps, you will be working on OLE’s project, treehouses. These first steps are a process to prove that you have learned the foundational skills before you can progress to working on harder projects with larger teams. Consider this to be the interview for the internship. -If you are selected for the internship after completing the steps, you will be officially invited to join the OLE interns team! We’ll add you to the Virtual Interns Gitter chatroom and assign you to a specific team to work on developing and improving OLE’s software. +If you are selected for the internship after completing the steps, you will be officially invited to join the OLE interns team! We’ll add you to the Virtual Interns Discord channel and assign you to a specific team to work on developing and improving OLE’s software. Once accepted, you and your team will work on an assignment, and we’ll switch up the assignments each week. As part of this internship, you will have the opportunity to work with software and languages including **[Git](https://git-scm.com/)**, **[GitHub](https://github.com/)**, **[Markdown](https://daringfireball.net/projects/markdown/syntax)**, **[Command Line/Terminal Scripts](https://www.codecademy.com/articles/command-line-commands)**, **[Vim](https://www.vim.org/)**, and **[Docker](https://www.docker.com/).** Furthermore, you will be able to learn and practice your skills in using **[Raspberry Pi Hardware](https://raspberrypi.org)**. The goal of OLE is to provide educational infrastructure to learners and educators in remote areas of the globe. The Raspberry Pi is used in pursuit of this goal to provide a cost-effective means by which devices can access educational resources. We aim to provide a stable system that is widely accessible by numerous devices and operating systems. This equipment will be deployed in the field with little or no access to the internet, so its reliability is of paramount importance. -**NOTE:** This is an unpaid but intensive internship that requires 16 hours of work each week. More information about the internship can be found in our [FAQ](faq.md#General_Internship_Questions). If you have further questions, don’t hesitate to ask other members in the Gitter [chat](https://gitter.im/treehouses/Lobby)! +**NOTE:** This is an unpaid but intensive internship that requires 16 hours of work each week. More information about the internship can be found in our [FAQ](faq.md#General_Internship_Questions). If you have further questions, don’t hesitate to ask other members in the [Discord #seednest channel](https://discord.com/channels/1079980988421132369/1081433296333963274)! # Pre-Requisites @@ -65,7 +65,7 @@ Because these steps are simple, we expect high-quality work, which may take a lo The MDwiki has plenty of resources to help you complete the steps. There is a list of useful links at the end of each step. We also created a [FAQ page](faq.md) where you can find the answers to some commonly asked questions. This page has even more [useful links and video tutorials](faq.md#Helpful_Links) that will help you become familiar with the tools/languages we use. For anything that is not on the FAQ page, Google and Stack Exchange are your friends :) -**We also want you to keep us updated on a relatively good amount in the [Gitter chat](../chat.md) as you complete these steps. We will ask you to send us messages, links, and screenshots along the First Steps, and we will use this to track your progress, so please do not forget to do so.** +**We also want you to keep us updated on a relatively good amount in the [Discord server](../chat.md) as you complete these steps. We will ask you to send us messages, links, and screenshots along the First Steps, and we will use this to track your progress, so please do not forget to do so.** A very large part of these steps is finding problems with these steps and this MDwiki, so take note of any issues that you run into or suggestions for improvement while doing these steps. @@ -108,7 +108,7 @@ The Systems team uses SSH (Secure Shell) to securely and remotely control the Ra Follow the instructions on [GitHub and Markdown](githubandmarkdown.md) -Make sure that you've linked to your github.io and pull request in the [Gitter chat](https://gitter.im/treehouses/Lobby). Also, include the `raw.githack` link in your pull request `https://raw.githack.com/YourUserName/YourUserName.github.io/YourBranchName/#!pages/vi/profiles/YourUserName.md` +Make sure that you've linked to your github.io and pull request in the [Discord #seednest channel](https://discord.com/channels/1079980988421132369/1081433296333963274). Also, include the `raw.githack` link in your pull request `https://raw.githack.com/YourUserName/YourUserName.github.io/YourBranchName/#!pages/vi/profiles/YourUserName.md` **NOTE**: The `raw.githack` link is case sensitive to your username. @@ -140,11 +140,11 @@ Follow the directions at [Git Repositories](gitrepositories.md) to keep your use ## Step 6 - GitHub Issues Tutorial -Follow the [GitHub Issues tutorial](github-issues.md) to create at least one issue. Post a link in [Gitter](https://gitter.im/treehouses/Lobby) whenever you create an issue or when you comment on someone else's issue. You are encouraged to post as many issues as you can for improving the page as well as for personal practice. No issue is too big or too small to be filed and it is OK if you are not sure how to fix it yourself. If you know how to solve an issue, be sure to provide a detailed account of your research and show how to fix it. It is ok to file an issue about minor typos and very small changes, but do not make this the case for all of the issues that you file. You can also work on issues that you didn't create. +Follow the [GitHub Issues tutorial](github-issues.md) to create at least one issue. Post a link in [Discord #seednest channel](https://discord.com/channels/1079980988421132369/1081433296333963274) whenever you create an issue or when you comment on someone else's issue. You are encouraged to post as many issues as you can for improving the page as well as for personal practice. No issue is too big or too small to be filed and it is OK if you are not sure how to fix it yourself. If you know how to solve an issue, be sure to provide a detailed account of your research and show how to fix it. It is ok to file an issue about minor typos and very small changes, but do not make this the case for all of the issues that you file. You can also work on issues that you didn't create. Make sure you have created at least one issue, resolved it, commented on an issue you didn't create and have a pull request with the fix merged. You may continue making Issues, Pull requests and Comments, or move on to the next step, while you are waiting for your pull request to be merged. The approval process for your Step 6 fix may take time, but it is OK to continue working. -**NOTE**: When posting a link in the Gitter, it may be helpful to tag the newest interns since they are likely the most active. +**NOTE**: When posting a link in the Discord channel, it may be helpful to tag the newest interns since they are likely the most active. > Once you complete Step 6 you will have: @@ -175,7 +175,7 @@ You should: * Get approval to work on the issues you have created. **Make sure someone from the System's team confirms that you should work on the issue BEFORE you start to work on it.** * Resolve the three issues by making the necessary changes in your repo with three separate pull requests. -Just as your learning with this Wiki was made possible by the efforts of previous interns, now we turn to you to continue that tradition and help future interns take their First Steps. Through this step, you should try to further improve our Markdown Wiki, with better explanations, formatting fixes, and more! You must have made your pull requests and have them each approved by at least two other OLE team members/interns in order for it to be merged to the upstream repository. Just as before, announce your Pull Request on the Gitter chat so other members can review it. You may need to make some additional corrections. Learn by teaching - or editing our teaching tool, in this case! +Just as your learning with this Wiki was made possible by the efforts of previous interns, now we turn to you to continue that tradition and help future interns take their First Steps. Through this step, you should try to further improve our Markdown Wiki, with better explanations, formatting fixes, and more! You must have made your pull requests and have them each approved by at least two other OLE team members/interns in order for it to be merged to the upstream repository. Just as before, announce your Pull Request on the Discord channel so other members can review it. You may need to make some additional corrections. Learn by teaching - or editing our teaching tool, in this case! **NOTE**: When you are fixing an issue, mention the issue number you are fixing in the title of your pull request and make a new branch for every new issue from the master branch. @@ -189,7 +189,7 @@ Just as your learning with this Wiki was made possible by the efforts of previou ## Step 9 - Be Part of the Team -Next thing is to post a screenshot of your completed progress to the Gitter chat room. Click [here](trackprogress.md) to find your completed progress. -Message us ("@/all" and "@dogi") and ask about adding yourself to the virtual intern list found in [team.md](team.md) and setting up a meeting so you can become a part of the team as soon as possible. +Next thing is to post a screenshot of your completed progress to the [Discord #seednest channel](https://discord.com/channels/1079980988421132369/1081433296333963274). Click [here](trackprogress.md) to find your completed progress. +Message us ("@vi-systems" and "@dogi") and ask about adding yourself to the virtual intern list found in [team.md](team.md) and setting up a meeting so you can become a part of the team as soon as possible. Make sure to read through the [intern orientation document](orientation.md) before the meeting. diff --git a/pages/vi/githubandmarkdown.md b/pages/vi/githubandmarkdown.md index ce1a9b6f2..08cbe3e09 100644 --- a/pages/vi/githubandmarkdown.md +++ b/pages/vi/githubandmarkdown.md @@ -124,16 +124,16 @@ Once you have your profile ready, it's time to create a pull request. Click on o * include the raw.githack link to your Markdown profile page in the pull request description * scroll down the page and verify you used at least 5 **different** Markdown elements in your profile -Finally, click "Create pull request" button and post the link to your github.io and profile pull request in the [gitter chat](https://gitter.im/treehouses/Lobby): +Finally, click "Create pull request" button and post the link to your github.io and profile pull request in the [Discord #seednest channel](https://discord.com/channels/1079980988421132369/1081433296333963274): > @/all I'm on step 3 - GitHub and Markdown, please look at `https://YourUserName.github.io` and review my profile pull request `LinkToYourPullRequest` Remember, it can take a while for `https://YourUserName.github.io` to be up and running, so don't worry if you see a **404** when you access the link! -Someone from our team will review the changes and notify you on gitter. Often there will be some feedback from the reviewer for you to address. If that is the case, go to your pull request first then select "files changed" --> next select "..." on the top right --> select "Edit File" --> make the required changes --> scroll down and select "commit" on the pull request when done. Any changes you make to your branch will be automatically updated in the pull request. Once you get 2 approving reviews, we will merge your Markdown profile with the main repository. +Someone from our team will review the changes and notify you on Discord. Often there will be some feedback from the reviewer for you to address. If that is the case, go to your pull request first then select "files changed" --> next select "..." on the top right --> select "Edit File" --> make the required changes --> scroll down and select "commit" on the pull request when done. Any changes you make to your branch will be automatically updated in the pull request. Once you get 2 approving reviews, we will merge your Markdown profile with the main repository. -After the pull request is merged, you'll be able to see your personal page at `treehouses.github.io/#!pages/vi/profiles/.md`. Let us know in the [gitter.im chat](https://gitter.im/treehouses/Lobby) after you complete this step. +After the pull request is merged, you'll be able to see your personal page at `treehouses.github.io/#!pages/vi/profiles/.md`. Let us know in the [Discord #seednest channel](https://discord.com/channels/1079980988421132369/1081433296333963274) after you complete this step. **NOTE**: Try to add and experiment with as many markdown elements as you can and make your page attractive. A list of sample profile pages can be found [**here**](https://github.com/treehouses/treehouses.github.io/tree/master/pages/vi/profiles). Be creative. diff --git a/pages/vi/nextcloud-tor.md b/pages/vi/nextcloud-tor.md index b1d0e647b..2c5919b21 100644 --- a/pages/vi/nextcloud-tor.md +++ b/pages/vi/nextcloud-tor.md @@ -32,7 +32,7 @@ reboot ``` Replace `username` with your Github username,and replace `wifiname` and `wifipassword` with your wifi name and password that you are connecting. Save the file, and safely eject the SD card. -**NOTE**: You must modify the `autorunonce` file _before_ using the SD card with the Raspberry Pi. Failure to do this step correctly will cause "Planet Learning" - another OLE service - to load when starting Tor. Don’t hesitate to ask other members in the [Gitter chat](https://gitter.im/treehouses/Lobby) if you are not able to load Nextcloud _after attempting this step again_. +**NOTE**: You must modify the `autorunonce` file _before_ using the SD card with the Raspberry Pi. Failure to do this step correctly will cause "Planet Learning" - another OLE service - to load when starting Tor. Don’t hesitate to ask other members in the [Discord #seednest channel](https://discord.com/channels/1079980988421132369/1081433296333963274) if you are not able to load Nextcloud _after attempting this step again_. ## Install Tor @@ -100,7 +100,7 @@ In the Tor browser on your computer, navigate to the .onion address. For instan ![](images/nextcloud-login.png) -Once you reach this page, send a screenshot of the window (including the URL) in the Gitter chat. +Once you reach this page, send a screenshot of the window (including the URL) in the [Discord #seednest channel](https://discord.com/channels/1079980988421132369/1081433296333963274). ## Wrap up diff --git a/pages/vi/orientation.md b/pages/vi/orientation.md index 625b1f1ef..783f3dcdf 100644 --- a/pages/vi/orientation.md +++ b/pages/vi/orientation.md @@ -75,7 +75,7 @@ You should check if the following conditions are met: * [x] no merge conflicts * [x] commits are associated with GitHub account -When you comment / review an issue or pull request, message those involved on the [Gitter chat](https://gitter.im/treehouses/Lobby) with a link to the issue / pull request. Also, if you find any issue that must be addressed with another commit, do not forget to use the `Request changes` option when creating your review. +When you comment / review an issue or pull request, message those involved on the project's related Discord channel with a link to the issue / pull request. Also, if you find any issue that must be addressed with another commit, do not forget to use the `Request changes` option when creating your review. ### Merging a Pull Request @@ -90,7 +90,7 @@ When you are ready to merge the pull request: * An example of good commit title is: "update vi-configuration.md (fix #1530) (#1557)", where "1530" is the issue number and "1557" is pull request number * Read more about [closing Issues using keywords](https://help.github.com/articles/closing-issues-using-keywords/) -Every time you merge a pull request, message the author on [Gitter chat](https://gitter.im/treehouses/Lobby), make sure you include a link to the pull request and commit id. +Every time you merge a pull request, message the author on the project's related Discord channel, make sure you include a link to the pull request and commit id. ## Form a Working Routine and Schedule @@ -98,7 +98,7 @@ Every time you merge a pull request, message the author on [Gitter chat](https:/ While you are free to work in your own style, we recommend you follow this basic daily routine: -* Check Gitter interns room and your Gitter private messages +* Check our Discord server and your Discord direct messages * Join the [OLE Google Hangouts session](http://talk.ole.org) if you are able to, so you can follow what everyone is working on and get help fast * Review any issues or pull requests that have been added or changed on [treehouses.io](https://github.com/treehouses/treehouses.github.io) since last time you reviewed * Work on your issues and write in the intern chat any time you run into problems @@ -129,4 +129,4 @@ Please subscribe to our calendar: ## Communicate, Communicate, Communicate! -It’s not good to go silent on Gitter or any other forms of communication. If you are ever unsure of what to work on, or cannot work for any other reason, please talk to us in the Gitter chat. It's better that we know why you aren’t able to do anything than to imagine reasons ourselves. Remember, the more you put into this internship, the more you will get out of it. It may take a while to get used to the fact that you will need a good amount of self-discipline and initiative to get anything done in a remote internship, but we are here to help, so take advantage of it! +It’s not good to go silent on Discord or any other forms of communication. If you are ever unsure of what to work on, or cannot work for any other reason, please talk to us on our Discord server. It's better that we know why you aren’t able to do anything than to imagine reasons ourselves. Remember, the more you put into this internship, the more you will get out of it. It may take a while to get used to the fact that you will need a good amount of self-discipline and initiative to get anything done in a remote internship, but we are here to help, so take advantage of it! diff --git a/pages/vi/sshpi.md b/pages/vi/sshpi.md index 16b0b16ca..ae5d74785 100644 --- a/pages/vi/sshpi.md +++ b/pages/vi/sshpi.md @@ -112,7 +112,7 @@ Install [Tor](https://www.torproject.org/download/) To activate Tor, SSH into your Raspberry Pi with `root`, and run `treehouses tor add 22`, `treehouses tor add 80`, and `treehouses tor notice on`. To view the Tor address of your Pi, run `treehouses tor`, then copy-paste this address into your Tor Browser, to make sure it works; you should see a configuration page for Planet Learning, one of our other services. --- -#### At the end of this section, post the code of your successful SSH terminal to the [Gitter chat](https://gitter.im/treehouses/Lobby) +#### At the end of this section, post the code of your successful SSH terminal to the [Discord #seednest channel](https://discord.com/channels/1079980988421132369/1081433296333963274) It may look like this: ``` diff --git a/pages/vi/vagranttutorial.md b/pages/vi/vagranttutorial.md index 2dec329aa..3e9da8061 100644 --- a/pages/vi/vagranttutorial.md +++ b/pages/vi/vagranttutorial.md @@ -154,7 +154,7 @@ or not commonly used. To see all subcommands, run the command `vagrant list-commands`. ``` -**NOTE**: At the end of this section, when you successfully installed `vagrant` and configured `cli`. Execute `vagrant global-status` command and post the code of your terminal to the [Gitter chat](https://gitter.im/treehouses/Lobby). +**NOTE**: At the end of this section, when you successfully installed `vagrant` and configured `cli`. Execute `vagrant global-status` command and post the code of your terminal to the [Discord #seednest channel](https://discord.com/channels/1079980988421132369/1081433296333963274). ## Useful Links