From 6854f5e9448741c105e88752e8252ae82c6856b6 Mon Sep 17 00:00:00 2001 From: Dean Karres <51006466+karres-illinois@users.noreply.github.com> Date: Mon, 28 Feb 2022 20:01:19 -0600 Subject: [PATCH 1/4] Offering more info on "less" from Issue #7 00-man-pages #7 : suggesting a change from referring to "more" to "less". Suggesting small into paragraph on man's user of a pager as the into to "less". This is part of my Instructor Checkout process --- _episodes/01-man-pages.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/_episodes/01-man-pages.md b/_episodes/01-man-pages.md index 91ccbba..00eab1e 100644 --- a/_episodes/01-man-pages.md +++ b/_episodes/01-man-pages.md @@ -27,9 +27,13 @@ $ man cp The output displayed is referred to as the "man page". -The man page will be displayed in the default file viewer for our shell, -which usually a program called `more`. -When `more` displays a colon ':', +Most man pages contain much more information than can fit in one terminal screen. +To help facilitate reading, the `man` command tries to use a "pager" to move and search +through the information screenfull by screenfull. The most common pager is called `less`. +Detailed information is available using `man less`. `less` is typically the default +pager for Unix systems and other tools may use it for output paging as well. + +When `less` displays a colon ':', we can press the space bar to get the next page, the letter 'h' to get help, or the letter 'q' to quit. @@ -122,7 +126,7 @@ then expands on the possible options one by one: If we want to skip ahead to the option you're interested in, we can search for it using the slash key '/'. (This isn't part of the `man` command: -it's a feature of `more`.) +it's a feature of `less`.) For example, to find out about `-t`, we can type `/-t` and press return. From abed7dd8d9fc83fd5c8ffc71cde85bf632fd8f38 Mon Sep 17 00:00:00 2001 From: Hamish Starling Date: Tue, 13 Sep 2022 13:14:56 +0100 Subject: [PATCH 2/4] Update 10_awk.md --- _episodes/10_awk.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_episodes/10_awk.md b/_episodes/10_awk.md index 411cde3..9671e21 100644 --- a/_episodes/10_awk.md +++ b/_episodes/10_awk.md @@ -42,7 +42,7 @@ Example: $ awk '{print $0}' example.txt ~~~ -This command has the same output of "cat": it prints each line from the example.fasta +This command has the same output of "cat": it prints each line from the example.txt file. The structure of the instruction is the following: From 8c55a740a3ce5a75e5dae9bec4263da94cccae76 Mon Sep 17 00:00:00 2001 From: Florian Rathgeber Date: Tue, 24 Jan 2023 23:11:06 +0100 Subject: [PATCH 3/4] Fix typo in link to reference, closes #76 --- _episodes/06-job-control.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_episodes/06-job-control.md b/_episodes/06-job-control.md index 9d14743..da3beba 100644 --- a/_episodes/06-job-control.md +++ b/_episodes/06-job-control.md @@ -20,7 +20,7 @@ The shell-novice lesson explained how we run programs or scripts from the shell's command line. We'll now take a look at how to control programs *once they're running*. This -is called [job control]({ page.root }}/reference/{{ site.index }}#job-control), and while it's less +is called [job control]({{ page.root }}/reference/{{ site.index }}#job-control), and while it's less important today than it was back in the Dark Ages, it is coming back into its own as more people begin to leverage the power of computer networks. From ae5f976bb55c473c1287956d2ea3158bc86217b7 Mon Sep 17 00:00:00 2001 From: Mihir Manna <99997148+mihirmanna@users.noreply.github.com> Date: Mon, 19 Jun 2023 16:43:17 -0500 Subject: [PATCH 4/4] Fix typos --- _episodes/09-commandsubstitution.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_episodes/09-commandsubstitution.md b/_episodes/09-commandsubstitution.md index 0e74677..9e3b1ca 100644 --- a/_episodes/09-commandsubstitution.md +++ b/_episodes/09-commandsubstitution.md @@ -18,18 +18,18 @@ Often, this involves doing the same thing to a whole set of files, e.g.: ~~~{.bash} $ cd data/pdb $ mkdir sorted -$ for file in cyclo*.pdb; do +$ for file in *cyclo*.pdb; do > sort $file > sorted/sorted-$file > done ~~~ In this example, the shell generates for us the list of things to loop over, using the wildcard mechanism we saw in the *Pipes and Filters* topic. This results in the -`cyclo*.pdf` being replaced with `cyclobutane.pdb cyclohexanol.pdb +`*cyclo*.pdb` being replaced with `cyclobutane.pdb cyclohexanol.pdb cyclopropane.pdb ethylcyclohexane.pdb` before the loop starts. Another example is a so-called *parameter sweep*, where you run the same program a number of times -with different arguments. Here is a fictitional example: +with different arguments. Here is a fictitious example: ~~~{.bash} $ for cutoff in 0.001 0.01 0.05; do