aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--glossary.md22
-rw-r--r--installing/deploy.md3
2 files changed, 24 insertions, 1 deletions
diff --git a/glossary.md b/glossary.md
index 56728c5ee..a59e8f5eb 100644
--- a/glossary.md
+++ b/glossary.md
@@ -18,6 +18,7 @@ Definitions
<li><a href="#alaveteli">Alaveteli</a></li>
<li><a href="#agnostic">asker agnostic</a></li>
<li><a href="#authority">authority</a></li>
+ <li><a href="#capistrano">Capistrano</a></li>
<li><a href="#development">development site</a></li>
<li><a href="#foi">freedom of information</a></li>
<li><a href="#git">git</a></li>
@@ -110,6 +111,27 @@ Definitions
</dd>
<dt>
+ <a name="capistrano">Capistrano</a>
+ </dt>
+ <dd>
+ <strong>Capistrano</strong> is a remote server automation and deployment tool written in Ruby.
+ Alaveteli's deployment mechanism, which is optional, uses it.
+ <div class="more-info">
+ <p>More information:</p>
+ <ul>
+ <li>
+ how to <a href="{{ site.baseurl }}installing/deploy">deploy Alaveteli</a> (and why it's
+ a good idea)
+ </li>
+ <li>
+ The <a href="http://capistranorb.com/">Capistrano website</a> has thorough documentation
+ about the tool
+ </li>
+ </ul>
+ </div>
+ </dd>
+
+ <dt>
<a name="development">development site</a> (also: dev, development server)
</dt>
<dd>
diff --git a/installing/deploy.md b/installing/deploy.md
index d0d548a64..acaf00e3b 100644
--- a/installing/deploy.md
+++ b/installing/deploy.md
@@ -33,7 +33,8 @@ you're running one, your
## Capistrano
-Capistrano is included as part of Alaveteli as a standard deployment system.
+<a href="{{site.baseurl}}glossary/#capistrano" class="glossary">Capistrano</a>
+is included as part of Alaveteli as a standard deployment system.
### Set up