From 37401b6f034893043dfe4fb9e6add30da73cfae2 Mon Sep 17 00:00:00 2001 From: Wookey <wookey@wookware.org> Date: Wed, 16 Sep 2015 04:27:22 +0100 Subject: [PATCH] Update some website/dataset instructions. --- handbook/update.htm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/handbook/update.htm b/handbook/update.htm index a28c8e67d..771662229 100644 --- a/handbook/update.htm +++ b/handbook/update.htm @@ -119,19 +119,19 @@ stored just as files (not in version control). See below for details on that.</p 16GB of stuff which you probably don't actually need locally) To sync the files from the server to local expoimages directory:</p> -<p><tt>rsync -av expo@expo.survex.com:expoimages /home/expo/fromserver</tt></p> +<p><tt>rsync -av expo@expo.survex.com:expoimages /home/expo</tt></p> <p>To sync the local expoimage directory back to the server:</p> -<p><tt>rsync -av /home/expo/fromserver/expoimages expo@expo.survex.com:</tt></p> +<p><tt>rsync -av /home/expo/expoimages expo@expo.survex.com:</tt></p> -<p>(do be careful not to delete piles of stuff then rsync back - as it'll all get deleted on the server too, and we may not have backups!)</p> +<p>(do be careful not to delete piles of stuff then rsync back - as it'll all get deleted on the server too, and we may not have backups!). Use rsync --dry-run --delete-after -a to check what would be deleted.</p> <h3><a id="editingthewebsite">Editing the website</a></h3> -<p>To edit the website fully, you need a mercurial client. Some (static text) pages can be edited directly on-line using the 'edit this page link' which you'll see if you are logged into troggle. DYnamically-generated pages can not be edited in this way.</p> +<p>To edit the website fully, you need a mercurial client. Some (static text) pages can be edited directly on-line using the 'edit this page link' which you'll see if you are logged into troggle. In general dynamically-generated pages can not be edited in this way, but forms are provided for some page-types like 'caves'.</p> -<p>Mercurial can be used from the command line, but if you prefer a GUI, tourtoisehg is highly recommended on all OSes (available on Linux from Debian 6 and Ubuntu 11.04 onwards).</p> +<p>Mercurial can be used from the command line, but if you prefer a GUI, tourtoisehg is highly recommended on all OSes.</p> <p>Linux: Install mercurial and tortoisehg-nautilus from synaptic, then restart nautilus <tt>nautilus -q</tt>. If it works, you'll be able to see the menus of Tortoise within your Nautilus windows. </p> @@ -164,10 +164,12 @@ then restart nautilus <tt>nautilus -q</tt>. If it works, you'll be able to see t <p><tt>hg push</tt></p> -<p>If someone else is editing the same bit at the same time you may also need to:</p> +<p>Before pushing, you should do an <tt>hg pull</tt> to sync with upstream first. If someone else has edited the same files you may also need to do:</p> <p><tt>hg merge</tt></p> +<p>before pushing again</p> + <p>Simple changes to static files will take effect immediately, but changes to dynamically-generated files (cave descriptions, QM lists etc) will not take effect, until the server runs the expoweb-update script.</p> <h3><a id="mercurialinwindows">Using Mercurial/TortoiseHg in Windows</a></h3>