Skip to content

Commit c1aaa5a

Browse files
committed
site: regenerate
Close #4
1 parent 568e89f commit c1aaa5a

File tree

1 file changed

+37
-5
lines changed

1 file changed

+37
-5
lines changed

docs/index.html

Lines changed: 37 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,38 @@ <h3 id="prerequisites">Prerequisites</h3>
110110
<h2 id="contributing">Contributing</h2>
111111
<p><em>TBD</em> (see <a href="https://github.com/idris-hackers/software-foundations/issues/4">issue #4</a> for discussion)</p>
112112
<h3 id="general-workflow">General Workflow</h3>
113-
<p><em>TODO: write me</em></p>
113+
<ol>
114+
<li><a href="https://github.com/idris-hackers/software-foundations/fork">Fork the repository</a> if you haven't already.</li>
115+
<li>Check the <a href="https://github.com/idris-hackers/software-foundations/pulls">open pull requests</a> for any related work in progress (WIP).</li>
116+
<li>Check out a new branch based on <code>develop</code>.</li>
117+
<li>Push some commits to your fork.</li>
118+
</ol>
119+
<ul>
120+
<li>The general workflow here is as follows:
121+
<ul>
122+
<li>Copy/paste the original text, <a href="#formatting">reformatting</a> as<br />
123+
appropriate.</li>
124+
<li>Translate Coq code into (idiomatic) Idris.</li>
125+
<li>Edit, augment and delete text as appropriate.<br />
126+
<em>N.B. This can be done in subsequent pull requests.</em></li>
127+
</ul></li>
128+
</ul>
129+
<ol>
130+
<li>Open a pull request (as soon as possible).</li>
131+
</ol>
132+
<ul>
133+
<li>If it's not ready to be merged, but you want to <em>claim</em> a particular task,<br />
134+
prefix the pull request with <code>WIP:</code>.</li>
135+
<li>Make a comment and remove the <code>WIP:</code> when it's ready to be reviewed and<br />
136+
merged. <em>Remember: formatting the text and taking a first pass at<br />
137+
translating the Coq to Idris is enough for an initial pull request.</em></li>
138+
</ul>
139+
<ol>
140+
<li>Open subsequent pull requests following a similar pattern for and edits or<br />
141+
other updates</li>
142+
</ol>
143+
<p>The <code>develop</code> branch is the <em>working branch</em> and <code>master</code> is for <em>releases</em>,<br />
144+
i.e. rebuilt <a href="https://idris-hackers.github.io/software-foundations/pdf/sf-idris-2016.pdf">PDF</a>s and <a href="https://idris-hackers.github.io/software-foundations">website</a> updates.</p>
114145
<h3 id="formatting">Formatting</h3>
115146
<p>When formatting the <a href="http://docs.idris-lang.org/en/latest/tutorial/miscellany.html#literate-programming">Literate Idris</a> source, we use <a href="https://wiki.haskell.org/Literate_programming#Bird_Style">bird tracks</a> for code meant<br />
116147
to be compiled and a combination of <a href="https://daringfireball.net/projects/markdown/">Markdown</a> and <a href="http://www.latex-project.org">LaTeX</a> for commentary and<br />
@@ -167,18 +198,19 @@ <h4 id="code-blocks">Code Blocks</h4>
167198
<h4 id="inline-code">Inline Code</h4>
168199
<p>For inline Idris code, use the custom <code>\mintinline</code> shortcut <code>\idr</code>, e.g.</p>
169200
<div class="sourceCode"><pre class="sourceCode tex"><code class="sourceCode latex">To print ``Hello World!&#39;&#39; in Idris, write <span class="fu">\idr</span>{putStrLn &quot;Hello, World!&quot;}.</code></pre></div>
170-
<p>For convenience, we've also defined the shortcut <code>\el</code> for ineline Emacs Lisp<br />
201+
<p>For convenience, we've also defined the shortcut <code>\el</code> for inline Emacs Lisp<br />
171202
code, e.g.</p>
172203
<div class="sourceCode"><pre class="sourceCode latex"><code class="sourceCode latex">Set the value of <span class="fu">\el</span>{foo} to <span class="fu">\el</span>{42}: <span class="fu">\el</span>{(setq foo 42)}.</code></pre></div>
173204
<p>Otherwise, use single backticks for inline monospace text, e.g.</p>
174205
<pre><code>This is some `inline monospaced text`.</code></pre>
175206
<p>In a certain cases, we might want syntax highlighting for a language other than<br />
176-
Idris or Emacs Lisp. For such cases, use the standard <code>\mintline</code> command, e.g.</p>
207+
Idris or Emacs Lisp. For such cases, use the standard <code>\mintinline</code> command,<br />
208+
e.g.</p>
177209
<div class="sourceCode"><pre class="sourceCode tex"><code class="sourceCode latex">To declare a theorem in Coq, use <span class="fu">\mintinline</span>[]{coq}{Theorem}.</code></pre></div>
178210
<h4 id="glossary">Glossary</h4>
179211
<p>We use the <a href="https://www.ctan.org/pkg/glossaries">glossaries package</a> for defining terms<br />
180212
(in <a href="https://github.com/idris-hackers/software-foundations/blob/master/src/glossary.tex"><code>src/glossary.tex</code></a>) and including a glossary in<br />
181-
the [generated PDF][PDF]. See the package documentation for more information,<br />
213+
the <a href="https://idris-hackers.github.io/software-foundations/pdf/sf-idris-2016.pdf">generated PDF</a>. See the package documentation for more information,<br />
182214
but here's a quick example:</p>
183215
<div class="sourceCode"><pre class="sourceCode tex"><code class="sourceCode latex">What is the <span class="fu">\gls</span>{meaning of life}?
184216

@@ -187,7 +219,7 @@ <h4 id="glossary">Glossary</h4>
187219
description={42}
188220
}</code></pre></div>
189221
<h3 id="generating-the-pdf">Generating the PDF</h3>
190-
<p>To generate the [PDF] we use [Pandoc] and [latexmk]. For more details, check out<br />
222+
<p>To generate the <a href="https://idris-hackers.github.io/software-foundations/pdf/sf-idris-2016.pdf">PDF</a> we use <a href="http://pandoc.org">Pandoc</a> and <a href="https://www.ctan.org/pkg/latexmk/">latexmk</a>. For more details, check out<br />
191223
the <code>all.pdf</code>, <code>all.tex</code> and <code>%.tex</code> rules in <a href="https://github.com/idris-hackers/software-foundations/blob/master/src/glossary.tex"><code>src/Makefile</code></a>.</p>
192224
<!-- Named Links -->
193225
</body>

0 commit comments

Comments
 (0)