Merge pull request swcarpentry#245 from gvwilson/moving-lesson-overview

Moving overview of existing lesson materials to Carpentries lesson.

_episodes/15-carpentries.md

@@ -78,6 +78,68 @@ Its workshops are:
 
 ![Software Carpentry and Data Carpentry Comparison]({{ site.root }}/fig/10/SWCvsDC.png)
 
+## Existing Lessons
+
+Software Carpentry's most commonly used [lessons]({{ site.swc_site }}/lessons/) are:
+
+*   [The Unix Shell]({{site.github_io_url}}/shell-novice/)
+*   [Version Control with Git]({{site.github_io_url}}/git-novice/)
+*   [Programming with Python]({{site.github_io_url}}/python-novice-inflammation/)
+*   [Programming with R]({{site.github_io_url}}/r-novice-inflammation/)
+*   [R for Reproducible Scientific Analysis]({{site.github_io_url}}/r-novice-gapminder/)
+
+Only one of the three programming lessons (Python or one of the R lessons) is used in a typical workshop.
+Software Carpentry also maintains lessons on:
+
+*   [Version Control with Mercurial]({{site.github_io_url}}/hg-novice/)
+*   [Using Databases and SQL]({{site.github_io_url}}/sql-novice-survey/)
+*   [Programming with MATLAB]({{site.github_io_url}}/matlab-novice-inflammation/)
+*   [Automation and Make]({{site.github_io_url}}/make-novice/)
+
+but these are less frequently used.
+
+The main aim of the Unix shell lesson is to familiarize people with a handful of basic concepts
+that crop up in many other areas of computing:
+
+*   the notions of a path and a home directory
+*   the use of history and tab completion to save time (and prevent mistakes)
+*   manipulating text using `head`, `tail`, `grep`, and related tools
+*   combining existing tools using pipes instead of writing new ones
+*   using loops to repeat operations
+
+The aims of the version control lesson are to teach people:
+
+*   how to keep track of their work,
+*   how to collaborate with other people online, and
+*   enough about privacy and licensing that they can begin to make sensible decisions about
+    what to put where and how to share it.
+
+The ostensible aim of the programming lessons are to show people
+how to build modular programs out of small functions
+that can be read, tested, and re-used.
+However,
+these concepts turn out to be hard to convey to people
+who are still learning the syntax of a programming language
+(forest and trees),
+so in practice the programming lessons focus primarily on
+the mechanics of doing common operations in those languages.
+
+Data Carpentry's [lessons]({{ site.dc_site }}/lessons/)
+are domain-specific and cover data organization, manipulation, and visualization skills
+relevant to the target domain.
+Currently, there are fully-developed workshops for:
+
+*   [Ecology]({{ site.dc_site }}/lessons/#ecology-workshop)  
+*   [Genomics]({{ site.dc_site }}/lessons/#genomics-workshop)  
+*   [Geospatial Data]({{ site.dc_site }}/lessons/#geospatial-data-workshop)  
+
+There are also materials in development and testing for:
+
+*   [Social Science]({{ site.dc_site }}/lessons/#social-science-materials)  
+*   and [a semester-long Biology course]({{ site.dc_site }}/semester-biology/).
+
+Other Data Carpentry lessons are in the incubator stage.
+
 ## Workshop Operations
 
 We have recorded what we've learned about writing workshops

_episodes/20-lessons.md

@@ -218,68 +218,6 @@ A learner profile for Software Carpentry might be:
 > so that he can re-run analyses and figure out which results may have been affected by changes.
 {: .quotation}
 
-## Existing Lessons
-
-Software Carpentry's most commonly used [lessons]({{ site.swc_site }}/lessons/) are:
-
-*   [The Unix Shell]({{site.github_io_url}}/shell-novice/)
-*   [Version Control with Git]({{site.github_io_url}}/git-novice/)
-*   [Programming with Python]({{site.github_io_url}}/python-novice-inflammation/)
-*   [Programming with R]({{site.github_io_url}}/r-novice-inflammation/)
-*   [R for Reproducible Scientific Analysis]({{site.github_io_url}}/r-novice-gapminder/)
-
-Only one of the three programming lessons (Python or one of the R lessons) is used in a typical workshop.
-Software Carpentry also maintains lessons on:
-
-*   [Version Control with Mercurial]({{site.github_io_url}}/hg-novice/)
-*   [Using Databases and SQL]({{site.github_io_url}}/sql-novice-survey/)
-*   [Programming with MATLAB]({{site.github_io_url}}/matlab-novice-inflammation/)
-*   [Automation and Make]({{site.github_io_url}}/make-novice/)
-
-but these are less frequently used.
-
-The main aim of the Unix shell lesson is to familiarize people with a handful of basic concepts
-that crop up in many other areas of computing:
-
-*   the notions of a path and a home directory
-*   the use of history and tab completion to save time (and prevent mistakes)
-*   manipulating text using `head`, `tail`, `grep`, and related tools
-*   combining existing tools using pipes instead of writing new ones
-*   using loops to repeat operations
-
-The aims of the version control lesson are to teach people:
-
-*   how to keep track of their work,
-*   how to collaborate with other people online, and
-*   enough about privacy and licensing that they can begin to make sensible decisions about
-    what to put where and how to share it.
-
-The ostensible aim of the programming lessons are to show people
-how to build modular programs out of small functions
-that can be read, tested, and re-used.
-However,
-these concepts turn out to be hard to convey to people
-who are still learning the syntax of a programming language
-(forest and trees),
-so in practice the programming lessons focus primarily on
-the mechanics of doing common operations in those languages.
-
-Data Carpentry's [lessons]({{ site.dc_site }}/lessons/)
-are domain-specific and cover data organization, manipulation, and visualization skills
-relevant to the target domain.
-Currently, there are fully-developed workshops for:
-
-*   [Ecology]({{ site.dc_site }}/lessons/#ecology-workshop)  
-*   [Genomics]({{ site.dc_site }}/lessons/#genomics-workshop)  
-*   [Geospatial Data]({{ site.dc_site }}/lessons/#geospatial-data-workshop)  
-
-There are also materials in development and testing for:
-
-*   [Social Science]({{ site.dc_site }}/lessons/#social-science-materials)  
-*   and [a semester-long Biology course]({{ site.dc_site }}/semester-biology/).
-
-Other Data Carpentry lessons are in the incubator stage.
-
 ### Lesson Development
 
 As stated above, the lesson materials for Software and Data Carpentry