Concept maps for all lessons

novice/git/01-backup.md

@@ -870,6 +870,12 @@ nothing to commit, working directory clean
 
 </div>
 
+#### Concept Map
+
+<img src="img/01-backup.gv.svg" alt="Git Concept Map" />
+
+#### Challenges
+
 <div class="challenge" markdown="1">
 Create a new Git repository on your computer called `bio`.
 Write a three-line biography for yourself in a file called `me.txt`,

novice/git/02-collab.md

@@ -264,6 +264,12 @@ to share work between different people and machines.
 
 </div>
 
+#### Concept Map
+
+<img src="img/02-collab.gv.svg" alt="Collaboration Concept Map" />
+
+#### Challenges
+
 <div class="challenge" markdown="1">
 Create a repository on GitHub,
 clone it,

novice/git/03-conflict.md

@@ -315,6 +315,12 @@ or find a way to divide the work up differently.
 
 </div>
 
+#### Concept Map
+
+<img src="img/03-conflict.gv.svg" alt="Conflict Concept Map" />
+
+#### Challenges
+
 <div class="challenge" markdown="1">
 Clone the repository created by your instructor.
 Add a new file to it,

novice/git/img/01-backup.gv

@@ -0,0 +1,13 @@
+graph G {
+  repository [style=bold];
+  commit [style=bold];
+  git -- repository;
+  repository -- commit;
+  commit -- "commit message";
+  commit -- identifier;
+  repository -- "staging area" -- "working files";
+  repository -- log -- commit;
+  git -- "git diff";
+  git -- "git checkout";
+  repository -- ".gitignore";
+}

novice/git/img/02-collab.gv

@@ -0,0 +1,9 @@
+digraph G {
+  local [shape=rect, label="local repository"];
+  otherlocal [shape=rect, label="collaborator's local repository"];
+  remote [shape=rect, label="remote repository"];
+  remote -> local [label="clone"];
+  remote -> local [label="pull"];
+  local -> remote [label="push"];
+  remote -> otherlocal [label="clone"];
+}

novice/git/img/03-conflict.gv

@@ -0,0 +1,9 @@
+digraph G {
+  local [shape=rect, label="local repository"];
+  otherlocal [shape=rect, label="collaborator's local repository"];
+  remote [shape=rect, label="remote repository"];
+  remote -> local [label="clone"];
+  remote -> local [label="pull"];
+  local -> remote [label="push"];
+  remote -> otherlocal [label="clone"];
+}

novice/shell/00-intro.md

@@ -135,3 +135,7 @@ being able to drive them is becoming a necessary skill.
     and how cryptic its commands and operation can be.
 
 </div>
+
+#### Concept Map
+
+<img src="img/00-intro.gv.svg" alt="Intro Concept Map" />

novice/shell/01-filedir.md

@@ -230,6 +230,10 @@ rather than from the root of the file system.
 > most people use them interchangeably or inconsistently,
 > so we will too.
 
+#### Concept Map
+
+<img src="img/01-filedir-command.gv.svg" alt="Command Concept Map" />
+
 If we run `ls -F /data` (*with* a leading slash) we get a different answer,
 because `/data` is an [absolute path](../../gloss.html#absolute-path):
 
@@ -469,6 +473,12 @@ and we will see it in many other tools as we go on.
 
 </div>
 
+#### Concept Map
+
+<img src="img/01-filedir-path.gv.svg" alt="Path Concept Map" />
+
+#### Challenges
+
 <img src="img/filesystem-challenge.svg" alt="Filesystem for Challenge Questions" />
 
 <div class="challenge" markdown="1">

novice/shell/02-create.md

@@ -366,6 +366,12 @@ thesis/quotations.txt
 
 </div>
 
+#### Concept Map
+
+<img src="img/02-create.gv.svg" alt="File Operation Concept Map" />
+
+#### Challenges
+
 <div class="challenge" markdown="1">
 What is the output of the closing `ls` command in the sequence shown below?
 

novice/shell/03-pipefilter.md

@@ -398,6 +398,16 @@ so this matches all the valid data files she has.
 
 </div>
 
+#### Wildcards Concept Map
+
+<img src="img/03-pipefilter-wildcards.gv.svg" alt="Wildcards Concept Map" />
+
+#### Pipes and Filters Concept Map
+
+<img src="img/03-pipefilter.gv.svg" alt="Pipes and Filters Concept Map" />
+
+#### Challenges
+
 <div class="challenge" markdown="1">
 If we run `sort` on this file:
 

novice/shell/04-loop.md

@@ -411,6 +411,12 @@ so she decides to get some coffee and catch up on her reading.
 
 </div>
 
+#### Concept Map
+
+<img src="img/04-loop.gv.svg" alt="Loop Concept Map" />
+
+#### Challenges
+
 <div class="challenge" markdown="1">
 Suppose that `ls` initially displays:
 

novice/shell/05-script.md

@@ -294,6 +294,9 @@ we have a completely accurate record of how we created that figure.
 > history | tail -5
 > history | tail -5 | colrm 1 7
 > ~~~
+>
+> The `colrm` may not be installed on every computer, and specifically on Windows computers.
+> `cut` and `awk` are two other tools that can achieve a similar purpose.
 
 In practice, most people develop shell scripts by running commands at the shell prompt a few times
 to make sure they're doing the right thing,
@@ -382,6 +385,12 @@ Of course, this introduces another tradeoff between flexibility and complexity.
 
 </div>
 
+#### Concept Map
+
+<img src="img/05-script.gv.svg" alt="Script Concept Map" />
+
+#### Challenges
+
 <div class="challenge" markdown="1">
 Leah has several hundred data files, each of which is formatted like this: