Skip to content

Commit

Permalink
differences for PR #252
Browse files Browse the repository at this point in the history
  • Loading branch information
actions-user committed Nov 29, 2023
1 parent e00fea1 commit df54c57
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 10 deletions.
6 changes: 3 additions & 3 deletions 02-navigating-the-filesystem.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@ drwx------+ 3 riley staff 102 Jul 16 11:30 Pictures
drwxr-xr-x+ 5 riley staff 170 Jul 16 11:30 Public
```

In everyday usage we are more used to units of measurement like kilobytes, megabytes, and gigabytes.
Luckily, there's another flag `-h` that when used with the -l option, use unit suffixes:
In everyday usage we are more accustomed to units of measurement like kilobytes, megabytes, and gigabytes.
Luckily, there's another flag `-h` that when used with the -l option, prints unit suffixes:
Byte, Kilobyte, Megabyte, Gigabyte, Terabyte and Petabyte in order to reduce the
number of digits to three or less using base 2 for sizes.
number of digits to three or fewer using base 2 for sizes.

Now `ls -h` won't work on its own. When we want to combine two flags,
we can just run them together. So, by typing `ls -lh` and pressing
Expand Down
3 changes: 1 addition & 2 deletions 03-working-with-files-and-folders.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ documents (Word or OpenOffice), browsing the web, editing images, etc. But if we
wanted to make the same crop on hundreds of images, say, the pages of a scanned book,
then we could automate that cropping work by using shell commands.

Before getting started, we will use `ls` to verify where we are. Using `ls` periodically
to view your options is useful to orient oneself.
Before getting started, we will use `ls` to list the contents of our current directory. Using `ls` periodically to view your options is useful to orient oneself.

```bash
$ ls
Expand Down
2 changes: 1 addition & 1 deletion 05-counting-mining.md
Original file line number Diff line number Diff line change
Expand Up @@ -849,7 +849,7 @@ We will now use a loop to automate the counting of certain words within a docume
$ mv pg514.txt littlewomen.txt
```

This renames the file to something easier to type.
This renames the file to something easier to remember.

Now let's create our loop. In the loop, we will ask the computer to go through the text, looking for each girl's name,
and count the number of times it appears. The results will print to the screen.
Expand Down
2 changes: 2 additions & 0 deletions instructor-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,8 @@ And please also make use of our [Software Carpentry Windows Installer][windows-i
Have them create the example directory for the shell exercises there
so that they can find it easily and watch it evolve.

- On Windows, Microsoft OneDrive may appear in the home directory list. Desktop is often found inside the OneDrive directory.

***

[shebang]: https://www.in-ulm.de/~mascheck/various/shebang/
Expand Down
8 changes: 4 additions & 4 deletions md5sum.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"contribute.md" "bff656c223950dd9640e88b0f45d4fa2" "site/built/contribute.md" "2023-08-29"
"index.md" "85087a3bf006430ecfd7332472cf5174" "site/built/index.md" "2023-09-07"
"episodes/01-intro-shell.md" "4248552de8d7fe3f30930e93acef8436" "site/built/01-intro-shell.md" "2023-05-08"
"episodes/02-navigating-the-filesystem.md" "b8d7414c2a1677019bc514a6cde16829" "site/built/02-navigating-the-filesystem.md" "2023-09-06"
"episodes/03-working-with-files-and-folders.md" "8a1e4c89ef6df8a680bf74306f63b765" "site/built/03-working-with-files-and-folders.md" "2023-05-08"
"episodes/02-navigating-the-filesystem.md" "0bc2f099a9ad64771a2426436b4f61e7" "site/built/02-navigating-the-filesystem.md" "2023-11-29"
"episodes/03-working-with-files-and-folders.md" "da266b0ae41058134a851c81d42b2754" "site/built/03-working-with-files-and-folders.md" "2023-11-29"
"episodes/04-loops.md" "09e8ad0335d09183e7443325cac3c9bf" "site/built/04-loops.md" "2023-05-08"
"episodes/05-counting-mining.md" "b12568e8471f77673df46273782c46a3" "site/built/05-counting-mining.md" "2023-08-29"
"episodes/05-counting-mining.md" "a7519ce57f30c5d004c578ec225154e1" "site/built/05-counting-mining.md" "2023-11-29"
"episodes/06-free-text.md" "143b9518631bcf5b114d1f432e5a9c25" "site/built/06-free-text.md" "2023-05-08"
"instructors/instructor-notes.md" "c5c4f2c737b897609b8081a9193f14a2" "site/built/instructor-notes.md" "2023-05-08"
"instructors/instructor-notes.md" "b02e8b9d9a5f7b98a3326845bd2ade10" "site/built/instructor-notes.md" "2023-11-29"
"learners/discuss.md" "498cf8840b7e5bb0897f7c15af83c052" "site/built/discuss.md" "2023-08-29"
"learners/reference.md" "d4c4195030dad8f532e210812c9f90f2" "site/built/reference.md" "2023-09-08"
"learners/setup.md" "26c8be5e75d59327fb02fd3564eb834b" "site/built/setup.md" "2023-09-07"
Expand Down

0 comments on commit df54c57

Please sign in to comment.