Merge branch 'main' of https://github.com/Techtonica/curriculum into …

…main
Techtonica · Dec 29, 2020 · 942a5f3 · 942a5f3
2 parents e8c4afc + 7924678
commit 942a5f3
Show file tree

Hide file tree

Showing 56 changed files with 89 additions and 95 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -38,7 +38,7 @@
 - If it is in the ["TO-DO"](https://github.com/Techtonica/curriculum/projects/2) column, that means it is available, even if there's an "assignee".
 - To **create an outline**, fork the repo or commit directly onto the main branch. [Here is a topic outline template that explains what we need for each section](./_templates/topic-outline.md).
 - To **edit a slideshow**, you'll need to request edit permission by clicking View Only > Request Edit Access, or message Alina. If you are logged into an account ending in @gmail.com, you can simply make a copy, edit, and transfer ownership to [email protected] when you finish. Either way, save on top of the sample template used in the slide, and cut any slides you find unnecessary.
-- To make a **video**, one effective solution has been to record your screen as you explain the lesson slides to the apprentices. An alternative can be a video found online that covers all the objectives of the lesson in a way suited to beginners.
+- To make a **video**, one effective solution has been to record your screen as you explain the lesson slides. An alternative can be a video found online that covers all the objectives of the lesson in a way suited to beginners.
 - Here is an **example** of a great lesson trio: [MongoDB Slides](https://docs.google.com/presentation/d/1BvO6PrSpulHVSDNOkMaDZM-V7McmheLgm0Lg2PFae7k/edit#slide=id.p), [MongoDB Lesson Outline](/electives/databases/mongo-db.md), [MongoDB Video](https://drive.google.com/file/d/1022MSkPjfRyGAUQa2I-pQltpUn4Q1NJc/view).
 
 **While working:**

diff --git a/README.md b/README.md
@@ -2,9 +2,9 @@
 
 Techtonica is a non-profit project of SocialGood that does free tech training and job placement for unemployed or underemployed folks. For more information, please see our website: [Techtonica.org](http://techtonica.org)
 
-Apprentices will learn to do full-stack web development using JavaScript. What bootcamps and apprenticeships like Techtonica have in common is the fact that they are intensive training. However, bootcamps can be pretty passive classroom learning with students and they cost between $15,000 and $30,000.
+Program participants will learn to do full-stack web development using JavaScript. What bootcamps and Techtonica have in common is the fact that they are intensive training. However, bootcamps can be pretty passive classroom learning and they cost \$15,000+ for the students.
 
-An apprenticeship aims to be more like the workplace to make the transition into the industry better—instead of having an instructor constantly guiding you, a facilitator gives you assignments and you're expected to figure out what to do with volunteers, mentors, tech groups, and other apprentices. In the best-case scenarios, there are regular check-ins with managers and mentors provide support. We’re making Techtonica’s program as hands-on and project-based as possible to best prepare you for work in tech.
+Techtonica aims to be more like the workplace to make the transition into the industry better—instead of having an instructor constantly guiding you (which you won't have in any software engineering job), you are given a general schedule of topics and assignments (see our curriculum repo for an idea of the resources provided) and you're expected to figure out what to do on your own or in collaboration with volunteers, mentors, tech groups, and other participants. We’re making Techtonica’s program as hands-on and project-based as possible to best prepare you for work in tech.
 
 **[Jump to Curriculum Table of Contents](./README.md#table-of-contents).**
 
@@ -19,7 +19,7 @@ If you would like to contribute to the curriculum, please [sign up here](https:/
 - If it is in the ["TO-DO"](https://github.com/Techtonica/curriculum/projects/2) column, that means it is available, even if there's an "assignee".
 - To **create an outline**, fork the repo or commit directly onto the main branch. [Here is a topic outline template that explains what we need for each section](./_templates/topic-outline.md).
 - To **edit a slideshow**, you'll need to request edit permission by clicking View Only > Request Edit Access, or message Alina. If you are logged into an account ending in @gmail.com, you can simply make a copy, edit, and transfer ownership to [email protected] when you finish. Either way, save on top of the sample template used in the slide, and cut any slides you find unnecessary.
-- To make a **video**, one effective solution has been to record your screen as you explain the lesson slides to the apprentices. An alternative can be a video found online that covers all the objectives of the lesson in a way suited to beginners.
+- To make a **video**, one effective solution has been to record your screen as you explain the lesson slides to the learner. An alternative can be a video found online that covers all the objectives of the lesson in a way suited to beginners.
 - Here is an **example** of a great lesson trio: [MongoDB Slides](https://docs.google.com/presentation/d/1BvO6PrSpulHVSDNOkMaDZM-V7McmheLgm0Lg2PFae7k/edit#slide=id.p), [MongoDB Lesson Outline](./databases/mongo-db.md), [MongoDB Video](https://drive.google.com/file/d/1022MSkPjfRyGAUQa2I-pQltpUn4Q1NJc/view).
 
 **While working:**
@@ -61,8 +61,8 @@ The following is the approximate sequence of the topics during the program but i
 
 ### Week 0 - Pre-Work
 
-Before beginning the program, apprentices meet weekly for 4 weeks to learn JavaScript fundamentals.
-Apprentices should memorize [common JavaScript built-in functions](/javascript/common-functions-cheatsheet.md) within the first month.
+Before beginning the program, participants meet weekly for 4 weeks to learn JavaScript fundamentals.
+Participants should memorize [common JavaScript built-in functions](/javascript/common-functions-cheatsheet.md) within the first month.
 
 ### Week 1 - Onboarding & Developer Tools
 
@@ -209,7 +209,7 @@ Apprentices should memorize [common JavaScript built-in functions](/javascript/c
 
 ### Week 12 - Final Assessments
 
-1. [Navigating New Codebases](/apprenticeship-prep/navigating-new-codebases.md)
+1. [Navigating New Codebases](/program-prep/navigating-new-codebases.md)
 1. [Open-source Projects](/open-source/open-source.md)
 
 ### Week 13 - Career Week!
@@ -238,11 +238,11 @@ Apprentices should memorize [common JavaScript built-in functions](/javascript/c
 1. [Technical Writing](/career/roles-in-tech/technical-writing.md)
 1. [Final Project: Selecting Your Final Project](/projects/final-project/selecting-your-project.md)
 1. [Final Project: 5 weeks](/projects/final-project/final-project.md)
-1. [Resources: Underrepresented in Tech](/apprenticeship-prep/underrepresented-in-tech.md)
+1. [Resources: Underrepresented in Tech](/program-prep/underrepresented-in-tech.md)
 1. [Difficult Workplace Situations](/career/difficult-workplace-situations.md)
-1. [Financial Literacy](/apprenticeship-prep/financial-literacy.md)
+1. [Financial Literacy](/program-prep/financial-literacy.md)
 1. [Negotiating](/career/interviewing/negotiating.md)
-1. [Ethics in Software Engineering](/apprenticeship-prep/ethics.md)
+1. [Ethics in Software Engineering](/program-prep/ethics.md)
 
 ### Weeks 15+ Final Project
 

diff --git a/_templates/lesson-v2.md b/_templates/lesson-v2.md
@@ -46,15 +46,15 @@ It can contain links to external materials but you should summarize here in your
 
 ### Common Mistakes & Misconceptions
 
-This section is optional, but if there are common misunderstandings, please enumerate them here. List things that apprentices might not realize, might assume at first, or should avoid.
+This section is optional, but if there are common misunderstandings, please enumerate them here. List things that people might not realize, might assume at first, or should avoid.
 
 - i.e. Array.splice and Array.slice are totally different
 - `for (let x of obj)` loops and `for (let elem in obj)` loops are different
 - `const` variables are not immutable; they just can't be reassigned
 
 ### Guided Practice
 
-Have the apprentices work with you as you do something step-by-step. This should be inlined here as original content, not just linked to an external tutorials.
+Have the participants work with you as you do something step-by-step. This should be inlined here as original content, not just linked to an external tutorials.
 
 ### Independent Practice
 

diff --git a/_templates/topic-outline.md b/_templates/topic-outline.md
@@ -53,7 +53,7 @@ Here's text about introducing something and how it works.
 - [Be sure to link the slideshow, video,](https://google.com)
 - [or other materials you expect them to follow as part of the lesson.](https://google.com)
 
-Build on the first information. Have apprentices guess things, do an activity, etc.
+Build on the first information. Have participants make guesses, do an activity, etc.
 
 Make sure to mention these things:
 
@@ -64,26 +64,26 @@ Make sure to mention these things:
 
 ### Common Mistakes & Misconceptions
 
-List things that apprentices might not realize, might assume at first, or should avoid.
+List things that learners might not realize, might assume at first, or should avoid.
 
 - Example
 - Example
 
 ### Guided Practice
 
-Have the apprentices work with you as you do something step-by-step. This can also be fulfilled by a detailed tutorial intended for beginners.
+Have the participants work with you as you do something step-by-step. This can also be fulfilled by a detailed tutorial intended for beginners.
 
 ### Independent Practice
 
 Class does this thing themselves with specific additional items. This could be alone, with a partner, or small group; but the idea is that it's less guided, more independent.
 
 ### Challenge
 
-Apprentices can try to do this other thing. Ideally, they will be challenged to connect what they've learned to some previous knowledge or additional research.
+Participants can try to do this other thing. Ideally, they will be challenged to connect what they've learned to some previous knowledge or additional research.
 
 ### Check for Understanding
 
-Some ideas: have apprentices summarize to each other, make a cheat sheet, take a quiz, do an assignment, or something else that helps them self-assess their understanding. This exercise should help apprentices determine whether they've met the outline objectives, or if they need to review.ss
+Some ideas: have participants summarize to each other, make a cheat sheet, take a quiz, do an assignment, or something else that helps them self-assess their understanding. This exercise should help participants determine whether they've met the outline objectives, or if they need to review.ss
 
 ### Supplemental Materials
 

diff --git a/agile-development/scrum.md b/agile-development/scrum.md
@@ -28,7 +28,7 @@ Practicing Scrum will enable you and your team to instantly address change reque
 
 ### Objectives
 
-**Apprentices will be able to:**
+**Participants will be able to:**
 
 - Explain what Scrum is
 - Know what a Scrum master is
@@ -75,8 +75,6 @@ The three main roles in agile development are:
 
 ### Common Mistakes / Misconceptions
 
-List things that apprentices might not realize, might assume at first, or should avoid.
-
 - Scrum is a process. This is a myth. Scrum is a framework.
 - Scrum is an acronym. This is also false, but a good interview question.
 - Scrum is a silver bullet. Scrum is just a framework to be used with a set of instructions. Scrum implementation and the outcome of a project is based on many factors, outside of the control of the framework.

diff --git a/algorithms/intro-to-algorithms.md b/algorithms/intro-to-algorithms.md
@@ -36,7 +36,7 @@ The top most companies using algorithms are:
 
 ### Objectives
 
-**Apprentices will be able to:**
+**Participants will be able to:**
 
 - Describe what an algorithm is
 - Review Big-O complexity

diff --git a/api/http-request-practice.md b/api/http-request-practice.md
@@ -202,7 +202,7 @@ Since there are tons of libraries out there, now's a great time to try a few and
 
 ### Check for Understanding
 
-Sync up with your pair or another apprentice who is available and go through the following exercises.
+Sync up with your pair partner and go through the following exercises.
 
 #### Discuss Your Most/Least Favorite Tools from this List
 

diff --git a/api/intro-to-http.md b/api/intro-to-http.md
@@ -77,7 +77,7 @@ Extend your Node web server above to console.log which browser the user is uses.
 
 ### Check for Understanding
 
-Sync up with your pair or another apprentice who is available and go through the following exercises.
+Sync up with your pair partner go through the following exercises.
 
 #### Paper Request
 

diff --git a/career/building-confidence.md b/career/building-confidence.md
@@ -114,7 +114,11 @@ Split into small groups, and each group can tackle each section and discuss amon
 
 SWOT analysis
 
-- Have the apprentices complete a SWOT analysis for themselves within the industry. - Strengths: What professional qualifications/certifications do you have that make you stand out? What experiences have you had in specific projects or roles that would help in this role? Do you have some sort of expertise that could positively impact an organization? - Weaknesses: Do you have the necessary skills/qualifications to be successful in this role? Do you have any bad habits? - Opportunities: Is there a position at a company that matches your skill set? Is there a trend in the industry that you can capitalize on in the future? Are there significant changes in the industry that are in your favor? - Threats: Is one of your peers doing a better job than you in the same role, or for a role you're both competing for? Are any of your personal traits or bad habits hurting your career advancement?
+- Complete a SWOT analysis for yourself within the industry.
+- Strengths: What professional qualifications/certifications do you have that make you stand out? What experiences have you had in specific projects or roles that would help in this role? Do you have some sort of expertise that could positively impact an organization?
+- Weaknesses: Do you have the necessary skills/qualifications to be successful in this role? Do you have any bad habits?
+- Opportunities: Is there a position at a company that matches your skill set? Is there a trend in the industry that you can capitalize on in the future? Are there significant changes in the industry that are in your favor?
+- Threats: Is one of your peers doing a better job than you in the same role, or for a role you're both competing for? Are any of your personal traits or bad habits hurting your career advancement?
 
 ### Independent Practice
 
@@ -140,4 +144,4 @@ _Tip: If a site says you've read too many articles, you can generally use a diff
 - What is SWOT ?
 - What is the difference between Rational Thinking / Positive Thinking?
 - What does Bernice Moore's Theory says?
-- Check for apprentices to follow the steps for SOS (Stop, Observe, Shift), the negative self-talk stopping technique. Also check for apprentices to explain the concept of impostor syndrome for awareness!
+- Follow the steps for SOS (Stop, Observe, Shift), the negative self-talk stopping technique. Also explain the concept of impostor syndrome for awareness!
diff --git a/career/interviewing/non-technical-interviewing.md b/career/interviewing/non-technical-interviewing.md
@@ -32,7 +32,7 @@ Your personal narrative is a prepared ~2min response to the question “tell me
 
 Take some time to think about how you got to Techtonica and what you're interested in next. This [guide](https://docs.google.com/document/d/1SkGqJfPYdDvZO1VDzTLxT7Uq_D5WiscvhX5-dYjrvac/edit?usp=sharing) can help you think about and format your response.
 
-Use and adapt your personal narrative with your apprentices and/or at tech talks, conferences, and recruiting events.
+Use and adapt your personal narrative with other Techtonica community members and/or at tech talks, conferences, and recruiting events.
 
 ### Common Mistakes / Misconceptions
 

diff --git a/career/linked-in.md b/career/linked-in.md
@@ -82,16 +82,12 @@ Where to start:
 
 ### Common Mistakes & Misconceptions
 
-List things that apprentices might not realize, might assume at first, or should avoid.
-
-- LinkedIn Profile is a story of who you are becoming not everything you have been. It does not need to be a history of every job you have ever had. If you worked in retail for 7 years and now want a job as a software engineer then there is no need to include the retail experience in your LinkedIn profile. If you do then it will hurt you in search results done by a recruiter. For example a recruiter will do a search for "Software Engineer" "1-3 years" experience and you will not appear although you may have 1 year of experience. You will appear in the search for "Software Engineer" "8-10 years" because LinkedIn counts years of work experience not specific to your title.
+- Your LinkedIn Profile is a story of who you are becoming not everything you have been. It does not need to be a history of every job you have ever had. If you worked in retail for 7 years and now want a job as a software engineer then there is no need to include the retail experience in your LinkedIn profile. If you do then it will hurt you in search results done by a recruiter. For example a recruiter will do a search for "Software Engineer" "1-3 years" experience and you will not appear although you may have 1 year of experience. You will appear in the search for "Software Engineer" "8-10 years" because LinkedIn counts years of work experience not specific to your title.
 
 - LinkedIn is Not Facebook, Instagram, or Twitter. Only post and comment on things that represent you as an employee. Keep a strict line bewteen professional and personal. For example I can post on LinkedIn that I am going to a Women in Tech dinner or maybe reading a book about bias in the workplace. If I am going to a political march on human rights then unless I am doing that as a organized sponsored company event I keep that to my Facebook page.
 
 ### Guided Practice
 
-Have the apprentices work with you as you do something step-by-step. This can also be fulfilled by a detailed tutorial intended for beginners.
-
 ### Independent Practice
 
 Class does this thing themselves with specific additional items. This could be alone, with a partner, or small group; but the idea is that it's less guided, more independent.

diff --git a/career/networking-career.md b/career/networking-career.md
@@ -33,7 +33,7 @@ Benefits of networking:
 
 ### Objectives
 
-**Apprentices will be able to:**
+**Participants will be able to:**
 
 - Comfortably meet new people and start conversations, online and in-person, even as introverts
 - Connect with people after meeting