From 6114b0a421a05bb34f121fd5d20645fdeec93acb Mon Sep 17 00:00:00 2001 From: Dave Kerr Date: Fri, 27 Nov 2020 23:37:27 +0800 Subject: [PATCH] fix: grammar and typos for chapter 2 --- makefile | 2 +- .../2-navigating-your-system/_index.md | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/makefile b/makefile index 4bc97759..b04a8dbc 100644 --- a/makefile +++ b/makefile @@ -22,7 +22,7 @@ structure: # Create the statistics document. statistics: - ./scripts/wordcount.sh ./website/content/docs/section*/**/_index.md > statistics.csv + ./scripts/wordcount.sh ./website/content/docs/*/**/_index.md > statistics.csv diff --git a/website/content/docs/part-1-transitioning-to-the-shell/2-navigating-your-system/_index.md b/website/content/docs/part-1-transitioning-to-the-shell/2-navigating-your-system/_index.md index 2d674447..9a1b6529 100644 --- a/website/content/docs/part-1-transitioning-to-the-shell/2-navigating-your-system/_index.md +++ b/website/content/docs/part-1-transitioning-to-the-shell/2-navigating-your-system/_index.md @@ -26,7 +26,7 @@ You should see something like this: When we open a folder in a graphical user interface, we are always viewing the contents of a folder, or directory. When you open the shell, the same applies - we are always sitting in a specific directory. -The `pwd` command is the _Print Working Directory_ command. It shows the full path of the directory that you are in. You might not use this command very often, as in many shells you can see the directory you are in (if you cannot see this in your shell, you'll find out how to do this in the [Chapter 18](#TODO)). +The `pwd` command is the _Print Working Directory_ command. It shows the full path of the directory that you are in. You might not use this command very often, as in many shells you can see the directory you are in (if you cannot see this in your shell, you'll find out how to do this in [Chapter 18](#TODO)). There's one more way to find the working directory. It is stored in an _Environment Variable_ called `PWD`. @@ -56,7 +56,7 @@ You should see something like this: Screenshot: ls -The `ls` command is the _List Directory Contents_ command. It will show the contents of a directory. If we don't give it any parameters it will show the contents of the current directory. +The `ls` command is the _List Directory Contents_ command. It will show the contents of a directory. If we don't give it any parameters, it will show the contents of the current directory. There are a lot of options for the `ls` command. In [Chapter 5](#TODO) we'll see how to find out the options for commands. For now, let's look at one of the most common options `-l`. This shows the contents as a list: @@ -89,7 +89,7 @@ On my system, we'll see the following output: Screenshot: cd -The `cd` command is the _Change Directory_ command. You might see a pattern here - shell commands often are very short (to make it easier to type them quickly), and are often made up of the first letters of the description of the command (`pwd` for _Print Working Directory_, `cd` for _Change Directory_). +The `cd` command is the _Change Directory_ command. You might see a pattern here - shell commands often are very short (to make it easier to type them quickly) and are often made up of the first letters of the description of the command (`pwd` for _Print Working Directory_, `cd` for _Change Directory_). Now that you know how the `cd` command works, you will be able to move around to different folders. At this stage, it's important to talk a little bit about how _paths_ work in systems. @@ -175,7 +175,7 @@ And we'll see this: There is one more special part of the file system we have to know about. That is the _Home Directory_. In Linux-like systems every user has their own personal directory where they can keep their files and folders. -This directory can always be accessed through the `~` character. For example, no matter where I am in the system I can run the following command to move to my home directory and show the contents: +This directory can always be accessed through the `~` character. For example, no matter where I am in the system, I can run the following command to move to my home directory and show the contents: ```sh cd ~ @@ -224,11 +224,11 @@ popd After I've checked my downloads, I can run `popd` to go back to where I was: -Screenshot: echo home +Screenshot: pushd and popd -The `pushd` command 'pushes' a new working directory onto a stack - moving you there. The `popd` command 'pops' the working directory off the top of the stack. A stack is a structure often used in computers, we can actually push lots of different files to the working directory stack. +The `pushd` command 'pushes' a new working directory onto a stack - moving you there. The `popd` command 'pops' the working directory off the top of the stack. A stack is a structure often used in computers; we can actually push lots of different files to the working directory stack. -Why is it called a stack? Well the reason is that if we were to visualise the structure, it might look like a stack of plates or similar. Here's how `pushd` and `popd` would look if we were to visualise it: +Why is it called a stack? Well, the reason is that if we were to visualise the structure, it might look like a stack of plates or similar. Here's how `pushd` and `popd` would look if we were to visualise it: Screenshot: pushd popd stack @@ -254,7 +254,7 @@ In this chapter we introduced the following: - The `pwd` (_print working directory_) command shows the current working directory - The `$PWD` environment variable holds the current working directory -- The `ls` (_list) command shows the contents of the current directory or a given directory +- The `ls` (_list_) command shows the contents of the current directory or a given directory - The `ls -l` command shows the contents of the current directory as list - The `cd` (_change directory_) changes the current working directory - Absolute paths are paths which specify the exact location of a file or folder...