Merge branch 'gh-pages' into thw-indentedcblock

Conflicts:
	lessons/thw-python/flow-control/python_flow_control.ipynb
	lessons/thw-python/vars-types/variables.ipynb

README.md

@@ -261,9 +261,7 @@ must define the following values in its YAML header:
     that should go in the main body of your page.
 *   `instructor` is a comma-separated list of instructor names.
     This *must* be enclosed in square brackets, as in
-    `["Alan Turing","Grace Hopper"]`,
-    and there must *not* be spaces after the commas
-    (really: believe it or not, they can cause translation to fail).
+    `["Alan Turing","Grace Hopper"]`
 *   `contact` is the contact email address to use for your bootcamp.
 
 Include Files
@@ -366,7 +364,8 @@ To send them to us as a pull request:
 
 ![Alt text](img/readme/step3.png)
 
-3.  Isolate the changes you want to share in a branch and push them to GitHub:
+3.  Isolate the changes you want to share in a branch and push them to GitHub
+    (you should have added `swcarpentry` as a remote in Step 3 of [Getting Started](#getting-started)):
 
         git fetch swcarpentry
         git checkout -t swcarpentry/gh-pages -b improvements

_includes/bootcamps/eventbrite.html

@@ -1,16 +1,4 @@
-{% if page.eventbrite and page.venue and page.humandate %}
-<div style='width: 100%; text-align: left;'>
-  <p><iframe frameborder='0' height='192' marginheight='5' marginwidth='5' scrolling='auto' src='http://www.eventbrite.com/tickets-external?eid={{page.eventbrite}}&amp;ref=etckt' width='100%' /></p>
-  <div style='font-family: Helvetica, Arial; font-size: 10px; padding: 5px 0 5px; margin: 2px; width: 100%; text-align: left;'>
-    <a href='http://www.eventbrite.com/r/etckt' style='color: #ddd; text-decoration: none;' target='_blank'>Event Registration Online</a>
-    <span style='color: #ddd;'> for </span>
-    <a href='http://www.eventbrite.com/event/{{page.eventbrite}}?ref=etckt' style='color: #ddd; text-decoration: none;' target='_blank'>
-      Software Carpentry Boot Camp: {{page.venue}}/{{page.humandate}}
-    </a>
-    <span style='color: #ddd;'> powered by </span>
-    <a href='http://www.eventbrite.com?ref=etckt' style='color: #ddd; text-decoration: none;' target='_blank'>Eventbrite</a></div>
-  </div>
-{% else %}
-<p><strong>Error: EventBrite key, venue, and/or human-readaable date not defined.</strong></p>
+{% if page.eventbrite %}
+<iframe src="http://www.eventbrite.com/tickets-external?eid=9459779455&ref=etckt" frameborder="0" width="100%" scrolling="auto"></iframe>
 {% endif %}
 

_includes/guide-invperc/assembly/title.md

@@ -0,0 +1 @@
+Assembly

_includes/guide-invperc/grid/challenges.html

@@ -1,5 +1,5 @@
 <div id="s:invperc:grid:challenges" class="challenges">
   <ol>
-    <li>{% include invperc/grid/challenges/map-grid.html %}</li>
+    <li>{% include guide-invperc/grid/challenges/map-grid.html %}</li>
   </ol>
 </div>

_includes/guide-invperc/test/title.md

@@ -0,0 +1 @@
+Test

_includes/guide-shell/create/keypoints.html

@@ -6,6 +6,7 @@
     <li><code>cp <em>old</em> <em>new</em></code> copies a file.</li>
     <li><code>mv <em>old</em> <em>new</em></code> moves (renames) a file or directory.</li>
     <li><code>nano</code> is a very simple text editor&mdash;please use something else for real work.</li>
+    <li><code>touch <em>path</em></code> creates an empty file if it doesn't already exist.</li>
     <li><code>rm <em>path</em></code> removes (deletes) a file.</li>
     <li><code>rmdir <em>path</em></code> removes (deletes) an empty directory.</li>
   </ul>

_includes/guide-shell/create/lesson.html

@@ -77,7 +77,7 @@
   </p>
 
   <figure id="f:nano">
-    <img src="nano.png" alt="The Nano Editor" />
+    <img src="{{page.root}}/img/lessons/swc-shell/nano.png" alt="The Nano Editor" />
     <figcaption>Figure 9: The Nano Editor</figcaption>
   </figure>
 
@@ -90,7 +90,7 @@
   </p>
 
   <figure id="f:nano_quotation">
-    <img src="nano_quotation.png" alt="Nano in Action" />
+    <img src="{{page.root}}/img/lessons/swc-shell/nano_quotation.png" alt="Nano in Action" />
     <figcaption>Figure 10: Nano in Action</figcaption>
   </figure>
 
@@ -140,6 +140,50 @@ <h3>Which Editor?</h3>
 $
 </pre>
 
+  <p>
+    If we just want to quickly create a file with no content, we
+    can use the command <code>touch</code>.
+  </p>
+
+<pre>
+$ <span class="in">touch draft_empty.txt</span>
+$ <span class="in">ls</span>
+<span class="out">draft.txt   draft_empty.txt</span>
+$
+</pre>
+
+  <p>
+    The <code>touch</code> command has allowed us to create a file
+    without leaving the command line.  As with text editors like 
+    <code>nano</code>, <code>touch</code> will create the file in
+    your current working directory.
+  </p>
+
+  <p>
+    If we <code>touch</code> a file that already exists, the time of
+    last modification for the file is updated to the present time,
+    but the file is otherwise unaltered.  We can demonstrate this by
+    running <code>ls</code> with the <code>-l</code> flag to give a
+    long listing of files in the
+    current directory which includes information about the date and
+    time of last modification.
+  </p>
+
+<pre>
+$ <span class="in">ls -l</span>
+<span class="out">-rw-r--r-- 1 username username 512 Oct  9 15:46 draft.txt</span>
+<span class="out">-rw-r--r-- 1 username username   0 Oct  9 15:47 draft_empty.txt</span>
+$ <span class="in">touch draft.txt</span>
+$ <span class="in">ls -l</span>
+<span class="out">-rw-r--r-- 1 username username 512 Oct  9 15:48 draft.txt</span>
+<span class="out">-rw-r--r-- 1 username username   0 Oct  9 15:47 draft_empty.txt</span>
+</pre>
+
+  <p>
+    Note how the modification time of <code>draft.txt</code> changes
+    after we <code>touch</code> it.
+  </p>
+
   <p>
     We can run <code>ls</code> with the <code>-s</code> flag
     (for "size")
@@ -148,7 +192,7 @@ <h3>Which Editor?</h3>
 
 <pre>
 $ <span class="in">ls -s</span>
-<span class="out">   1  draft.txt</span>
+<span class="out">   1  draft.txt        0  draft_empty.txt</span>
 $
 </pre>
 
@@ -162,18 +206,18 @@ <h3>Which Editor?</h3>
 
 <pre>
 $ <span class="in">ls -s -h</span>
-<span class="out"> 512  draft.txt</span>
+<span class="out"> 512  draft.txt        0  draft_empty.txt</span>
 $
 </pre>
 
   <p class="continue">
-    Here, 512 is the number of bytes in the file.
+    Here, 512 is the number of bytes in the <code>draft.txt</code> file.
     This is more than we actually typed in because
     the smallest unit of storage on the disk is typically a block of 512 bytes.
   </p>
 
   <p>
-    Let's tidy up by running <code>rm draft.txt</code>:
+    Let's start tidying up by running <code>rm draft.txt</code>:
   </p>
 
 <pre>
@@ -183,9 +227,28 @@ <h3>Which Editor?</h3>
 
   <p class="continue">
     This command removes files ("rm" is short for "remove").
-    If we now run <code>ls</code> again,
-    its output is empty once more,
-    which tells us that our file is gone:
+    If we run <code>ls</code>, only the <code>draft_empty.txt</code>
+    file remains:
+  </p>
+
+<pre>
+$ <span class="in">ls</span>
+<span class="out">draft_empty.txt</span>
+$
+</pre>
+
+  <p>
+    Now we'll finish cleaning up by running <code>rm draft_empty.txt</code>:
+  </p>
+
+<pre>
+$ <span class="in">rm draft_empty.txt</span>
+$
+</pre>
+
+  <p>
+    If we run <code>ls</code> again, its output is empty,
+    which tells us that both of our files are gone:
   </p>
 
 <pre>
@@ -209,14 +272,14 @@ <h3>Deleting Is Forever</h3>
   </div>
 
   <p>
-    Let's re-create that file
+    Let's re-create <code>draft.txt</code> as an empty file,
     and then move up one directory to <code>/users/vlad</code> using <code>cd&nbsp;..</code>:
   </p>
 
 <pre>
 $ <span class="in">pwd</span>
 <span class="out">/users/vlad/thesis</span>
-$ <span class="in">nano draft.txt</span>
+$ <span class="in">touch draft.txt</span>
 $ <span class="in">ls</span>
 <span class="out">draft.txt</span>
 $ <span class="in">cd ..</span>
@@ -300,16 +363,16 @@ <h3>With Great Power Comes Great Responsibility</h3>
 
   <p>
     Let's create that directory and file one more time.
-    (Note that this time we're running <code>nano</code> with the path <code>thesis/draft.txt</code>,
+    (Note that this time we're running <code>touch</code> with the path <code>thesis/draft.txt</code>,
     rather than going into the <code>thesis</code> directory
-    and running <code>nano</code> on <code>draft.txt</code> there.)
+    and running <code>touch</code> on <code>draft.txt</code> there.)
   </p>
 
 <pre>
 $ <span class="in">pwd</span>
 <span class="out">/users/vlad/thesis</span>
 $ <span class="in">mkdir thesis</span>
-$ <span class="in">nano thesis/draft.txt</span>
+$ <span class="in">touch thesis/draft.txt</span>
 $ <span class="in">ls thesis</span>
 <span class="out">draft.txt</span>
 $

_includes/guide-shell/filedir/challenges.html

@@ -6,7 +6,7 @@
   </p>
 
   <figure id="f:filedir_challenge">
-    <img src="filedir_challenge.png" alt="File System Layout for Challenge Questions" />
+    <img src="{{page.root}}/img/lessons/swc-shell/filedir_challenge.png" alt="File System Layout for Challenge Questions" />
     <figcaption>Figure 8: File System Layout for Challenge Questions</figcaption>
   </figure>
 

_includes/guide-shell/filedir/lesson.html

@@ -116,7 +116,7 @@ <h3>Alphabet Soup</h3>
   </p>
 
   <figure id="f:filesystem">
-    <img src="filesystem.png" alt="File System" />
+    <img src="{{page.root}}/img/lessons/swc-shell/filesystem.png" alt="File System" />
     <figcaption>Figure 4: File System</figcaption>
   </figure>
 
@@ -147,7 +147,7 @@ <h3>Alphabet Soup</h3>
   </p>
 
   <figure id="f:home_directories">
-    <img src="home_directories.png" alt="Home Directories" />
+    <img src="{{page.root}}/img/lessons/swc-shell/home_directories.png" alt="Home Directories" />
     <figcaption>Figure 5: Home Directories</figcaption>
   </figure>
 
@@ -189,7 +189,7 @@ <h3>Alphabet Soup</h3>
   </p>
 
   <figure id="f:vlad_homedir">
-    <img src="vlad_homedir.png" alt="Vlad's Home Directory" />
+    <img src="{{page.root}}/img/lessons/swc-shell/vlad_homedir.png" alt="Vlad's Home Directory" />
     <figcaption>Figure 6: Vlad's Home Directory</figcaption>
   </figure>
 
@@ -261,7 +261,7 @@ <h3>What's In A Name?</h3>
   </p>
 
   <figure id="f:relative_path">
-    <img src="absolute_relative_path.png" alt="Absolute and Relative Paths" />
+    <img src="{{page.root}}/img/lessons/swc-shell/absolute_relative_path.png" alt="Absolute and Relative Paths" />
     <figcaption>Figure 7: Absolute and Relative Paths</figcaption>
   </figure>
 

_includes/guide-shell/find/lesson.html

@@ -1,7 +1,7 @@
 <div id="s:shell:find:lesson" class="lesson">
 
   <figure id="f:google_vs_grep">
-    <img src="google_vs_grep.png" alt="Google vs. Grep" />
+    <img src="{{page.root}}/img/lessons/swc-shell/google_vs_grep.png" alt="Google vs. Grep" />
     <figcaption>Figure 17: Google vs. Grep</figcaption>
   </figure>
 
@@ -210,7 +210,7 @@ <h3>Wildcards</h3>
   </p>
 
   <figure id="f:find_file_tree">
-    <img src="find_file_tree.png" alt="Sample Files and Directories" />
+    <img src="{{page.root}}/img/lessons/swc-shell/find_file_tree.png" alt="Sample Files and Directories" />
     <figcaption>Figure 18: Sample Files and Directories</figcaption>
   </figure>
 

_includes/guide-shell/intro/lesson.html

@@ -33,7 +33,7 @@
   </p>
 
   <figure id="f:decwriter">
-    <img src="decwriter.jpg" alt="DECWriter LA-36" />
+    <img src="{{page.root}}/img/lessons/swc-shell/decwriter.jpg" alt="DECWriter LA-36" />
     <figcaption>Figure 1: DECWriter LA-36</figcaption>
   </figure>
 
@@ -98,7 +98,7 @@
   </p>
 
   <figure id="f:command_shell">
-    <img src="command_shell.svg" alt="The Command Shell" />
+    <img src="{{page.root}}/img/lessons/swc-shell/command_shell.svg" alt="The Command Shell" />
     <figcaption>Figure 3: The Command Shell</figcaption>
   </figure>
 

_includes/guide-shell/pipefilter/keypoints.html

@@ -1,9 +1,5 @@
 <div id="s:shell:pipefilter:keypoints" class="keypoints">
   <ul>
-    <li>Use wildcards to match filenames.</li>
-    <li>'*' is a wildcard pattern that matches zero or more characters in a pathname.</li>
-    <li>'?' is a wildcard pattern that matches any single character.</li>
-    <li>The shell matches wildcards before running commands.</li>
     <li><code><em>command</em> &gt; <em>file</em></code> redirects a command's output to a file.</li>
     <li><code><em>first</em> | <em>second</em></code> is a pipeline: the output of the first command is used as the input to the second.</li>
     <li>The best way to use the shell is to use pipes to combine simple single-purpose programs (filters).</li>