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

fixing links and adding cross-references

Browse Source
This commit is contained in:
Philip Sargent
2020-03-01 20:18:46 +00:00
parent fe4b1fcc36
commit 04f70187b9
5 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
handbook/onlinesystems.html
View File

@@ -51,9 +51,9 @@ just be overwritten</p>
<h3 id="edithandbook">Editing this handbook and historic expo documentation</h3>
<p>The primary and recommended way of editing this handbook (and the website generally) is to use
a laptop which has the <a href="#mercurial">Distributed Version Control System</a> software installed. The
a laptop which has the version control software installed. The
person editing needs to know how to use this software, and also needs to know how to edit raw HTML files
using a text editor.
using a text editor. The public <a href="exposerver.html">expo server</a> is on a machine far, far away that we only access remotely.
<p>The <em>Expo laptop</em> has the software installed, so it is best to learn how to do this
when sitting at that laptop.
@@ -66,11 +66,11 @@ problem. It also means that several people can work on the site on
different computers at once and normally merge their changes
easily.
<p>The recommended editing workflow is to (a) use the DVCM to synchronise your local laptop copy of the
<p>The recommended editing workflow is to (a) use the version control software to synchronise your local laptop copy of the
website files with that on the server; (b) edit a set of .html files on your laptop so that all links between them are consistent,
save the files locally, and "commit" them locally;
(c) "push" the collection of changes to the expo online server as a single action.
<p>See the <a href="manual.html#manual">Expo data management systems manual</a> for a fuller description of the DVCM
<p>See the <a href="manual.html#manual">Expo data management systems manual</a> for a fuller description of the version control software
repositories and how to install and use the software.
<h3 id="editthispage">Using "Edit this page"</h3>
@@ -88,8 +88,8 @@ mechanism does not tidy-up after itself properly.
See <a href="manual.html#editthispage">these instructions for this tidy-up</a>
<h3 id="mercurial">DVCS - version control</a></h3>
<p>We use a distributed revision control system (DVCS) for all the important data.
<h3 id="git">Version control system</a></h3>
<p>We use a distributed revision control system (git, and formerly mercurial) for all the important data.
This means that many people can edit and merge their changes with the expo
server in Cambridge at the same time: inlcuding people still on expo in the Tatty Hut
and those who have returned to the UK. Also anyone who is up
@@ -99,7 +99,7 @@ and the updates will be merged when they get back to civilization.
<p>In principle, survey notes can be typed into a laptop up on the plateau which would
then get synchronised when it next gets internet access.
</p>
<p>A DVCS is inefficient for scanned survey notes, which are large files that
<p>A version control system is inefficient for scanned survey notes which are large files that
do not get modified, so they are kept as a plain directory of files 'expofiles'.
The same goes for holiday photographs and GPS logs.</p>