Status of docs merge to 3.0

Jelmer Vernooij jelmer at
Mon Feb 10 17:54:56 GMT 2003

On Mon, Feb 10, 2003 at 10:35:52AM -0600, Gerald (Jerry) Carter wrote about 'Re: Status of docs merge to 3.0':
> On 1 Feb 2003, Andrew Bartlett wrote:

> > I've been doing a few doc updates in HEAD, and was about to merge them
> > to 3.0 - but I'm not quite sure what the status is, given we seem to
> > have a slightly different syntax in HEAD (XML compliant?)

> > So, should I just merge my text changes, or wait for the lot to be
> > merged or?

> Jelmer?

> I think it is probably ok to wait on the docs since HEAD is truth
> here.  The only problem will be documentation parameters that are 
> in HEAD that have not (or will not) be merged to 3.0 (e.g. the client 
> ntlmv2 stuff you are working on now).

> Jelmer might have a different idea though.  I'll let him lead.
I'll finish merging ab's XML changes and then do a merge between
3.0 and HEAD. I'll make sure all the docs for the HEAD-only params won't get 
merged to 3.0 (the script can actually help with

Jelmer Vernooij                                      <jelmer at>
Pending (unfinished) patches               
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url :

More information about the samba-technical mailing list