From 008de728188f770ee6fe3bfe1bd657c29e685535 Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Wed, 9 Jul 2014 15:55:36 +0100 Subject: change glossary link class to glossary__link throughout --- docs/installing/deploy.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/installing/deploy.md') diff --git a/docs/installing/deploy.md b/docs/installing/deploy.md index 4bbc91a9d..019270fdf 100644 --- a/docs/installing/deploy.md +++ b/docs/installing/deploy.md @@ -33,7 +33,7 @@ you're running one, your ## Capistrano -Capistrano +Capistrano is included as part of Alaveteli as a standard deployment system. The basic principle of Capistrano is that you execute `cap [do-something]` @@ -115,8 +115,8 @@ Now, back on your local machine: * make sure you're still in the Alaveteli repo (if not, `cd` back into it) * create a deployment directory on the server by running *one* of these commands: - * `cap deploy` if you're deploying a staging site, or... - * `cap -S stage=production deploy` for production + * `cap deploy` if you're deploying a staging site, or... + * `cap -S stage=production deploy` for production * update the webserver config (either apache or nginx) to add the `current` element to the path where it is serving Alaveteli from. If you installed using the installation script, this will be replacing `/var/www/alaveteli/alaveteli/` with -- cgit v1.2.3 From 7ea3c5cce272311ce76b7bc438377f90959635a7 Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Wed, 9 Jul 2014 16:09:25 +0100 Subject: add missing glossary_link to glossary links found using git grep -P ']+glossary[^>]+' | grep -v __link in case that's handy. --- docs/installing/deploy.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'docs/installing/deploy.md') diff --git a/docs/installing/deploy.md b/docs/installing/deploy.md index 019270fdf..2c31f95ce 100644 --- a/docs/installing/deploy.md +++ b/docs/installing/deploy.md @@ -8,7 +8,8 @@ title: Deploying

Although you can install Alaveteli and just change it when you need it, we recommend you adopt a way of deploying it automatically, - especially on your production server. + especially on your + production server. Alaveteli provides a deployment mechanism using Capistrano.

@@ -27,9 +28,9 @@ changes or copying files by hand, so your site will be down for the shortest possible time. We **strongly recommend** you use the deployment mechanism for your -production server and, if -you're running one, your -staging server too. +production server +and, if you're running one, your +staging server too. ## Capistrano -- cgit v1.2.3 From 267fa5b3e24e658ebaba60aa52247f38e4d00c77 Mon Sep 17 00:00:00 2001 From: Gareth Rees Date: Thu, 10 Jul 2014 10:53:37 +0100 Subject: Fix typo --- docs/installing/deploy.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/installing/deploy.md') diff --git a/docs/installing/deploy.md b/docs/installing/deploy.md index 4bbc91a9d..5fc688120 100644 --- a/docs/installing/deploy.md +++ b/docs/installing/deploy.md @@ -95,7 +95,7 @@ Next, on your local machine: Back on the server: * copy the following config files from the temporary copy of Alaveteli you made at - the begining (perhaps in your home directory) to the `shared` directory that + the beginning (perhaps in your home directory) to the `shared` directory that Capistrano just created on the server: * `general.yml` * `database.yml` -- cgit v1.2.3 From 9ccaaa9c052935075c227a97e3dc77edcb4605ba Mon Sep 17 00:00:00 2001 From: Gareth Rees Date: Thu, 10 Jul 2014 10:53:45 +0100 Subject: Add log to shared directories to copy --- docs/installing/deploy.md | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/installing/deploy.md') diff --git a/docs/installing/deploy.md b/docs/installing/deploy.md index 5fc688120..0e4f6c4ad 100644 --- a/docs/installing/deploy.md +++ b/docs/installing/deploy.md @@ -110,6 +110,7 @@ Back on the server: `shared` directory created by Capistrano on the server: * `cache/` * `files/` + * `log/` Now, back on your local machine: -- cgit v1.2.3