expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2025-04-04 01:51:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update some website/dataset instructions.

Browse Source
This commit is contained in:
Wookey 2015-09-16 04:27:22 +01:00
parent 71711347e0
commit 37401b6f03
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
handbook/update.htm
View File

@ -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 16GB of stuff which you probably don't actually need locally) To sync
the files from the server to local expoimages directory:</p> 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>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> <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, <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> 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><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><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> <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> <h3><a id="mercurialinwindows">Using Mercurial/TortoiseHg in Windows</a></h3>