diff --git a/01-one.html b/01-one.html index 7622e5587679ac45776b19f29953430b151e5836..74f33589db1c6fc450afeae82e1615066bc672bc 100644 --- a/01-one.html +++ b/01-one.html @@ -23,13 +23,14 @@ <img alt="Software Carpentry banner" src="img/software-carpentry-banner.png" /> </a> </div> + <article> <div class="row"> <div class="col-md-10 col-md-offset-1"> <h1 class="title">Lesson Title</h1> <h2 class="subtitle">Topic Title One</h2> <div id="learning-objectives" class="objectives panel panel-warning"> <div class="panel-heading"> -<h2><span class="glyphicon glyphicon-certificate"></span>Learning Objectives</h2> +<h2 id="learning-objectives" class="objectives panel panel-warning"><span class="glyphicon glyphicon-certificate"></span>Learning Objectives</h2> </div> <div class="panel-body"> <ul> @@ -38,9 +39,9 @@ </ul> </div> </div> -<p>Paragraphs of text --- possibly including <a href="reference.html#key-word-1">key word 1</a> --- mixed with:</p> -<pre class="sourceCode python"><code class="sourceCode python">some code: - to be displayed</code></pre> +<p>Paragraphs of text — possibly including <a href="reference.html#key-word-1">key word 1</a> — mixed with:</p> +<div class="sourceCode"><pre class="sourceCode python"><code class="sourceCode python">some code: + to be displayed</code></pre></div> <pre class="output"><code>output from program</code></pre> @@ -48,7 +49,7 @@ program</code></pre> <p>and possibly including:</p> <div id="callout-box" class="callout panel panel-info"> <div class="panel-heading"> -<h2><span class="glyphicon glyphicon-pushpin"></span>Callout Box</h2> +<h2 id="callout-box" class="callout panel panel-info"><span class="glyphicon glyphicon-pushpin"></span>Callout Box</h2> </div> <div class="panel-body"> <p>An aside of some kind.</p> @@ -56,11 +57,12 @@ program</code></pre> </div> <p>or an image from the <code>figs</code> directory:</p> <div class="figure"> -<img src="fig/example.svg" title="this is the image's alt text" alt="this is the image's title" /><p class="caption">this is the image's title</p> +<img src="fig/example.svg" title="this is the image's alt text" alt="this is the image’s title" /> +<p class="caption">this is the image’s title</p> </div> <div id="challenge-title" class="challenge panel panel-success"> <div class="panel-heading"> -<h2><span class="glyphicon glyphicon-pencil"></span>Challenge Title</h2> +<h2 id="challenge-title" class="challenge panel panel-success"><span class="glyphicon glyphicon-pencil"></span>Challenge Title</h2> </div> <div class="panel-body"> <p>Description of a single challenge. There may be several challenges.</p> @@ -68,6 +70,7 @@ program</code></pre> </div> </div> </div> + </article> <div class="footer"> <a class="label swc-blue-bg" href="http://software-carpentry.org">Software Carpentry</a> <a class="label swc-blue-bg" href="https://github.com/swcarpentry/lesson-template">Source</a> diff --git a/02-two.html b/02-two.html index c2b35a586fb1c01502abf5fd75bf060a5a7f3051..2dd346afadb25566b553b1b6d636e494f1989557 100644 --- a/02-two.html +++ b/02-two.html @@ -23,13 +23,14 @@ <img alt="Software Carpentry banner" src="img/software-carpentry-banner.png" /> </a> </div> + <article> <div class="row"> <div class="col-md-10 col-md-offset-1"> <h1 class="title">Lesson Title</h1> <h2 class="subtitle">Topic Title Two</h2> <div id="learning-objectives" class="objectives panel panel-warning"> <div class="panel-heading"> -<h2><span class="glyphicon glyphicon-certificate"></span>Learning Objectives</h2> +<h2 id="learning-objectives" class="objectives panel panel-warning"><span class="glyphicon glyphicon-certificate"></span>Learning Objectives</h2> </div> <div class="panel-body"> <ul> @@ -38,9 +39,9 @@ </ul> </div> </div> -<p>Paragraphs of text --- possibly including <a href="reference.html#key-word-2">key word 2</a> --- mixed with:</p> -<pre class="sourceCode python"><code class="sourceCode python">some code: - to be displayed</code></pre> +<p>Paragraphs of text — possibly including <a href="reference.html#key-word-2">key word 2</a> — mixed with:</p> +<div class="sourceCode"><pre class="sourceCode python"><code class="sourceCode python">some code: + to be displayed</code></pre></div> <pre class="output"><code>output from program</code></pre> @@ -48,7 +49,7 @@ program</code></pre> <p>and possibly including:</p> <div id="callout-box" class="callout panel panel-info"> <div class="panel-heading"> -<h2><span class="glyphicon glyphicon-pushpin"></span>Callout Box</h2> +<h2 id="callout-box" class="callout panel panel-info"><span class="glyphicon glyphicon-pushpin"></span>Callout Box</h2> </div> <div class="panel-body"> <p>An aside of some kind.</p> @@ -56,7 +57,7 @@ program</code></pre> </div> <div id="challenge-title" class="challenge panel panel-success"> <div class="panel-heading"> -<h2><span class="glyphicon glyphicon-pencil"></span>Challenge Title</h2> +<h2 id="challenge-title" class="challenge panel panel-success"><span class="glyphicon glyphicon-pencil"></span>Challenge Title</h2> </div> <div class="panel-body"> <p>Description of a single challenge. There may be several challenges that make reference to <a href="01-one.html#challenge-title">Challenge Title</a>.</p> @@ -64,6 +65,7 @@ program</code></pre> </div> </div> </div> + </article> <div class="footer"> <a class="label swc-blue-bg" href="http://software-carpentry.org">Software Carpentry</a> <a class="label swc-blue-bg" href="https://github.com/swcarpentry/lesson-template">Source</a> diff --git a/LICENSE.html b/LICENSE.html index aa9134bf44e12693f22e510c0c6f129ee2ce21ba..e911c913ea3226aa99d88265b156be9a809cdece 100644 --- a/LICENSE.html +++ b/LICENSE.html @@ -23,6 +23,7 @@ <img alt="Software Carpentry banner" src="img/software-carpentry-banner.png" /> </a> </div> + <article> <div class="row"> <div class="col-md-10 col-md-offset-1"> <h1 class="title">Licenses</h1> @@ -31,16 +32,16 @@ <p>All Software Carpentry instructional material is made available under the <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution license</a>. The following is a human-readable summary of (and not a substitute for) the <a href="https://creativecommons.org/licenses/by/4.0/legalcode">full legal text of the CC BY 4.0 license</a>.</p> <p>You are free:</p> <ul> -<li>to <strong>Share</strong>---copy and redistribute the material in any medium or format</li> -<li>to <strong>Adapt</strong>---remix, transform, and build upon the material</li> +<li>to <strong>Share</strong>—copy and redistribute the material in any medium or format</li> +<li>to <strong>Adapt</strong>—remix, transform, and build upon the material</li> </ul> <p>for any purpose, even commercially.</p> <p>The licensor cannot revoke these freedoms as long as you follow the license terms.</p> <p>Under the following terms:</p> <ul> -<li><strong>Attribution</strong>---You must give appropriate credit (mentioning that your work is derived from work that is Copyright © Software Carpentry and, where practical, linking to http://software-carpentry.org/), provide a <a href="https://creativecommons.org/licenses/by/4.0/">link to the license</a>, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use.</li> +<li><strong>Attribution</strong>—You must give appropriate credit (mentioning that your work is derived from work that is Copyright © Software Carpentry and, where practical, linking to http://software-carpentry.org/), provide a <a href="https://creativecommons.org/licenses/by/4.0/">link to the license</a>, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use.</li> </ul> -<p><strong>No additional restrictions</strong>---You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. With the understanding that:</p> +<p><strong>No additional restrictions</strong>—You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. With the understanding that:</p> <p>Notices:</p> <ul> <li>You do not have to comply with the license for elements of the material in the public domain or where your use is permitted by an applicable exception or limitation.</li> @@ -48,13 +49,14 @@ </ul> <h2 id="software">Software</h2> <p>Except where otherwise noted, the example programs and other software provided by Software Carpentry are made available under the <a href="http://opensource.org">OSI</a>-approved <a href="http://opensource.org/licenses/mit-license.html">MIT license</a>.</p> -<p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p> +<p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p> <p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</p> -<p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p> +<p>THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p> <h2 id="trademark">Trademark</h2> -<p>"Software Carpentry" and the Software Carpentry logo are registered trademarks of <a href="http://numfocus.org/">NumFOCUS</a>.</p> +<p>“Software Carpentry” and the Software Carpentry logo are registered trademarks of <a href="http://numfocus.org/">NumFOCUS</a>.</p> </div> </div> + </article> <div class="footer"> <a class="label swc-blue-bg" href="http://software-carpentry.org">Software Carpentry</a> <a class="label swc-blue-bg" href="https://github.com/swcarpentry/lesson-template">Source</a> diff --git a/discussion.html b/discussion.html index d690f7cfed1b7a6df9108981ca086ea3b464b2b9..362b80ce05cb6fcc48f8f39441fd919700773eae 100644 --- a/discussion.html +++ b/discussion.html @@ -23,6 +23,7 @@ <img alt="Software Carpentry banner" src="img/software-carpentry-banner.png" /> </a> </div> + <article> <div class="row"> <div class="col-md-10 col-md-offset-1"> <h1 class="title">Lesson Title</h1> @@ -34,6 +35,7 @@ </ul> </div> </div> + </article> <div class="footer"> <a class="label swc-blue-bg" href="http://software-carpentry.org">Software Carpentry</a> <a class="label swc-blue-bg" href="https://github.com/swcarpentry/lesson-template">Source</a> diff --git a/index.html b/index.html index 9494c01cb4d068717e81650a3abb3896a3b6233c..00e3cd75cf3e2c65fdf6b330e05de8e96a751301 100644 --- a/index.html +++ b/index.html @@ -23,6 +23,7 @@ <img alt="Software Carpentry banner" src="img/software-carpentry-banner.png" /> </a> </div> + <article> <div class="row"> <div class="col-md-10 col-md-offset-1"> <h1 class="title">Lesson Title</h1> @@ -30,7 +31,7 @@ <p>Paragraph of introductory material.</p> <div id="prerequisites" class="prereq panel panel-warning"> <div class="panel-heading"> -<h2><span class="glyphicon glyphicon-education"></span>Prerequisites</h2> +<h2 id="prerequisites" class="prereq panel panel-warning"><span class="glyphicon glyphicon-education"></span>Prerequisites</h2> </div> <div class="panel-body"> <p>A short paragraph describing what learners need to know before tackling this lesson.</p> @@ -46,10 +47,11 @@ <li><a href="motivation.html">Motivation</a></li> <li><a href="reference.html">Reference</a></li> <li><a href="discussion.html">Discussion</a></li> -<li><a href="instructors.html">Instructor's Guide</a></li> +<li><a href="instructors.html">Instructor’s Guide</a></li> </ul> </div> </div> + </article> <div class="footer"> <a class="label swc-blue-bg" href="http://software-carpentry.org">Software Carpentry</a> <a class="label swc-blue-bg" href="https://github.com/swcarpentry/lesson-template">Source</a> diff --git a/instructors.html b/instructors.html index 1d9bbf0011df5c47a08f40feb81197fc3acd5725..1a97eaef12bc0bfa04bad0fad00c75218a5451ab 100644 --- a/instructors.html +++ b/instructors.html @@ -23,12 +23,13 @@ <img alt="Software Carpentry banner" src="img/software-carpentry-banner.png" /> </a> </div> + <article> <div class="row"> <div class="col-md-10 col-md-offset-1"> <h1 class="title">Lesson Title</h1> - <h2 class="subtitle">Instructor's Guide</h2> + <h2 class="subtitle">Instructor’s Guide</h2> <h2 id="legend">Legend</h2> -<p>One or more paragraphs laying out the lesson's legend (i.e., the story behind its running example).</p> +<p>One or more paragraphs laying out the lesson’s legend (i.e., the story behind its running example).</p> <h2 id="overall">Overall</h2> <ul> <li><p>Something insightful.</p></li> @@ -49,6 +50,7 @@ </ul> </div> </div> + </article> <div class="footer"> <a class="label swc-blue-bg" href="http://software-carpentry.org">Software Carpentry</a> <a class="label swc-blue-bg" href="https://github.com/swcarpentry/lesson-template">Source</a> diff --git a/motivation.html b/motivation.html index 133554888476d6c3639f0df6681271f3e53a4502..75690a23fc69a0796bb876170365d7dd84472a05 100644 --- a/motivation.html +++ b/motivation.html @@ -35,8 +35,8 @@ <h1>The Problem</h1> <ul> <li>Surveyed 1972 scientists in 2008.</li> -<li>"How do you use computers?"</li> -<li>"How did you learn what you know?"</li> +<li>“How do you use computers?”</li> +<li>“How did you learn what you know?”</li> </ul> </section> <section id="the-problem-1" class="slide level2"> @@ -51,7 +51,7 @@ <h1>The Problem</h1> <ul> <li>No hard data on how <em>well</em> they do things.</li> -<li>But anecdotal evidence suggests "not very".</li> +<li>But anecdotal evidence suggests “not very”.</li> </ul> </section> <section id="our-solution" class="slide level2"> @@ -69,15 +69,15 @@ <h1>Outcomes</h1> <ul> <li>20% improvement in productivity is common.</li> -<li>10X isn't rare.</li> +<li>10X isn’t rare.</li> </ul> </section> <section id="outcomes-1" class="slide level2"> <h1>Outcomes</h1> <ul> <li>Empowers people.</li> -<li>HPC, the cloud, web services, big data, ...</li> -<li>Reproducible research, open science, ...</li> +<li>HPC, the cloud, web services, big data, …</li> +<li>Reproducible research, open science, …</li> </ul> </section> <section id="the-details" class="slide level2"> diff --git a/reference.html b/reference.html index 7a96d8361b0df2eb1046469a0798acd6b9ae9517..921171eeb6b0eee9298c6d6ea6b78d1303d84191 100644 --- a/reference.html +++ b/reference.html @@ -23,14 +23,15 @@ <img alt="Software Carpentry banner" src="img/software-carpentry-banner.png" /> </a> </div> + <article> <div class="row"> <div class="col-md-10 col-md-offset-1"> <h1 class="title">Lesson Title</h1> <h2 class="subtitle">Reference</h2> <h2 id="topic-title-one"><a href="01-one.html">Topic Title One</a></h2> -<p>...commands and examples...</p> +<p>…commands and examples…</p> <h2 id="topic-title-two"><a href="02-two.html">Topic Title Two</a></h2> -<p>...commands and examples...</p> +<p>…commands and examples…</p> <h2 id="glossary">Glossary</h2> <dl> <dt><span id="key-word-1">key word 1</span></dt> @@ -42,6 +43,7 @@ </dl> </div> </div> + </article> <div class="footer"> <a class="label swc-blue-bg" href="http://software-carpentry.org">Software Carpentry</a> <a class="label swc-blue-bg" href="https://github.com/swcarpentry/lesson-template">Source</a>