From e07733b1485e7f4ef53cfe2d196d7693530892c8 Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@gmail.com>
Date: Tue, 17 Jun 2025 15:33:44 +0100
Subject: [PATCH] updated openssl for windows and a few other bits - online
 edit of handbook/computing/winlaptop.html

---
 handbook/computing/winlaptop.html | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/handbook/computing/winlaptop.html b/handbook/computing/winlaptop.html
index f7defe80e..1921aa7bb 100644
--- a/handbook/computing/winlaptop.html
+++ b/handbook/computing/winlaptop.html
@@ -43,20 +43,26 @@
 
 <h3>Software</h3>
 <ul>
-<li>Key management, either PuTTY or OpenSSH. You need one of these to generate and to use ssh keys on Windows. Otherwise none of git, scp, ftp (or rsync) will work. 
+<li>Key management, either PuTTY or openSSH (aka openssl). You need one of these to generate and to use ssh keys on Windows. Otherwise none of git, scp, ftp (or rsync) will work. 
   
 <ul>
 <li><a href="https://docs.microsoft.com/en-us/windows-server/administration/openssh/openssh_overview">OpenSSH for Windows</a> is new (fully working since 2021). <br>
-- Use the Microsoft documented install method which puts the executables in <var>windows\system32\openssh\</var>.
-  <br> See also <a href="https://learn.microsoft.com/en-us/windows-server/administration/openssh/openssh_overview">https://learn.microsoft.com/... openssh_overview</a>
-<br>
-  - We need a volunteer to produce documentation on installing and using <a href="https://medium.com/swlh/installing-openssl-on-windows-10-and-updating-path-80992e26f6a1">OpenSSL/Windows</a>. Currently all our Windows documn. used PuTty and all our Linux documentaiotn uses OpenSSL. See also <a href="https://think.unblog.ch/en/how-to-install-openssl-on-windows-10-11/">how-to-install-openssl-on-windows-10-11/</a>.
+  - Use the Microsoft documented install method which puts the executables in <var>windows\system32\openssh\</var>. <br />
+  After reading that, follow the link at the bottom to<br />
+  <a href="https://learn.microsoft.com/en-us/windows-server/administration/OpenSSH/openssh_install_firstuse?tabs=gui&pivots=windows-server-2019">OpenSSH/openssh_install_firstuse</a> <br />which will pre-select you as looking for Windows Server 2019 - but this is fine, further down the page it will say that this is for Windows 10 (and 11, implicitly) under the "GUI" tab.
+
+<br><br>
+  - We need a volunteer to complete the documentation on installing and using <a href="https://medium.com/swlh/installing-openssl-on-windows-10-and-updating-path-80992e26f6a1">OpenSSL/Windows</a>. Currently all our Windows documn. used PuTty and all our Linux documentation uses OpenSSL. See also <a href="https://think.unblog.ch/en/how-to-install-openssl-on-windows-10-11/">how-to-install-openssl-on-windows-10-11/</a>.
 <br>
 - We haven't got documentation for using OpenSSL with Filezilla yet. Please write it if you do this.
-<br> OpenSSL integrates well with Github for Windows. <br>
-<li><a href="../putty/putty.html">PuTTY</a> It includes command line tools ssh, scp 
-(pscp) and sFTP (psftp). The <a href="https://www.chiark.greenend.org.uk/~sgtatham/putty/latest.html">PuTTY</a> installation includes puttygen and  pagent which you also need. Version 0.83 was released on 2025-02-08. 
+<br> OpenSSL integrates well with Github for Windows. <br><br>
+  
+<li><a href="../putty/putty.html">PuTTY</a> - use this if you already are using it, otherwise use openssl as above.  PuTTY includes command line tools ssh, scp 
+(pscp) and sFTP (psftp). The <a href="https://www.chiark.greenend.org.uk/~sgtatham/putty/latest.html">PuTTY</a> installation includes puttygen and  pagent which you would also need. Version 0.83 was released on 2025-02-08. <br>
+  <a href="/expofiles/documents/idiots-guide-expo-git.pdf">Brendan's git guide</a> includes PuTTY setup.
 </ul>
+  <li>You need to install git. Simplest is to follow the instructions for the command line version at <a href=" https://git-scm.com/downloads/win"> https://git-scm.com/downloads/win</a> and then separately install a GUI to help you see what is going on:
+    <ul>
   
   <li><a href="https://desktop.github.com/">GitHub Desktop for Windows</a> - yes this works with the expo server git even though we don't use GitHub itself for expo software.
 	<li><a href="https://code.visualstudio.com/">VS Code</a> is a free (but not FOSS) editor with in-built git capability and plug-ins ("Git History", 
@@ -64,6 +70,7 @@
    <li><a href="https://gitforwindows.org/">Git for Windows</a> - not as simple to use as it looks
    <li><a href="https://www.gitkraken.com/">GitKraken</a> - Very pretty GUI interface to git, also Linux version. 
     Times-out for our server unless you buy it but free for university people.
+      </ul>
 <li><a href="https://winscp.net/eng/download.php">WinScp</a> can be used as an alternative to Filezilla if you like (like Filezilla, it uses PuTTY ssh keys). It has a <a href="https://winscp.net/eng/docs/screenshots">GUI</a> similar to Filezilla
 
 <li><a href="https://www.java.com/en/">java</a> - needed for GPSprune and CaveConverter. Has to be <a href="https://www.java.com/en/download/windows_manual.jsp?host=java.com&locale=en-GB">installed separately</a> on a Windows machine.