[PATCH] Expansion of user-manual

[Dirk Hohndel]

On Sat, 2013-11-30 at 19:46 +0200, Willem Ferguson wrote:
> Yes, I am aware of the discrepancies with respect to current graphics. 
> The interface for entering the equipment information has also changed 
> somewhat. That is definitely a "to do" item. The whole text requires a 
> careful re-read to improve readability and consistency.

Agreed

> I saw the other 2 patches, in fact they sit here on my machine. As I 
> understand, these are the patches that were submitted after the last 
> push. But, because I experimented with the process a bit before finally 
> submitting the manual updates, they are a mess:
> 
> * 0001-Latest-snapshot-of-translations.patch
> * 0001-Latest-source-strings-for-translations.patch
> 0001-Turn-off-dive-location-edit-hint-when-cancelling-div.patch
> 0002-Latest-snapshot-of-translations.patch
> * 0002-Turn-off-dive-location-edit-hint-when-cancelling-div.patch
> x 0002-Update-of-user-manual-with-several-new-sections-adde.patch
> 0003-Turn-off-dive-location-edit-hint-when-cancelling-div.patch
> + 0003-Update-of-user-manual-with-several-new-sections-adde.patch
> x 0003-Update-to-user-manual-adding-several-sections-and-so.patch

So the ones with a * are all patches that are in the repository. 
You didn't need to send those :-)

> The ones that I did NOT mark with a x are the ones you refer to. But I 
> assumed they are already in the main repository?? I attach the three 
> files marked with an asterisk above (the numbering is not consistent, 
> one has to use the timestamp on the files to understand the order). The 
> one marked with a + is just part of the preliminary experiments that I did.

What I appear to be missing is part of your manual. But maybe I'm wrong.
Here's what I'll do. I'll apply the patch that you send the other day -
that way you can see all that I have. And then you can compare what's in
master with what's in your repository.

I don't know if you made a new branch for your edits to the manual. If
not, here's an easy way to do this.

In the directory you have been working on and that has the latest and
greatest of your manual, do this:

git checkout -b userManualChanges

the '-b' is important

now go back to master and make sure that it's really what I have on my
machine

git checkout master
git reset --hard 5948aa565003
git pull upstream master

so now you have a good state of master, and the latest of your
documentation.

now try

git format-patch master..userManualChanges

the output should be what you have in your tree that's not in mine.
Send me those files, please.
If you are unsure which ones they are, you could remove the old
000*.patch files first before running git format-patch.

I hope this helps

/D