main

.tours/task-1---create-assessment.tour

@@ -9,7 +9,7 @@
     },
     {
       "file": "packages/client/src/pages/Assessments/NewAssessment.jsx",
-      "description": "# Create Form\n\nUse the provided Assessment Info in [docs/assessment_info.md](https://github.com/UC-ITSC/OCAT-Intern-Template/blob/master/docs/assessment_info.md) to create an assessment form for the front-end using the library \"`react-hook-form`\"\n\nInstall and implement \"`react-hook-form`\" by following the [documented instructions](https://www.npmjs.com/package/react-hook-form)\n",
+      "description": "# Create Form\n\nUse the provided Assessment Info in [docs/assessment_info.md](https://github.com/UC-ITSC/OCAT-Intern-Template/blob/main/docs/assessment_info.md) to create an assessment form for the front-end using the library \"`react-hook-form`\"\n\nInstall and implement \"`react-hook-form`\" by following the [documented instructions](https://www.npmjs.com/package/react-hook-form)\n",
       "line": 6
     },
     {
@@ -19,7 +19,7 @@
     },
     {
       "file": "packages/api/config/default.json",
-      "description": "# Config\n\n1. Setup your PostgreSQL instance in a Docker container using the step-by-step instructions provided in [docs/install_postgres.md](https://github.com/UC-ITSC/OCAT-Intern-Template/blob/master/docs/install_postgres.md)\n2. Duplicate this file using copy + paste\n3. Rename this file to local.json\n4. Supply the correct values to match your PostgreSQL instance\n5. Remove any values that you don't change from the default.json",
+      "description": "# Config\n\n1. Setup your PostgreSQL instance in a Docker container using the step-by-step instructions provided in [docs/install_postgres.md](https://github.com/UC-ITSC/OCAT-Intern-Template/blob/main/docs/install_postgres.md)\n2. Duplicate this file using copy + paste\n3. Rename this file to local.json\n4. Supply the correct values to match your PostgreSQL instance\n5. Remove any values that you don't change from the default.json",
       "line": 1,
       "title": "Config"
     },
@@ -40,7 +40,7 @@
     },
     {
       "file": "packages/api/src/microservices/Assessment-Service.js",
-      "description": "# Finish Issue\n\n1. Test manually in the browser to make sure your form is working and submitting properly\n2. [Create a new branch](https://docs.github.com/en/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/managing-branches#creating-a-branch)\n3. [Create a pull request into the \"master\" branch](https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request)\n4. [Get someone to review your pull request](https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/about-pull-request-reviews)\n5. Once happy with your changes, [merge your pull request](https://docs.github.com/en/github/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request)\n6. Go to the next issue",
+      "description": "# Finish Issue\n\n1. Test manually in the browser to make sure your form is working and submitting properly\n2. [Create a new branch](https://docs.github.com/en/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/managing-branches#creating-a-branch)\n3. [Create a pull request into the \"main\" branch](https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request)\n4. [Get someone to review your pull request](https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/about-pull-request-reviews)\n5. Once happy with your changes, [merge your pull request](https://docs.github.com/en/github/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request)\n6. Go to the next issue",
       "line": 13
     }
   ],

.tours/task-2---view-assessment-list.tour

@@ -4,7 +4,7 @@
   "steps": [
     {
       "file": "packages/client/src/App.jsx",
-      "description": "# View Assessment List Issue\n\nMake sure you're starting on the master branch with your latest merged changes\n\n1. [Checkout master](https://docs.github.com/en/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/managing-branches#switching-between-branches)\n2. [Pull down the most recent changes](https://github.com/git-guides/git-pull)",
+      "description": "# View Assessment List Issue\n\nMake sure you're starting on the main branch with your latest merged changes\n\n1. [Checkout main](https://docs.github.com/en/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/managing-branches#switching-between-branches)\n2. [Pull down the most recent changes](https://github.com/git-guides/git-pull)",
       "line": 18
     },
     {
@@ -54,7 +54,7 @@
     },
     {
       "file": "packages/client/src/pages/Assessments/AssessmentList.jsx",
-      "description": "# Finish Issue\n\n1. Test manually to make sure your table is working properly\n2. [Create a new branch](https://docs.github.com/en/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/managing-branches#creating-a-branch)\n3. [Create a pull request into the \"master\" branch](https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request)\n4. [Get someone to review your pull request](https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/about-pull-request-reviews)\n5. Once happy with your changes, [merge your pull request](https://docs.github.com/en/github/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request)\n6. Go to the next issue",
+      "description": "# Finish Issue\n\n1. Test manually to make sure your table is working properly\n2. [Create a new branch](https://docs.github.com/en/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/managing-branches#creating-a-branch)\n3. [Create a pull request into the \"main\" branch](https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request)\n4. [Get someone to review your pull request](https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/about-pull-request-reviews)\n5. Once happy with your changes, [merge your pull request](https://docs.github.com/en/github/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request)\n6. Go to the next issue",
       "line": 21
     }
   ],

README.md

@@ -28,7 +28,7 @@
 
 - Every [Issue](./docs/issues.md) should be code reviewed by another OCAT internship-peer
   - Making a Pull Request
-    - Create a Pull Request (PR) from your development branch (your current branch) into master (the main branch)
+    - Create a Pull Request (PR) from your development branch (your current branch) into main (the main branch)
       - [Creating a Pull Request](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request)
     - Reach out to one of your fellow OCAT interns and ask them nicely to review your code. Include a link to the Pull Request you'd like them to review
     - Take any suggestions with a grain of salt. Remember, this is YOUR application. Make any changes you agree with and then merge the Pull Request
@@ -43,7 +43,7 @@
       - Feel free to ask questions. In the end, this is a learning process. Feel free to ask questions if you don't understand something in the code.
   - After a Pull Request (PR) has been approved, merge it and move on
     - [Merging a Pull Request](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/merging-a-pull-request)
-    - Once merged, create a new branch from master and start on your next issue
+    - Once merged, create a new branch from main and start on your next issue
 
 ## Technologies