Skip to content

Commit eccf94b

Browse files
authored
Merge pull request #194 from alex-ball/patch-124
Expand on editing index.md in Episode 2
2 parents 8459fef + 6e6e1da commit eccf94b

File tree

1 file changed

+27
-6
lines changed

1 file changed

+27
-6
lines changed

episodes/02-getting-started.md

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ Vi and Vim are popular editors for users of the BASH shell. If you will be using
9595
::::::::::::::::::::::::::::::::::::::::::::::::::
9696

9797
Any text editor can be made default by adding the correct file path and command line options (see [GitHub help](https://help.github.com/articles/associating-text-editors-with-git/)).
98-
However, the simplest `core.editor` value is `"nano -w"` on Mac, Windows, and Linux.
98+
However, the simplest `core.editor` value is `"nano -w"` on Mac, Windows, and Linux, which will run the Nano text editor directly in your shell.
9999

100100
For example:
101101

@@ -242,9 +242,30 @@ Changes to be committed:
242242
If we are using colourised output, we will see that the filename has changed colour (from red to green). Git also tells us that there
243243
is a new file to be committed but, before we do that, let's add some text to the file.
244244

245-
We will open the file `index.md` with any text editor we have at hand (e.g. Notepad on Windows or TextEdit on Mac OSX) and enter `# Hello, world!`. The
246-
hash character is one way of writing a header with Markdown. Now, let's save the file within the text editor and check if Git
247-
has spotted the changes.
245+
We will open the file `index.md` with a text editor. If you set Nano as your `core.editor` value, this would be a good time to try it out:
246+
247+
```bash
248+
nano -w index.md
249+
```
250+
251+
If you don't want to try Nano, use whatever text editor you feel comfortable with (e.g. Notepad on Windows or TextEdit on macOS) to open the file.
252+
253+
When you have the file open, enter `# Hello, world!`. The hash character is one way of writing a header with Markdown. Then save the file and close the text editor.
254+
255+
::::::::::::::::::: instructor
256+
257+
#### Demonstrating how to edit a text file
258+
259+
When showing how to edit `index.md` for the first time, Nano is the most convenient editor to use – you don't have to leave the shell and it should work for everyone – but few learners will be fully confident with it. Take them step-by-step through one of the two ways of saving and closing the file:
260+
261+
- **Ctrl + X** to close the file; **Y** to save the file; **Enter** to keep the same filename.
262+
- **Ctrl + O** to save the file; **Enter** to keep the same filename; **Ctrl + X** to close the file.
263+
264+
You could also keep a file manager window open (e.g. File Explorer, Finder, Files/Nautilus, Dolphin) to demonstrate locating the file and opening it in a suitable GUI text editor. Look out for learners who need help with this.
265+
266+
::::::::::::::::::::::::::::::
267+
268+
Now, let's check if Git has spotted the changes:
248269

249270
```bash
250271
$ git status
@@ -289,11 +310,11 @@ $ git commit -m 'Add index.md'
289310
create mode 100644 index.md
290311
```
291312

292-
We can see that one file has changed and that we made one insertion, which was a line with the text '#Hello, world!'.
313+
We can see that one file has changed and that we made one insertion, which was a line with the text '# Hello, world!'.
293314
We can
294315
also see the commit message 'Add index.md', which we added by using the `-m` flag after `git commit`.
295316
The commit message is used to record a short, descriptive, and specific summary of what we did to help us remember later on without having to look at the actual changes.
296-
If we just run `git commit` without the `-m` option, Git will launch nano (or whatever other editor we configured as `core.editor`)
317+
If we just run `git commit` without the `-m` option, Git will launch Nano (or whatever other editor we configured as `core.editor`)
297318
so that we can write a longer message.
298319

299320
Having made a commit, we now have a permanent record of what was changed,

0 commit comments

Comments
 (0)