From 051d7dd6ac15ad2784aba02e51a548a9ec6f0f13 Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@klebos.com>
Date: Sat, 5 Mar 2022 13:19:50 +0000
Subject: [PATCH] Edit this page

---
 handbook/computing/hbmanual1.html | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/handbook/computing/hbmanual1.html b/handbook/computing/hbmanual1.html
index 4e8bb18fb..552a589e9 100644
--- a/handbook/computing/hbmanual1.html
+++ b/handbook/computing/hbmanual1.html
@@ -91,12 +91,14 @@ t/ - a thumbnail image which is usually used inside an &lt;a&gt; tag to link to
 </ul>
 
 <hr />
-<h3 id="tidy">Tidying up and commiting the edits</h3>
-<p>'Edit This Page' edits the file served on the web 
+<h3 id="tidy">Tidying up and committing the edits</h3>
+<p>'Edit This Page' edits the file served on the web, saves it, adds it to the list of proposed git updates, then finally does the git 'commit' on the server. Things can go wrong at each step of the process.
 
-If the version control update fails, your edits will be saved and you will see them ont he 
-website but <em>they will be lost later</em> if you do not get a nerd to update the file in the version control
-<a href="../computing/repos.html">repository</a>. To properly finish the job you need to get a nerd to
+<p>Specific error message pages are produced if the file cannot be saved (usually a permissions error), if it cannot be added to git's list, or if the git commit fails (which would be due to a merge failure on a previous commit attempt).
+
+<p>If the version control commit fails, your edits will be saved and you will see them on the 
+website but <em>they will be lost later</em> if you do not get a nerd to fix the version control
+<a href="../computing/repos.html">repository</a> properly. To properly finish the job you need to get a nerd to
 <ul>
 <li>
 ssh into expo@expo.survex.com from a machine already configured to do this 
@@ -111,7 +113,7 @@ you into an emacs editing window (C-x C-C is the way to exit emacs). Instead, us
 <code>git commit -m "changed topcamp phone number - myName" </code>
 which submits the obligatory comment with the commit operation. You should write something informative and brief about your changes between the quotation marks and also give your full name.
 </ul>
-<p>We hope to make this issue go away by integrating triggers, but it is a low priority (April 2021).
+<p>The same 'save/git-add/git-commit' process happens when uploading drawings files or when editing survex files online.
 <hr />
 <p>Go on to <a href="hbmanual2.html">Editing several pages</a><br />
 Return to <a href="onlinesystems.html">Online systems overview</a>