Amend gendered language

episodes/02-setup.md

@@ -27,7 +27,7 @@ of configurations we will set as we get started with Git:
 
 On a command line, Git commands are written as `git verb options`,
 where `verb` is what we actually want to do and `options` is additional optional information which may be needed for the `verb`. So here is how
-Alfredo sets up his new laptop:
+Alfredo sets up their new laptop:
 
 ```bash
 $ git config --global user.name "Alfredo Linguini"
@@ -84,7 +84,7 @@ $ git config --global core.autocrlf true
 
 ::::::::::::::::::::::::::::::::::::::::::::::::::
 
-Alfredo also has to set his favorite text editor, following this table:
+Alfredo also has to set their favorite text editor, following this table:
 
 | Editor                                | Configuration command | 
 | :-----------                          | :------------------------------ |
@@ -119,7 +119,7 @@ If you want to save your changes and quit, press <kbd>Esc</kbd> then type `:wq`
 
 Git (2.28+) allows configuration of the name of the branch created when you
 initialize any new repository.  Alfredo decides to use that feature to set it to `main` so
-it matches the cloud service he will eventually use.
+it matches the cloud service they will eventually use.
 
 ```bash
 $ git config --global init.defaultBranch main

episodes/03-create.md

@@ -20,7 +20,7 @@ exercises: 0
 Once Git is configured,
 we can start using it.
 
-We will help Alfredo with his new project, create a repository with all his recipes.
+We will help Alfredo with their new project, create a repository with all their recipes.
 
 First, let's create a new directory in the `Desktop` folder for our work and then change the current working directory to the newly created one:
 
@@ -90,7 +90,7 @@ wording of the output might be slightly different.
 
 Along with tracking information about recipes (the project we have already created),
 Alfredo would also like to track information about desserts specifically.
-Alfredo creates a `desserts` project inside his `recipes`
+Alfredo creates a `desserts` project inside their `recipes`
 project with the following sequence of commands:
 
 ```bash
@@ -138,7 +138,7 @@ fatal: Not a git repository (or any of the parent directories): .git
 
 Jimmy explains to Alfredo how a nested repository is redundant and may cause confusion
 down the road. Alfredo would like to go back to a single git repository. How can Alfredo undo
-his last `git init` in the `desserts` subdirectory?
+their last `git init` in the `desserts` subdirectory?
 
 :::::::::::::::  solution
 

episodes/05-history.md

@@ -304,12 +304,12 @@ moving backward and forward in time becomes much easier.
 
 ## Recovering Older Versions of a File
 
-Jennifer has made changes to the Python script that she has been working on for weeks, and the
-modifications she made this morning "broke" the script and it no longer runs. She has spent
+Jennifer has made changes to the Python script that they have been working on for weeks, and the
+modifications they made this morning "broke" the script and it no longer runs. They have spent
 \~ 1hr trying to fix it, with no luck...
 
-Luckily, she has been keeping track of her project's versions using Git! Which commands below will
-let her recover the last committed version of her Python script called
+Luckily, they has been keeping track of their project's versions using Git! Which commands below will
+let them recover the last committed version of their Python script called
 `data_cruncher.py`?
 
 1. `$ git restore`
@@ -349,9 +349,9 @@ you should use `git restore .`
 
 ## Reverting a Commit
 
-Jennifer is collaborating with colleagues on her Python script.  She
-realizes her last commit to the project's repository contained an error, and
-wants to undo it.  Jennifer wants to undo correctly so everyone in the project's
+Jennifer is collaborating with colleagues on their Python script.  They
+realize their last commit to the project's repository contained an error, and
+want to undo it.  Jennifer wants to undo correctly so everyone in the project's
 repository gets the correct change. The command `git revert [erroneous commit ID]` will create a
 new commit that reverses the erroneous commit.
 

episodes/07-github.md

@@ -127,7 +127,7 @@ talking about how they might be used for collaboration.
 
 ## 3\. SSH Background and Setup
 
-Before Alfredo can connect to a remote repository, he needs to set up a way for his computer to authenticate with GitHub so it knows it's him trying to connect to his remote repository.
+Before Alfredo can connect to a remote repository, they need to set up a way for their computer to authenticate with GitHub so it knows it's them trying to connect to their remote repository.
 
 We are going to set up the method that is commonly used by many different services to authenticate access on the command line.  This method is called Secure Shell Protocol (SSH).  SSH is a cryptographic network protocol that allows secure communication between computers using an otherwise insecure network.
 
@@ -167,14 +167,14 @@ ls -al ~/.ssh
 
 Your output is going to look a little different depending on whether or not SSH has ever been set up on the computer you are using.
 
-Alfredo has not set up SSH on his computer, so his output is
+Alfredo has not set up SSH on their computer, so their output is
 
 ```output
 ls: cannot access '/c/Users/Alfredo/.ssh': No such file or directory
 ```
 
 If SSH has been set up on the computer you're using, the public and private key pairs will be listed. The file names are either `id_ed25519`/`id_ed25519.pub` or `id_rsa`/`id_rsa.pub` depending on how the key pairs were set up.
-Since they don't exist on Alfredo's computer, he uses this command to create them.
+Since they don't exist on Alfredo's computer, they use this command to create them.
 
 ### 3\.1 Create an SSH key pair
 
@@ -199,7 +199,7 @@ Created directory '/c/Users/Alfredo/.ssh'.
 Enter passphrase (empty for no passphrase):
 ```
 
-Now, it is prompting Alfredo for a passphrase. Since he is using his kitchen's laptop that other people sometimes have access to, he wants to create a passphrase. Be sure to use something memorable or save your passphrase somewhere, as there is no "reset my password" option.
+Now, it is prompting Alfredo for a passphrase. Since they are using their kitchen's laptop that other people sometimes have access to, they want to create a passphrase. Be sure to use something memorable or save your passphrase somewhere, as there is no "reset my password" option.
 Note that, when typing a passphrase on a terminal, there won't be any visual feedback of your typing.
 This is normal: your passphrase will be recorded even if you see nothing changing on your screen.
 
@@ -276,7 +276,7 @@ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDmRA3d51X0uu9wXek559gfn6UFNF69yZjChyBIU2qKI
 
 Now, going to GitHub.com, click on your profile icon in the top right corner to get the drop-down menu.  Click "Settings", then on the
 settings page, click "SSH and GPG keys", on the left side "Access" menu. Click the "New SSH key" button on the right side. Now,
-you can add the title (Alfredo uses the title "Alfredo's Kitchen Laptop" so he can remember where the original key pair
+you can add the title (Alfredo uses the title "Alfredo's Kitchen Laptop" so they can remember where the original key pair
 files are located), paste your SSH key into the field, and click the "Add SSH key" to complete the setup.
 
 Now that we've set that up, let's check our authentication again from the command line.
@@ -300,7 +300,7 @@ our local repository to the repository on GitHub:
 $ git push origin main
 ```
 
-Since Alfredo set up a passphrase, it will prompt him for it.  If you completed advanced settings for your authentication, it
+Since Alfredo set up a passphrase, it will prompt them for it.  If you completed advanced settings for your authentication, it
 will not prompt for a passphrase.
 
 ```output

episodes/08-collab.md

@@ -43,16 +43,16 @@ then enter your partner's username.
 
 To accept access to the Owner's repo, the Collaborator
 needs to go to [https://github.com/notifications](https://github.com/notifications)
-or check for email notification. Once there she can accept access to the Owner's repo.
+or check for email notification. Once there, they can accept access to the Owner's repo.
 
-Next, the Collaborator needs to download a copy of the Owner's repository to her
+Next, the Collaborator needs to download a copy of the Owner's repository to their 
 machine. This is called "cloning a repo".
 
-The Collaborator doesn't want to overwrite her own version of `recipes.git`, so
-needs to clone the Owner's repository to a different location than her own
+The Collaborator doesn't want to overwrite their own version of `recipes.git`, so
+needs to clone the Owner's repository to a different location than their own
 repository with the same name.
 
-To clone the Owner's repo into her `Desktop` folder, the Collaborator enters:
+To clone the Owner's repo into their `Desktop` folder, the Collaborator enters:
 
 ```bash
 $ git clone [email protected]:alflin/recipes.git ~/Desktop/alflin-recipes
@@ -67,7 +67,7 @@ Make sure to navigate to the `Desktop` folder first.
 
 ![](fig/github-collaboration.svg){alt='A diagram showing that "git clone" can create a copy of a remote GitHub repository, allowing a second person to create their own local repository that they can make changes to.'}
 
-The Collaborator can now make a change in her clone of the Owner's repository,
+The Collaborator can now make a change in their clone of the Owner's repository,
 exactly the same way as we've been doing before:
 
 ```bash
@@ -136,7 +136,7 @@ time to get the latest updates that other people have committed.
 
 Remember that the name you give to a remote only exists locally. It's
 an alias that you choose - whether `origin`, or `upstream`, or `alfred` -
-and not something intrinstic to the remote repository.
+and not something intrinsic to the remote repository.
 
 The `git remote` family of commands is used to set up and alter the remotes
 associated with a repository. Here are some of the most useful ones:
@@ -246,7 +246,7 @@ has some suggestions to propose.
 With GitHub, it is possible to comment on the diff of a commit. Over the line of
 code to comment, a blue comment icon appears to open a comment window.
 
-The Collaborator posts her comments and suggestions using the GitHub interface.
+The Collaborator posts their comments and suggestions using the GitHub interface.
 
 
 ::::::::::::::::::::::::::::::::::::::::::::::::::

episodes/09-conflict.md

@@ -366,7 +366,7 @@ Clone the repository created by your instructor.
 Add a new file to it,
 and modify an existing file (your instructor will tell you which one).
 When asked by your instructor,
-pull her changes from the repository to create a conflict,
+pull their changes from the repository to create a conflict,
 then resolve it.
 
 
@@ -402,7 +402,7 @@ $ ls -lh guacamole.jpg
 `ls` shows us that this created a 1-kilobyte file. It is full of
 random bytes read from the special file, `/dev/urandom`.
 
-Now, suppose Alfredo adds `guacamole.jpg` to his repository:
+Now, suppose Alfredo adds `guacamole.jpg` to their repository:
 
 ```bash
 $ git add guacamole.jpg
@@ -416,8 +416,8 @@ $ git commit -m "Add picture of guacamole"
 ```
 
 Suppose that Jimmy has added a similar picture in the meantime.
-His is a picture of a guacamole with nachos, but it is *also* called `guacamole.jpg`.
-When Alfredo tries to push, he gets a familiar message:
+Theirs is a picture of a guacamole with nachos, but it is *also* called `guacamole.jpg`.
+When Alfredo tries to push, they get a familiar message:
 
 ```bash
 $ git push origin main