Commit eab35380 authored by Greg Wilson's avatar Greg Wilson
Browse files

Merging in changes

parents fc2d749c 3d8471f5

01-one.html

+4 −4
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
<li>Learning objective 2</li>

</ul>

</div>

<p>Paragraphs of text --- possibly including <strong>definitions</strong> --- mixed with:</p>

<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>

<pre class="output"><code>output
@@ -57,10 +57,10 @@ program</code></pre> 
        </div>

      </div>

      <div class="footer">

        <a class="label swc-blue-bg" href="mailto:admin@software-carpentry.org">Email</a>

        <a class="label swc-blue-bg" href="http://github.com/swcarpentry">GitHub</a>

        <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>

        <a class="label swc-blue-bg" href="mailto:admin@software-carpentry.org">Contact</a>

        <a class="label swc-blue-bg" href="LICENSE.html">License</a>

        <a class="bugreport label swc-blue-bg" href="mailto:admin@software-carpentry.org?subject=bug%20in%20{{page.path}}">Bug Report</a>

      </div>

    </div>

    <!-- Javascript placed at the end of the document so the pages load faster -->

01-one.md

+3 −2
Original line number Diff line number Diff line
@@ -4,12 +4,13 @@ title: Lesson Title 
subtitle: Topic Title One

minutes: 10

---

> ## Learning Objectives

> ## Learning Objectives {.objectives}

>

> * Learning objective 1

> * Learning objective 2



Paragraphs of text --- possibly including **definitions** ---

Paragraphs of text

--- possibly including [key word 1](reference.html#key-word-1) ---

mixed with:



~~~ {.python}

02-two.html

+5 −5
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
<li>Learning objective 2</li>

</ul>

</div>

<p>Paragraphs of text --- possibly including <strong>definitions</strong> --- mixed with:</p>

<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>

<pre class="output"><code>output
@@ -48,15 +48,15 @@ program</code></pre> 
</div>

<div id="challenge-title" class="challenge">

<h2>Challenge Title</h2>

<p>Description of a single challenge. There may be several challenges.</p>

<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>

</div>

        </div>

      </div>

      <div class="footer">

        <a class="label swc-blue-bg" href="mailto:admin@software-carpentry.org">Email</a>

        <a class="label swc-blue-bg" href="http://github.com/swcarpentry">GitHub</a>

        <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>

        <a class="label swc-blue-bg" href="mailto:admin@software-carpentry.org">Contact</a>

        <a class="label swc-blue-bg" href="LICENSE.html">License</a>

        <a class="bugreport label swc-blue-bg" href="mailto:admin@software-carpentry.org?subject=bug%20in%20{{page.path}}">Bug Report</a>

      </div>

    </div>

    <!-- Javascript placed at the end of the document so the pages load faster -->

02-two.md

+5 −3
Original line number Diff line number Diff line
@@ -4,12 +4,13 @@ title: Lesson Title 
subtitle: Topic Title Two

minutes: 10

---

> ## Learning Objectives

> ## Learning Objectives {.objectives}

>

> * Learning objective 1

> * Learning objective 2



Paragraphs of text --- possibly including **definitions** ---

Paragraphs of text

--- possibly including [key word 2](reference.html#key-word-2) ---

mixed with:



~~~ {.python}
@@ -34,4 +35,5 @@ and possibly including: 
> ## Challenge Title {.challenge}

>

> Description of a single challenge.

> There may be several challenges.
 
> There may be several challenges

> that make reference to [Challenge Title](01-one.html#challenge-title).

LAYOUT.md

+8 −7
Original line number Diff line number Diff line
@@ -167,12 +167,13 @@ Each topic page must be structured as follows: 
    subtitle: Topic Title

    minutes: 10

    ---

    > ## Learning Objectives

    > ## Learning Objectives {.objectives}

    >

    > * Learning objective 1

    > * Learning objective 2



    Paragraphs of text --- possibly including **definitions** ---

    Paragraphs of text

    --- possibly including [definitions](reference.html#definitions) ---

    mixed with:



    ~~~ {.python}
@@ -219,9 +220,9 @@ Each topic page must be structured as follows: 
3.  Every challenge should relate explicitly back to a learning

    objective.



4.  Definitions of terms are marked in **bold** (like `**this**`).

    Nothing else should be marked as bold text --- use *italics* for

    for all other emphasis.

4.  Definitions are links with fragment identifier to `reference.html`

    (like `[definitions](reference.html#definitions)`).

    This is need to enable links from name diferent from the key word defined.



5.  When laying out source code, use `{.lang}` as a style on the

    opening `~~~` line.  For Unix Shell commands use:
@@ -307,10 +308,10 @@ a definition list: 


    ## Glossary



    Key Word 1

    key word 1

    :   Definition of first term



    Key Word 2

    key word 2

    :   Definition of second term



## Discussion Page