diff --git a/handbook/computing/x-todo.html b/handbook/computing/x-todo.html
index 47ad0d6e1..337826615 100644
--- a/handbook/computing/x-todo.html
+++ b/handbook/computing/x-todo.html
@@ -26,7 +26,7 @@
This is part of the "new expo year" preparations.
-The folk.csv file is stored on the server under version control in the ::expoweb:: repository in
+The folk.csv file is stored on the server under version control in the :expoweb: repository in
expoweb/folk/folk.csv
Before expo starts the folk.csv file is updated. diff --git a/handbook/computing/manual.html b/handbook/computing/manual.html index d2c12cb3f..7d2690f4e 100644 --- a/handbook/computing/manual.html +++ b/handbook/computing/manual.html @@ -97,7 +97,7 @@ Appendices:
This password is all you need to log in to troggle and to use the troggle control panel (very few people need to do this). But if you want to update webpages (a much more common requirement) or to edit the software itself (very rare), then you will also need to get a login (register a key with the server). See key-pair setup for details. -
Pushing cave data to the ::loser:: and ::drawings:: repositories also needs a key. So cavers entering their cave survey data have to use a machine on which this already set up. These machines are +
Pushing cave data to the :loser: and :drawings: repositories also needs a key. So cavers entering their cave survey data have to use a machine on which this already set up. These machines are the expo laptop and the laptop 'aziraphale' which live in the potato hut during expo. If you want to use your own laptop then see below. diff --git a/handbook/computing/winlaptop.html b/handbook/computing/winlaptop.html index 8b39f278c..514c1a56f 100644 --- a/handbook/computing/winlaptop.html +++ b/handbook/computing/winlaptop.html @@ -55,7 +55,7 @@ The links you are most likely to come across are that what looks like and that expoweb/essentials.gpx is a link to the file /home/expo/expofiles/gpslogs/essentials/essentials2019.gpx -
But that example is in the ::expoweb:: repository, so you won't be using sFTP to download it. Instead you will be using the version control software which handles it without problems. But we use it as an example of what to look out for when using sFTP. +
But that example is in the :expoweb: repository, so you won't be using sFTP to download it. Instead you will be using the version control software which handles it without problems. But we use it as an example of what to look out for when using sFTP.
diff --git a/handbook/computing/x-todo.html b/handbook/computing/x-todo.html
index 47ad0d6e1..337826615 100644
--- a/handbook/computing/x-todo.html
+++ b/handbook/computing/x-todo.html
@@ -26,7 +26,7 @@
Edit this page by clicking on the big blue button. It uses the same "Edit this page" function that you may have used before. But that is not working yet. Please do not try as that will currently delete all the Javascript that makes the hide/reveal functions work.
Edit this page using the pull/edit/commit/push version control mechanism. -
Nearly all our Austrian surveys have beeen produced using Tunnel (or were hand-drawn) but many smaller caves and some areas of SMKsystem are done with Therion because Therion does elevations and Tunnel doesn't.
diff --git a/handbook/essentials.html b/handbook/essentials.html index 765be80a2..367c99b0a 100644 --- a/handbook/essentials.html +++ b/handbook/essentials.html @@ -116,11 +116,11 @@ devise new routes to reach them.To regenerate the most recent version which contains the cave entrances discovered during expo you will need to ask someone who is competent in logging into the server and running scripts. -
The data is in the version control system repository ::loser:: in +
The data is in the version control system repository :loser: in
loser/gpx/-and is generated from the survex data by a script. It is best to do this on a laptop which has the entire ::loser:: +and is generated from the survex data by a script. It is best to do this on a laptop which has the entire :loser: repo downloaded onto it (e.g. the expo laptop) rather than on the server itself as the server can run out of memory doing this.
The most recent track data will have been uploaded by an expoer into e.g. diff --git a/handbook/gpxupload.html b/handbook/gpxupload.html index 0e6b93b5f..322e72fa0 100644 --- a/handbook/gpxupload.html +++ b/handbook/gpxupload.html @@ -86,7 +86,7 @@ to something recognisable such as 'top-camp-to-toilet-grike.gpx' (all lower case GPX data is stored in two places.
GPS tracks are voluminous and we also get a lot of repetition
@@ -114,7 +114,7 @@ If you have edited GPS tracks and waypoints with no extraneous data
then, after agreeing this with other people as to its qualityand appropriateness,
it will go into the Loser DVCS repository
in folder /gpx/<year>/ e.g.
-::loser::/2018/stone-bridge-to-fischgesicht_aday-2018-07-12.gpx
+:loser:/2018/stone-bridge-to-fischgesicht_aday-2018-07-12.gpx
Note the naming convention for this file created by Anthony Day on July 12th 2018. Everything in any repository is always named using lower-case letters.
These files live in ::expoweb::/cave_data/ +
These files live in :expoweb:/cave_data/
The example full format below is of a very simple cave with hardly any fields filled in. The most vital field is
<url>augstb/4.htm</url>
-at the bottom as this shows that this file is ::expoweb::/cave_data/augstb/4.htm
+at the bottom as this shows that this file is :expoweb:/cave_data/augstb/4.htm
<!-- Only put one cave in this file -->
@@ -68,15 +68,15 @@ the form and the file format however.
When you fill in the online form you creating a file just like the one above: troggle takes the input data from the form and creates the file. Troggle also stores the cave information in it's live memory when you use the form method.
If instead of using the form you create the file by hand and upload it to the server you will also need find a nerd to run the cave import procedure before troggle "knows" that the cave exists.
Cave entrances
-There is an exactly analogous file for cave entrances except that those files live in ::expoweb::/entrance_data/
+
There is an exactly analogous file for cave entrances except that those files live in :expoweb:/entrance_data/
File layout
- The caves in our site are stored as XML files in the directory ::expoweb::/cave_data and in
- files named ::expoweb::/cave_data/{area}-{cavenumber}. Entrances are correspondingly
- in ::expoweb::/entrance_data files, with the same naming convention, except that if
- there is more than one entrance they have a,b,c suffixes, e.g. ::expoweb::/entrance_data/{area}-{cavenumber}b
+
The caves in our site are stored as XML files in the directory :expoweb:/cave_data and in
+ files named :expoweb:/cave_data/{area}-{cavenumber}. Entrances are correspondingly
+ in :expoweb:/entrance_data files, with the same naming convention, except that if
+ there is more than one entrance they have a,b,c suffixes, e.g. :expoweb:/entrance_data/{area}-{cavenumber}b
Any associated files, usually photos and surveys, are
- stored under the area names ::expoweb::/1623/{cavenumber} or ::expoweb::/1626/{cavenumber}
+ stored under the area names :expoweb:/1623/{cavenumber} or :expoweb:/1626/{cavenumber}
Note that this is a different naming convention: caves and entrances have the {area} as
part of the file name
diff --git a/handbook/survey/newsurvex.html b/handbook/survey/newsurvex.html
index 20f815545..067a61f65 100644
--- a/handbook/survey/newsurvex.html
+++ b/handbook/survey/newsurvex.html
@@ -47,7 +47,7 @@ example:
/home/expo/loser/caves-1623/264/mongolrally.svx
If you have several parts of the cave surveyed on one trip, create several distinct .svx files.
[Nerds: survex cave data belongs in the repository ::loser:: so e.g. -::loser::/caves-1623/264/mongolrally.svx". We are assuming that normal users have never +
[Nerds: survex cave data belongs in the repository :loser: so e.g. +:loser:/caves-1623/264/mongolrally.svx". We are assuming that normal users have never worked with an distributed version control system at this point which is why we are only telling them to use the expo laptop.] diff --git a/handbook/survey/onlinewallet.html b/handbook/survey/onlinewallet.html index 6508379ac..67388e1aa 100644 --- a/handbook/survey/onlinewallet.html +++ b/handbook/survey/onlinewallet.html @@ -223,7 +223,7 @@ to see what overwriting you will do.
The python script does more than just re-format the contents.json data into different formats. It also
This page is mostly an index to other records of what troggle is and what plans have been made - but never implemented - to improve it. diff --git a/svxvalid.html b/svxvalid.html index f2d94b3c2..2ddb269de 100644 --- a/svxvalid.html +++ b/svxvalid.html @@ -18,7 +18,7 @@ because the actual updated data is pulled in through the iframe --> -
These validation concerns are generated by scripts check-svx.sh, check-refs.sh, check-refs.awk in the ::loser:: repository. +
These validation concerns are generated by scripts check-svx.sh, check-refs.sh, check-refs.awk in the :loser: repository. See handbook "other scripts" for further documentaiotn.
These scripts and checks could all be done as internal troggle-generated pages as the data used is (mostly) present in the tables after importing the wallet images and the survex files. diff --git a/xmlvalid.html b/xmlvalid.html index 64a2f69d9..b13a07582 100644 --- a/xmlvalid.html +++ b/xmlvalid.html @@ -17,7 +17,7 @@ Please edit these drawings files to correct this:
-These validation issues are generated by script check-xml.sh in the ::drawings:: repository. +
These validation issues are generated by script check-xml.sh in the :drawings: repository. See handbook "other scripts" for further documentation.
diff --git a/years/2018/index.html b/years/2018/index.html index f9fd38b7d..257947839 100644 --- a/years/2018/index.html +++ b/years/2018/index.html @@ -24,7 +24,7 @@ Link to last year: 2017