Re: Status of docs merge to 3.0

2003-02-10 Thread Jelmer Vernooij
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 sur

Re: Status of docs merge to 3.0

2003-02-10 Thread Gerald (Jerry) Carter
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 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

Re: Status of docs merge to 3.0

2003-02-01 Thread Jelmer Vernooij
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On Saturday 01 February 2003 09:07, 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

Status of docs merge to 3.0

2003-02-01 Thread Andrew Bartlett
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? Andre

merge...

2002-10-24 Thread Stefan (metze) Metzmacher
Hi Jelmer, please merge the recycle patch to 3_0 metze - Stefan "metze" Metzmacher <[EMAIL PROTECTED]>

Re: merge...

2002-10-24 Thread Jelmer Vernooij
On Thu, Oct 24, 2002 at 05:17:10PM +0200, Stefan (metze) Metzmacher wrote about 'merge...': > Hi Jelmer, > please merge the recycle patch to 3_0 Applied. Thanks, Jelmer

Re: sam_ads merge

2002-09-28 Thread Andrew Bartlett
"Stefan (metze) Metzmacher" wrote: > > Hi Andrew, > > I've updated my sam_ads module can you merge the changes to HEAD? Done. Kai: I'll take your sam_passdb stuff in as soon as you like - it's easier to track if we keep it all in CVS. (Yes, the bar o