Merge branch 'TheOdinProject:main' into main

foundations/introduction/join_the_odin_community.md

@@ -74,8 +74,8 @@ Your Multiple Lines of Colorful Code
 
 ### Chat features
 
-- Have fun with giphys: type `/giphy hi` to say hi to everyone.
-- Type `!help` for more information on chat commands.
+- Have fun with giphys: type `/gif hi` to say hi to everyone.
+- Type `/help` for more information on chat commands.
 - Show your appreciation to those who help you with `@username ++`.
 - Don't forget to visit all the available rooms!
 
@@ -109,7 +109,7 @@ If the question does not reveal where they are in the curriculum, ask them so th
 
 #### 6. Ask for clarifications.
 
-If the question seems confusing or ambiguous, ask for more clarity, or politely link them to our bot command `!question`, which links to the [How to be great at asking coding questions](https://medium.com/@gordon_zhu/how-to-be-great-at-asking-questions-e37be04d0603) article.
+If the question seems confusing or ambiguous, ask for more clarity, or politely link them to our bot command `/question`, which links to the [How to be great at asking coding questions](https://medium.com/@gordon_zhu/how-to-be-great-at-asking-questions-e37be04d0603) article.
 
 #### 7. Ask for live code.
 
@@ -119,7 +119,7 @@ If the question needs to have live code to fully understand or debug, ask them t
 
 Learning how to research these questions is a very important skill for developers, so we need to empower them to find their own answer. When we answer these questions, it hinders their personal growth and makes them codependent on our community.
 
-Instead of answering these questions, politely ask them to google their question or use our bot command `!google` with the search terms.
+Instead of answering these questions, politely ask them to google their question or use our bot command `/google` with the search terms.
 
 #### 9. Do not answer questions covered in our curriculum.
 
@@ -135,7 +135,7 @@ When helping someone it can be easy to spot other problems in their code. Resolv
 
 #### 11. Encourage students to use a debugger.
 
-It is common for students to not understand the importance of using a debugger to look at the values of their variables at different points in their program. When students are getting unexpected values, politely encourage them to use a debugger with our bot command `!debug`.
+It is common for students to not understand the importance of using a debugger to look at the values of their variables at different points in their program. When students are getting unexpected values, politely encourage them to use a debugger with our bot command `/debug`.
 
 #### 12. Watch for students that need to take a step back.
 

git/intermediate_git/a_deeper_look_at_git.md

@@ -120,7 +120,7 @@ Let's start by looking a bit closer at what happened here. When you ran `git res
 
 Now let's say we want to move where HEAD points to but *don't* want to touch the staging area. If we want to leave the index alone, you can use `git reset --soft`. This would only perform the first part of `git reset` where the HEAD is moved to point somewhere else.
 
-You can think of git reset --soft as a more powerful amend. Instead of changing the last commit, you can go back multiple commits and combine all the changes included in them into one commit.
+You can think of `git reset --soft` as a more powerful amend. Instead of changing the last commit, you can go back multiple commits and combine all the changes included in them into one commit.
 
 The last part of reset we want to touch upon is `git reset --hard`. What this does is it performs all the steps of `git reset`, moving the HEAD and updating the index, but it *also* updates the working directory. This is important to note because it can be dangerous as it can potentially destroy data. A hard reset overwrites the files in the working directory to make it look exactly like the staging area of wherever HEAD ends up pointing to. Similarly to `git commit --amend`, a hard reset is a destructive command which overwrites history. This doesn't mean you should completely avoid it if working with shared repositories on a team with other developers. You should, however, **make sure you know exactly why you're using it, and that your coworkers are also aware of how and why you're using it.**
 

intermediate_html_css/forms/form_validations.md

@@ -194,7 +194,7 @@ It's also worth noting client-side validations are not a silver bullet for ensur
 ### Additional resources
 
 - Check out [HTML5Pattern](https://www.html5pattern.com/) for a list of commonly used pattern regular expressions you may find helpful.
-- Look through [this Twitter thread](https://twitter.com/vponamariov/status/1400388896136040454) of the do's and don'ts for form validation UX.
+- Look through [this Twitter thread](https://threadreaderapp.com/thread/1400388896136040454.html) of the do's and don'ts for form validation UX.
 - Check out these [10 Guidelines](https://www.nngroup.com/articles/errors-forms-design-guidelines/) for form validation design.
 - [Learn Regex: A Beginner’s Guide](https://www.sitepoint.com/learn-regex/) is a great resource for understanding how regex patterns are built and shows how to use a fantastic tool for creating them. 
 - [Demystifying Regex with Practical Examples](https://www.sitepoint.com/demystifying-regex-with-practical-examples/) contains some practical examples in detail so you can understand how they work rather than simply copying and pasting.

ruby_on_rails/rails_basics/controllers.md

@@ -221,10 +221,10 @@ This section contains helpful links to other content. It isn't required, so cons
 
 This section contains questions for you to check your understanding of this lesson. If you’re having trouble answering the questions below on your own, review the material above to find the answer.
 
-- <a class="knowledge-check-link" href="https://guides.rubyonrails.org/action_controller_overview.html#what-does-a-controller-do-questionmark">What does a controller do?</a>
-- <a class="knowledge-check-link" href="#naming-matters">Why is it important to adhere to the Rails naming convention for your controllers and all of its methods?</a>
-- <a class="knowledge-check-link" href="#rendering-and-redirecting">What is the difference between `render` and `redirect_to`?</a>
-- <a class="knowledge-check-link" href="https://guides.rubyonrails.org/action_controller_overview.html#parameters">Which variable in your controller contains all the data sent in by the user?</a>
-- <a class="knowledge-check-link" href="#strong-parameters">Data from a client can never be trusted. Which helper method should you incorporate in your controller to prevent malicious data injections?</a>
-- <a class="knowledge-check-link" href="https://guides.rubyonrails.org/action_controller_overview.html#the-flash">When is a flash message shown?</a>
-- <a class="knowledge-check-link" href="https://guides.rubyonrails.org/action_controller_overview.html#flash-now">How do we change when a flash is shown?</a>
+- [What does a controller do?](https://guides.rubyonrails.org/action_controller_overview.html#what-does-a-controller-do-questionmark)
+- [Why is it important to adhere to the Rails naming convention for your controllers and all of its methods?](#naming-matters)
+- [What is the difference between `render` and `redirect_to`?](#rendering-and-redirecting)
+- [Which variable in your controller contains all the data sent in by the user?](https://guides.rubyonrails.org/action_controller_overview.html#parameters)
+- [Data from a client can never be trusted. Which helper method should you incorporate in your controller to prevent malicious data injections?](#strong-parameters)
+- [When is a flash message shown?](https://guides.rubyonrails.org/action_controller_overview.html#the-flash)
+- [How do we change when a flash is shown?](https://guides.rubyonrails.org/action_controller_overview.html#flash-now)