Merge branch 'swcarpentry:main' into main

episodes/02-filedir.md

@@ -263,6 +263,18 @@ Mandatory arguments to long options are mandatory for short options, too.
 
 :::::::::::::::::::::::::::::::::::::::::  callout
 
+### When to use short or long options
+When options exist as both short and long options:
+
+- Use the short option when typing commands directly into the
+   shell to minimize keystrokes and get your task done faster.
+- Use the long option in scripts to provide clarity.
+  It will be read many times and typed once.
+
+::::::::::::::::::::::::::::::::::::::::::::::::::
+
+:::::::::::::::::::::::::::::::::::::::::  callout
+
 ## Unsupported command-line options
 
 If you try to use an option that is not supported, `ls` and other commands
@@ -833,18 +845,6 @@ Library/              Users/
 Network/              Volumes/
 ```
 
-
-:::::::::::::::::::::::::::::::::::::::::  callout
-### When to use short or long options
-When options exist as both short and long options:
-
-- Use the short option when typing commands directly into the
-   shell to minimize keystrokes and get your task done faster.
-- Use the long option in scripts to provide clarity.
-  It will be read many times and typed once.
-
-::::::::::::::::::::::::::::::::::::::::::::::::::
-
 ### Nelle's Pipeline: Organizing Files
 
 Knowing this much about files and directories,

episodes/03-create.md

@@ -147,7 +147,8 @@ There are special characters that can cause your command to not work as
 expected and can even result in data loss.
 
 If you need to refer to names of files or directories that have spaces
-or other special characters, you should surround the name in quotes (`""`).
+or other special characters, you should surround the name in single
+[quotes](https://www.gnu.org/software/bash/manual/html_node/Quoting.html) (`''`).
 
 ::::::::::::::::::::::::::::::::::::::::::::::::::
 
@@ -322,7 +323,7 @@ Naming a PNG image of a whale as `whale.mp3` doesn't somehow
 magically turn it into a recording of whale song, though it *might*
 cause the operating system to associate the file with a music player
 program. In this case, if someone double-clicked `whale.mp3` in a file
-explorer program,the music player will automatically (and erroneously)
+explorer program, the music player will automatically (and erroneously)
 attempt to open the `whale.mp3` file.
 
 ::::::::::::::::::::::::::::::::::::::::::::::::::

episodes/04-pipefilter.md

@@ -6,16 +6,17 @@ exercises: 10
 
 ::::::::::::::::::::::::::::::::::::::: objectives
 
+- Explain the advantage of linking commands with pipes and filters.
+- Combine sequences of commands to get new output
 - Redirect a command's output to a file.
-- Construct command pipelines with two or more stages.
 - Explain what usually happens if a program or pipeline isn't given any input to process.
-- Explain the advantage of linking commands with pipes and filters.
 
 ::::::::::::::::::::::::::::::::::::::::::::::::::
 
 :::::::::::::::::::::::::::::::::::::::: questions
 
-- How can I combine existing commands to do new things?
+- How can I combine existing commands to produce a desired output?
+- How can I show only part of the output? 
 
 ::::::::::::::::::::::::::::::::::::::::::::::::::