Updates to user manual

Dirk Hohndel dirk at hohndel.org
Mon Dec 2 07:52:03 UTC 2013


On Mon, 2013-12-02 at 17:21 +0200, Willem Ferguson wrote:
> Every time I clone the master, I have to delete the subsurface directory 
> first. So I keep my master copy of the manual elsewhere in a 
> Documentation directory that I copy _in toto_ to the subsurface 
> directory to replace the directory that came with the master. Once this 
> is complete then I do git format-patch.

You're doing it wrong. :-)

You clone master ONCE.

Then you just say

git pull upstream master

And it pulls in the latest changes

What makes things even easier, is if you make your local changes in a
different branch.

> The manual you pushed was the latest one I sent. I plan to tweak the 
> Makefile a bit to achieve some small changes in formatting.

Your patch completely removed the Makefile... I decided to drop that
part :-)

>  For 
> instance, it is not optimal to have serif as well as sans serif text in 
> the same document.

Right. I actually remember you sending a style file and never followed
up on that. Should I just add that or are you planning to send this
correctly integrated in a future patch?

> I am continuously working with the manual and will send incremental ones 
> at least every week.

Can I ask you to send your progress daily? It's very hard for others to
work with you if you don't send your edits quite frequently. Especially
on a plain text document like this.

Ideally send things at least at the end of every day (your time - you
are in South Africa, correct?)

Thanks

/D


> On 02/12/2013 16:57, Dirk Hohndel wrote:
> > On Mon, 2013-12-02 at 09:24 +0200, Willem Ferguson wrote:
> >> Attached patches for updates. I have taken lightly-edited text from the
> >> previous manual regarding imports of data from other databases e.g. JDive.
> >>
> >> I suspect previous problems were mine, since I use a double-directory
> >> system because the subsurface directory get deleted frequently.
> > Why does it get deleted frequently?
> >
> > I found one documentation patch among the three, applied it and pushed
> > it out.
> >
> > If you pull a clean tree from git, does it now have the same content for
> > the Documentation folder that your tree does?
> >
> > /D
> >
> >
> 




More information about the subsurface mailing list