From 63457dfa2a2ad2b8db305b2d8a731f7962a99e56 Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Thu, 31 Mar 2022 00:34:42 +0100 Subject: [PATCH] removing non UTF8 chars --- handbook/computing/yourlaptop.html | 2 +- handbook/finance.html | 17 +++++++++++------ handbook/putty/putty.html | 14 ++++++++------ handbook/survey/qmentry.html | 2 +- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/handbook/computing/yourlaptop.html b/handbook/computing/yourlaptop.html index 565232111..a46dbb2be 100644 --- a/handbook/computing/yourlaptop.html +++ b/handbook/computing/yourlaptop.html @@ -173,7 +173,7 @@ to Expo Handbook - Surveying section.

  • Drawing Surveys with Therion (Wookey, Compass Points, March 2004) -

  • Therion – Digital Cave Maps Martin Budaj, Stacho Mudrák, 2008) +

  • Therion - Digital Cave Maps Martin Budaj, Stacho Mudrák, 2008)

  • The Therion Book v6.0.4 (2012-11-28)

  • For installing Survex, Tunnel etc. see this page which may be merged in here eventually. diff --git a/handbook/finance.html b/handbook/finance.html index 252a01e9d..5b4f0a79c 100644 --- a/handbook/finance.html +++ b/handbook/finance.html @@ -50,20 +50,25 @@ -

    Expo will undoubtedly change as the years go by; please try to keep these documents up to date, the files in order and ensure a smooth hand-over to your successor. Good luck!

    +

    Expo will undoubtedly change as the years go by; please try to keep these documents up to date, the files in order and ensure a smooth hand-over +to your successor. Good luck!

    Part 1: How Expo is financed (The Theory)

    -

    Expo is ongoing. Each year's Expo inherits equipment and a little money from its predecessor; similarly, we should leave next year's Expo a reasonable stock of equipment and 'float' money.

    +

    Expo is ongoing. Each year's Expo inherits equipment and a little money from its predecessor; similarly, we should leave next year's Expo a +reasonable stock of equipment and 'float' money.

    Income and Expenditure

    -

    The money to run Expo comes from two sources: principally from each year's participants, and secondarily through grants from bodies such as the Ghar Parau Foundation. In addition, numerous companies have provided sponsorship, mainly in the form of food.

    +

    The money to run Expo comes from two sources: principally from each year's participants, and secondarily through grants from bodies such as the +Ghar Parau Foundation. In addition, numerous companies have provided sponsorship, mainly in the form of food.

    -

    Most Expo costs are paid in the UK and 'in the field' by members of Expo. All these expenses during expo are recorded in the Expo Bier Book and Sesh Book - usually in euros. -After the expedition, the Expo treasurer processes this data to work out who owes and who is owed money. Everyone settles up before the next Expo (hopefully!).

    +

    Most Expo costs are paid in the UK and 'in the field' by members of Expo. All these expenses during expo are recorded in the Expo Bier Book and Sesh Book - usually in euros. +After the expedition, the Expo treasurer processes this data to work out who owes and who is owed money. Everyone settles up before the next Expo +(hopefully!).

    Expo incurs cost in the following areas:

    @@ -96,7 +101,7 @@ it before obtaining the expedition treasurer's agreement.
  • Fill in the relevant pages of the Bier Book fastidiously.
  • Where possible, enter details of your expenses on the Expo computer.
  • Leave money when you leave Austria in order to cover your share of the campsite bill.
    • -
  • Pay your bill within a reasonable timeframe after the accounts are finalized.
    • +
  • Pay your bill within a reasonable timeframe after the accounts are finalized.
    • diff --git a/handbook/putty/putty.html b/handbook/putty/putty.html index 6c30fe2a3..83c559737 100644 --- a/handbook/putty/putty.html +++ b/handbook/putty/putty.html @@ -19,7 +19,7 @@ To get the keys set up on the server you will have to wait for an already-authen

    First download and install PuTTy. Then run PuTTy;

    PuTTy:

    -

    Upon opening PuTTy, you’ll be greeted with a screen similar to this;

    +

    Upon opening PuTTy, you'll be greeted with a screen similar to this;

    PuTTy Configuration Screen @@ -27,12 +27,12 @@ To get the keys set up on the server you will have to wait for an already-authen

    Type expo@expo.survex.com into the box under Host Name, and type a name into the box under 'Saved Sessions' then click 'Save' (in the -above case called 'Expo' – this means you don’t have to type in +above case called 'Expo' – this means you don't have to type in expo@expo.survex.com each time you use PuTTy. You simply click on 'Expo' then 'Load'). Then click 'Open'.

    -

    Don’t worry if you can’t see anything happening onscreen as you type in the password, -this is what’s supposed to happen; so just type in the password and press the return/enter key.

    +

    Don't worry if you can't see anything happening onscreen as you type in the password, +this is what's supposed to happen; so just type in the password and press the return/enter key.

    Done! At some point you may come across a Windows popup which asks you to verify the address you're attempting to log into (at which @@ -41,10 +41,12 @@ point you select 'hells-to-the-yeah', or equivalent).

    You have now made sure that your computer will be happy to log on to the server once you have the keys set up (be sure to use the Windows instructions for this, not the Linux of Windows WSL instructions). To log out of PuTTy, type 'logout', then press the return/enter key.

    -

    pagegent

    -

    pagegent is installed along with PuTTy and is what you need to keep your Windows machine talking nicely to the expo server. See pagengt config for how to do this. +

    pageant

    +

    pageaent is installed along with PuTTy and is what you need to keep your Windows machine talking nicely to the expo server. See pagengt config for how to do this.

    Now return to the key-pair setup instructions for how to configure the keys using PuTTy. +

    Alternative: OpenSSH

    +

    There is a recent alternative: use OpenSSH which is now part of Windows 10. See WinLaptop config. But you need to read that anyway.

    diff --git a/handbook/survey/qmentry.html b/handbook/survey/qmentry.html index db7a3f129..c833564e1 100644 --- a/handbook/survey/qmentry.html +++ b/handbook/survey/qmentry.html @@ -30,7 +30,7 @@ compared to including QMs only in survey drawings in Tunnel or writing a cave description then putting it on the expo website.

    Svx files are a very stable place to store the data long- -term: there is no need to rely on a ‘master file' of any kind, which can be problematic if not everyone +term: there is no need to rely on a 'master file' of any kind, which can be problematic if not everyone on expo has the same level of computer literacy, and requires just basic text entry to create and update the data after a trip.