updating tortoise instructions

2025-12-08 14:54:28 +00:00 · 2018-07-25 12:37:11 +02:00
parent c3f7e542b9
commit d22da1691d
4 changed files with 38 additions and 22 deletions
--- a/handbook/tortoise/expoputtyscreen.png
+++ b/handbook/tortoise/expoputtyscreen.png
--- a/handbook/tortoise/expoputtyscreen2.png
+++ b/handbook/tortoise/expoputtyscreen2.png
--- a/handbook/tortoise/expoputtyscreen2b.png
+++ b/handbook/tortoise/expoputtyscreen2b.png
--- a/handbook/tortoise/tortoise-win.htm
+++ b/handbook/tortoise/tortoise-win.htm
@@ -1,42 +1,46 @@
 <html>
 <head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <title>Cambridge University Caving Club Expedition Handbook.</title>
+<link rel="stylesheet" type="text/css" href="../../css/main2.css" />
 </head>
 <body>
-<h1>Windows 7 How-to No.1:<br>TortoiseHg and Putty</h1>
+<h2 id="tophead">CUCC Expedition Handbook</h2>

-<p>Struggling to get TortoiseHg to work on Windows (Service Pack 1,
-32-bit)? Here’s a quick guide which I hope explains how to sort it all
+<body>
+<h1>Windows: TortoiseHg and PuTTy</h1>
+
+<p>Struggling to get TortoiseHg to work on Windows (v7 or v10)? Here’s a quick guide which I hope explains how to sort it all
 out.</p>

-<p>You first want to ascertain that both <a href="http://tortoisehg.bitbucket.io/">TortoiseHg</a> and <a href="http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html">Putty</a> are nicely installed. Then run Putty;</p>
+<p>First download and install both <a href="http://tortoisehg.bitbucket.io/">TortoiseHg</a> 
+and <a href="http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html">PuTTy</a>. Then run PuTTy;</p>

-<h2>Putty:</h2>
-<p>Upon opening putty, you’ll be greeted with a screen similar to this;</p>
+<h2>PuTTy:</h2>
+<p>Upon opening PuTTy, you’ll be greeted with a screen similar to this;</p>

 <div style="text-align: center">
-<img src="expoPuttyscreen.png" alt="Putty Configuration Screen" />
-<p class="caption">Putty Configuration Screen</p></div>
+<img src="expoputtyscreen.png" alt="PuTTy Configuration Screen" />
+<p class="caption">PuTTy Configuration Screen</p></div>

 <p>Type <tt>expo@expo.survex.com</tt> 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
-expo@expo.survex.com each time you use Putty. You simply click on
+expo@expo.survex.com each time you use PuTTy. You simply click on
 'Expo' then 'Load'). Then click 'Open'.</p>

-<p><b>Please note that when connecting to the tatty hut in Austria, you will need to log onto a different server. In this case, type:<tt>expo@expo.potato.hut</tt>, and follow the instructions above.</b></p>
-
-<p>You will then see the following screen:</p>
-
-<div style="text-align: center">
-<img src="expoPuttyscreen2b.png" alt="Putty Login Screen" />
-<p class="caption">Putty Login Screen</p></div>
-
-<p>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.</p>
+<p>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.</p>

 <p>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
-point you select 'hells-to-the-yeah', or equivalent). You have now made sure that your computer is happy to log on using TortoiseHg. To log out of Putty, type 'logout', then press the return/enter key.</p>
+point you select 'hells-to-the-yeah', or equivalent). 
+
+<p>You have now made sure that your computer will be happy to log on using TortoiseHg. 
+To log out of PuTTy, type 'logout', then press the return/enter key.</p>
+
+<p><b>Note that when connecting in the potato hut in Austria</b>, you now use exactly the same procedure.
+

 <h2>TortoiseHg:</h2>

@@ -58,7 +62,6 @@ choose where you want the repository to be created by clicking
 'Browse' next to the 'Destination' box. As far as I recall, you don't
 need to edit anything in the box where it says 'Hg command'. Click 'Clone'!</p>

-<p><b>Again, if logging on from the tatty hut, type:<tt>ssh://expo@expo/loser</tt>to get things to work.</b></p>

 <p>Voila! If you're now looking at the following screen or similar,</p>

@@ -66,9 +69,22 @@ need to edit anything in the box where it says 'Hg command'. Click 'Clone'!</p>
 <img src="expoRepositoryScreen2.png" width="75%" height="50%" alt="Hg Workbench Linked" />
 <p class="caption">Hg Workbench Linked</p></div>

-<p>All is well.</p>
+<p>That will have cloned the /loser/ repository to your laptop. 
+<p>
+If you want to update the handbook or other parts of the website you will also need to clone the /expoweb/ repository. 
+You can scan what's in the repositories (read only) using your web browser:

-<p>If anything seems unclear, please email me at elmo2058@gmail.com, and I will reinstall things on my own machine to see where things get confusing. Watch this space for another webpage/update with how to install/use WINSCP for straightforward file transfers.</p>
+<ul>
+ <li><a href="http://expo.survex.com/repositories/home/expo/loser/graph/">loser</a> - the survex survey data</li>
+ <li><a href="http://expo.survex.com/repositories/home/expo/expoweb/graph">expoweb</a> - the website itself, including generation scripts</li>
+ <li><a href="http://expo.survex.com/repositories/home/expo/tunneldata/graph/">tunneldata</a> - the tunnel (and therion) data and drawings</li>
+ <li><a href="http://expo.survex.com/repositories/home/expo/troggle/graph/">troggle</a> - the database-driven part of the website</li>
+</ul>
+
+
+<p>If anything seems unclear, please email me at elmo2058@gmail.com, and I will reinstall things 
+on my own machine to see where things get confusing. 
+</p>


 <hr />