diff options
-rw-r--r-- | _layouts/page.html | 3 | ||||
-rw-r--r-- | docs/glossary.md | 30 |
2 files changed, 31 insertions, 2 deletions
diff --git a/_layouts/page.html b/_layouts/page.html index 1546c3d19..1f6312400 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -22,11 +22,10 @@ layout: default <li><a href="{{ site.baseurl }}docs/getting_started">Getting Started</a></li> <li><a href="{{ site.baseurl }}docs/installing/">Installing</a> <ul> - <li><a href="{{ site.baseurl }}docs/installing/deploy">Deploying</a></li> <li><a href="{{ site.baseurl }}docs/installing/script">Install script</a></li> <li><a href="{{ site.baseurl }}docs/installing/ami">Alaveteli AMI for EC2</a></li> <li><a href="{{ site.baseurl }}docs/installing/manual_install">Installing by hand</a></li> - <li><a href="{{ site.baseurl }}docs/installing/macos">MacOS X</a></li> + <li><a href="{{ site.baseurl }}docs/installing/deploy">Deploying</a></li> <li><a href="{{ site.baseurl }}docs/installing/email">MTA (email)</a></li> </ul> </li> diff --git a/docs/glossary.md b/docs/glossary.md index 8d2f815f9..13410bed2 100644 --- a/docs/glossary.md +++ b/docs/glossary.md @@ -25,6 +25,7 @@ Definitions <li><a href="#foi">freedom of information</a></li> <li><a href="#git">git</a></li> <li><a href="#holding_pen">holding pen</a></li> + <li><a href="#newrelic">New Relic</a></li> <li><a href="#mta">MTA</a></li> <li><a href="#production">production site</a></li> <li><a href="#publish">publish</a></li> @@ -304,6 +305,34 @@ Definitions </dd> <dt> + <a name="newrelic">New Relic</a> + </dt> + <dd> + Alaveteli can use <strong>New Relic</strong>'s application monitoring tool to track the + performance of your <a href="#production" class="glossary">production site</a>. If enabled, + data from your application is gathered on the New Relic website, which you can inspect with + their visual tools. Basic use is free. + <div class="more-info"> + <p>More information:</p> + <ul> + <li> + use the <code>agent_enabled:</code> setting in the + the <code>newrelic.yml</code> config file to enable the New Relic analytics. + See the <a href="{{ site.baseurl }}installing/manual_install">manual installation</a> instructions. + </li> + <li> + see also the New Relic Ruby Agent <a href="https://github.com/newrelic/rpm">github repo</a> and + <a href="https://docs.newrelic.com/docs/ruby/">documentation</a> + </li> + <li> + the <a href="http://newrelic.com">New Relic website</a>: if you've enabled the service, + you can log in to inspect the perfomance analytics + </li> + </ul> + </div> + </dd> + + <dt> <a name="production">production site</a> (also: live, production server) </dt> <dd> @@ -448,6 +477,7 @@ Definitions see <a href="http://en.wikibooks.org/wiki/Regular_Expressions"><em>Regular Expressions</em> on wikibooks</a> for more information </li> + </ul> </div> </dd> |