From 6020a179d7770129c9a96bd798467a03750c88b4 Mon Sep 17 00:00:00 2001 From: Erin Graham Date: Sun, 3 Nov 2024 15:33:33 +1000 Subject: [PATCH 1/9] Changed hit to press --- episodes/02-setup.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/episodes/02-setup.md b/episodes/02-setup.md index 3e701495bb..5d7dab5c22 100644 --- a/episodes/02-setup.md +++ b/episodes/02-setup.md @@ -57,7 +57,7 @@ If you elect to use a private email address with GitHub, then use GitHub's no-re ## Line Endings -As with other keys, when you hit Enter or ↵ or on Macs, Return on your keyboard, +As with other keys, when you press Enter or ↵ or on Macs, Return on your keyboard, your computer encodes this input as a character. Different operating systems use different character(s) to represent the end of a line. (You may also hear these referred to as newlines or line breaks.) @@ -111,8 +111,8 @@ It is possible to reconfigure the text editor for Git whenever you want to chang ## Exiting Vim Note that Vim is the default editor for many programs. If you haven't used Vim before and wish to exit a session without saving -your changes, press Esc then type `:q!` and hit Enter or ↵ or on Macs, Return. -If you want to save your changes and quit, press Esc then type `:wq` and hit Enter or ↵ or on Macs, Return. +your changes, press Esc then type `:q!` and press Enter or ↵ or on Macs, Return. +If you want to save your changes and quit, press Esc then type `:wq` and press Enter or ↵ or on Macs, Return. :::::::::::::::::::::::::::::::::::::::::::::::::: From 251fcce52bcb7162151d7bd66416fa54eec82970 Mon Sep 17 00:00:00 2001 From: Erin Graham Date: Sun, 3 Nov 2024 17:20:52 +1000 Subject: [PATCH 2/9] expand key points --- episodes/06-ignore.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/episodes/06-ignore.md b/episodes/06-ignore.md index 2c75214162..3a1e8cdc5d 100644 --- a/episodes/06-ignore.md +++ b/episodes/06-ignore.md @@ -367,7 +367,8 @@ You want to keep them but you do not want to track them through `git`. :::::::::::::::::::::::::::::::::::::::: keypoints -- The `.gitignore` file tells Git what files to ignore. +- The .gitignore file is a text file that tells Git which files to track and which to ignore in the repository. +- You can list specific files or folders to be ignored by Git, or you can include files that would normally be ignored. :::::::::::::::::::::::::::::::::::::::::::::::::: From ba8d0fa32c8399db5cbab23f8762f12922a4f2a0 Mon Sep 17 00:00:00 2001 From: Olexandr Konovalov <5751387+olexandr-konovalov@users.noreply.github.com> Date: Thu, 14 Nov 2024 09:08:40 +0000 Subject: [PATCH 3/9] Align indentation This should fix issues with incorrect rendering of translated lessons (https://github.com/ukrainian-carpentries/git-novice/issues/2) --- episodes/05-history.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/episodes/05-history.md b/episodes/05-history.md index 98388ab14c..f1fefc8011 100644 --- a/episodes/05-history.md +++ b/episodes/05-history.md @@ -406,18 +406,18 @@ $ cat ketchup.md # this will print the content of ketchup.md on screen ``` 1. ```output - ketchup enhances pasta dishes - ``` + ketchup enhances pasta dishes + ``` 2. ```output - I like tomatoes, therefore I like ketchup - ``` + I like tomatoes, therefore I like ketchup + ``` 3. ```output - I like tomatoes, therefore I like ketchup - ketchup enhances pasta dishes - ``` + I like tomatoes, therefore I like ketchup + ketchup enhances pasta dishes + ``` 4. ```output - Error because you have changed ketchup.md without committing the changes - ``` + Error because you have changed ketchup.md without committing the changes + ``` ::::::::::::::: solution From f8dab43a28296aeff72fbf266fa71cde8fca5824 Mon Sep 17 00:00:00 2001 From: Johannes Keyser Date: Fri, 15 Nov 2024 18:38:31 +0100 Subject: [PATCH 4/9] add a missing $ in bash listing --- episodes/04-changes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/episodes/04-changes.md b/episodes/04-changes.md index 9e29b8e075..460c7b1df8 100644 --- a/episodes/04-changes.md +++ b/episodes/04-changes.md @@ -586,7 +586,7 @@ Two important facts you should know about directories in Git. you can add all files in the directory at once by: ```bash - git add + $ git add ``` Try it for yourself: From 43eaac1d361d651bb266d67218de35b35a6ce7a5 Mon Sep 17 00:00:00 2001 From: Johannes Keyser Date: Mon, 18 Nov 2024 15:24:37 +0100 Subject: [PATCH 5/9] Fix sentence in quiz Understanding Workflow and History --- episodes/05-history.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/episodes/05-history.md b/episodes/05-history.md index f1fefc8011..69af92c9b4 100644 --- a/episodes/05-history.md +++ b/episodes/05-history.md @@ -426,8 +426,8 @@ $ cat ketchup.md # this will print the content of ketchup.md on screen The answer is 2. The changes to the file from the second `echo` command are only applied to the working copy, -The command `git add ketchup.md` places the current version of `ketchup.md` into the staging area. not the version in the staging area. +The command `git add ketchup.md` places the current version of `ketchup.md` into the staging area. So, when `git commit -m "My opinions about the red sauce"` is executed, the version of `ketchup.md` committed to the repository is the one from the staging area and From 00aaf4b3acc2393e18e6a3c5dddfb88ce641504b Mon Sep 17 00:00:00 2001 From: Johannes Keyser Date: Tue, 19 Nov 2024 08:39:33 +0100 Subject: [PATCH 6/9] add a missing $ in bash listing --- episodes/07-github.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/episodes/07-github.md b/episodes/07-github.md index a42c269676..045f5e3152 100644 --- a/episodes/07-github.md +++ b/episodes/07-github.md @@ -162,7 +162,7 @@ computers to access your account. We will run the list command to check what key pairs already exist on your computer. ```bash -ls -al ~/.ssh +$ 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. From bd925bcc2b7388e8a1e30dfc73230cc5f9997422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Matthias=20Sch=C3=A4fer?= Date: Mon, 9 Dec 2024 11:32:17 +0100 Subject: [PATCH 7/9] Rephrase sentence --- episodes/04-changes.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/episodes/04-changes.md b/episodes/04-changes.md index 460c7b1df8..ef39a9dcd6 100644 --- a/episodes/04-changes.md +++ b/episodes/04-changes.md @@ -27,8 +27,7 @@ You should be in the `recipes` directory. $ cd ~/Desktop/recipes ``` -Let's create a file called `guacamole.md` that contains the basic structure to -have a recipe. +Let's create a file called `guacamole.md` that contains the basic structure of a recipe. We'll use `nano` to edit the file; you can use whatever editor you like. In particular, this does not have to be the `core.editor` you set globally earlier. But remember, the steps to create create or edit a new file will depend on the editor you choose (it might not be nano). For a refresher on text editors, check out ["Which Editor?"](https://swcarpentry.github.io/shell-novice/03-create.html#which-editor) in [The Unix Shell](https://swcarpentry.github.io/shell-novice/) lesson. From e173d96e1b1aa9342a7ce0f5c7ed8d561399d61a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Matthias=20Sch=C3=A4fer?= Date: Mon, 9 Dec 2024 11:35:25 +0100 Subject: [PATCH 8/9] Remove duplicate word. --- episodes/04-changes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/episodes/04-changes.md b/episodes/04-changes.md index ef39a9dcd6..bed8c596bc 100644 --- a/episodes/04-changes.md +++ b/episodes/04-changes.md @@ -30,7 +30,7 @@ $ cd ~/Desktop/recipes Let's create a file called `guacamole.md` that contains the basic structure of a recipe. We'll use `nano` to edit the file; you can use whatever editor you like. -In particular, this does not have to be the `core.editor` you set globally earlier. But remember, the steps to create create or edit a new file will depend on the editor you choose (it might not be nano). For a refresher on text editors, check out ["Which Editor?"](https://swcarpentry.github.io/shell-novice/03-create.html#which-editor) in [The Unix Shell](https://swcarpentry.github.io/shell-novice/) lesson. +In particular, this does not have to be the `core.editor` you set globally earlier. But remember, the steps to create or edit a new file will depend on the editor you choose (it might not be nano). For a refresher on text editors, check out ["Which Editor?"](https://swcarpentry.github.io/shell-novice/03-create.html#which-editor) in [The Unix Shell](https://swcarpentry.github.io/shell-novice/) lesson. ```bash $ nano guacamole.md From 974789dc5b982accc5946cba13f1280c14042130 Mon Sep 17 00:00:00 2001 From: maneesha <829690+maneesha@users.noreply.github.com> Date: Mon, 9 Dec 2024 06:54:17 -0500 Subject: [PATCH 9/9] update CoC links in handbook --- CODE_OF_CONDUCT.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index f19b804953..4153dd42f8 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -9,5 +9,5 @@ Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by following our [reporting guidelines][coc-reporting]. -[coc-reporting]: https://docs.carpentries.org/topic_folders/policies/incident-reporting.html -[coc]: https://docs.carpentries.org/topic_folders/policies/code-of-conduct.html +[coc-reporting]: https://docs.carpentries.org/policies/coc/incident-reporting.html +[coc]: https://docs.carpentries.org/policies/coc/