Updates to manual (2nd try)
dirk at hohndel.org
Thu Dec 5 14:14:57 UTC 2013
On Thu, 2013-12-05 at 11:01 -0800, Dirk Hohndel wrote:
> On Thu, 2013-12-05 at 20:52 +0200, Willem Ferguson wrote:
> > Here is what I did to become synchronised with master:
> > I cloned master to ensure I have a clean copy SHA g441838def098, that
> > includes spelling corrections by Sergey Starosek.
> > I used the user-manual.txt from that clone and re-did the changes I had
> > made previously (not too difficult, I have several backups).
> > I committed these changes.
> > I hope this brings the user-manual back in sync.
> > I cannot add the asciidoc theme :
> > $ git add /etc/asciidoc/themes/compact_wf/compact_wf.css
> > fatal: '/etc/asciidoc/themes/compact_wf/compact_wf.css' is outside
> > repository
> copy it under Documentation and add it there. We'll figure out how to
> make use of it :-)
> > I want to experiment with the instructions as per previous message to
> > make sure I understand what I am doing.
> > My last copy of user-manual text looks more like a diff file than a
> > source file, I am sure due to finger trouble and someone that only
> > half-understands what he is doing with git. I hope its ok now.
> My guess is this is a failed merge?
> I actually just completed my own merge of your last submission, so I can
> easily compare them. But that won't happen for another two hours :-(
Finally done and pushed...
Please resync and send us the latest version of the CSS file you want us
More information about the subsurface