diff --git a/handbook/computing/git-logo.png b/handbook/computing/git-logo.png new file mode 100644 index 000000000..99e276837 Binary files /dev/null and b/handbook/computing/git-logo.png differ diff --git a/handbook/computing/repos.html b/handbook/computing/repos.html index aa4f9c315..04a05ffa1 100644 --- a/handbook/computing/repos.html +++ b/handbook/computing/repos.html @@ -14,7 +14,7 @@ body {

CUCC Expedition: Online repositories

Version-controlled repositories

- +git logo

The repositories

All the expo data is contained in 4 repositories or repos at @@ -25,9 +25,18 @@ expo.survex.com:

  • :loser: - the survex cave survey data (not live yet)
  • :drawings: - the tunnel and therion cave data and drawings (git)
  • :expoweb: - the website pages, handbook, generation scripts (git)
    • -
  • :troggle: - the database/software part of the survey data management system - see notes on troggle for further explanation (git)
    • +
  • :troggle: - the database/software part of the survey data management system
    - see notes on troggle for further explanations
    • -

    You can read or clone these without any control, but to write ("push") to them you will need to use and set up the key exchange. + +

    Use the online view of these!

    +

    These online webpages (links above) give a much clearer view of what is going on than many git tools you may be using on your machine. +

    Have a look at the version history of the drawings to look at progress on getting the recent surveys uploaded, and who has been doing what on the website and handbook. +

    For an example, see this simple edit. + + +

    Uploading cave survey data

    + +

    You can read or clone these repos without any control, but to write ("push") to them you will need to use and set up the key exchange.

    So cavers wanting to upload their cave survey data have to use a machine on which they key is already set up. The expo laptop lives in the potato hut during expo and it is sometimes joined by the laptop 'aziraphale'. These are both loaned machines running Linux. If you want to use your own laptop then see the minimal laptop setup. diff --git a/handbook/troggle/tricky-troggle.jpg b/handbook/troggle/tricky-troggle.jpg new file mode 100644 index 000000000..de48c4b22 Binary files /dev/null and b/handbook/troggle/tricky-troggle.jpg differ diff --git a/handbook/troggle/trogintro.html b/handbook/troggle/trogintro.html index 95d3d2315..a15a24bfe 100644 --- a/handbook/troggle/trogintro.html +++ b/handbook/troggle/trogintro.html @@ -8,6 +8,7 @@

    CUCC Expedition Handbook

    Troggle - what it is

    +git logo

    Troggle is the software which runs the the expo cave survey data management and website.

    Troggle - why we developed it

    + +git logo

    Troggle..

    1. Coherently publishes expo data by cave, by expedition, by person, by trip or by survey - without requiring duplicate data entry. @@ -41,6 +43,8 @@ for very quick and urgent changes. [This is the "Edit this page" capability; see for how to use it and how to tidy up afterwards].
    + +

    * "Troggle eats just one very big meal a year."

    Go on to: Troggle architecture
    Return to: Troggle intro