[SCM] Samba Shared Repository - branch master updated - ca44340891d60de7e48bb263c7debd45cc3f3ed0

[Jelmer Vernooij]

On Wed, Oct 01, 2008 at 06:35:40PM +0200, Volker Lendecke wrote:
> On Wed, Oct 01, 2008 at 11:25:22AM -0500, Jelmer Vernooij wrote:
> > - Log -----------------------------------------------------------------
> > commit ca44340891d60de7e48bb263c7debd45cc3f3ed0
> > Author: Jelmer Vernooij <jelmer at samba.org>
> > Date:   Wed Oct 1 18:06:55 2008 +0200

> >     Fix some syntax errors for use with ReST.

> > -----------------------------------------------------------------------

> > Summary of changes:
> >  lib/talloc/talloc_guide.txt |   43 ++++++++++++++++++++++++++-----------------
> >  1 files changed, 26 insertions(+), 17 deletions(-)


> > Changeset truncated at 500 lines:

> > diff --git a/lib/talloc/talloc_guide.txt b/lib/talloc/talloc_guide.txt
> > index 18663b3..3201fe6 100644
> > --- a/lib/talloc/talloc_guide.txt
> > +++ b/lib/talloc/talloc_guide.txt
> > @@ -1,5 +1,7 @@
> >  Using talloc in Samba4
> > -----------------------
> > +======================
> > +
> > +.. contents::

> >  Andrew Tridgell
> >  September 2004
> > @@ -18,7 +20,7 @@ get used to it.
> >  Perhaps the biggest change from Samba3 is that there is no distinction
> >  between a "talloc context" and a "talloc pointer". Any pointer
> >  returned from talloc() is itself a valid talloc context. This means
> > -you can do this:
> > +you can do this::

> Aeh, is this now necessary? That makes the text file a bit
> cluttered, and 100% people will forget it, me first.
No, nothing requires that such a syntax is used. We didn't adopt this 
officially, I just rearranged some things in the existing text file to make 
ReST happier - I won't blame anybody for breaking it.

Even so, it's pretty hard to make ReST unhappy - if it doesn't 
understand a particular syntax, it'll just warn about it and keep things 
monotype in the output file. 

I can remove the ".. contents::" line if it's bothering people, other
than that there should be nothing that clutters the text file. 

(an example of a generated HTML file with ReST from
prog_guide4.txt is at http://samba.org/~jelmer/prog_guide4.html)

Cheers,

Jelmer