couchdb-dev mailing list archives

squashing is a noble art form that I strongly encourage. We don't need to see every minor
tweak or mistake. The purpose of history is to inform.
B.
On 12 Aug 2012, at 23:48, Paul Davis wrote:
> Looks pretty good. Only thing I see is if we shouldn't strip out the
> share/docs/DocKit directory on import. If we do that and reorder Jan's
> commit to after Dave's last commit we can get away without any import
> beyond the original XML sources.
>
> I'm mostly just concerned about how much data we're adding to the repo
> that will only exist for a few commits though it might also help us
> side step some legal issues if we just pull the CouchBase XML instead
> of all that code as well.
>
> On Sun, Aug 12, 2012 at 7:05 AM, Noah Slater <nslater@tumbolia.org> wrote:
>> Woo, sounds good Dave. I'll wait for Paul, Bob, and Dirkjan to weigh in.
>>
>> On Sun, Aug 12, 2012 at 8:39 AM, Dave Cottlehuber <dave@muse.net.nz> wrote:
>>
>>> On 9 August 2012 17:35, Paul Davis <paul.joseph.davis@gmail.com> wrote:
>>>>
>>>> I'd like to cross the i's and dot the t's on the legal bits here. The
>>>> only stuff I can find on CC licenses is at [1] which talks about
>>>> unmodified and mentions that we may need the appropriate README/NOTICE
>>>> updates. We may also want to look at the size of the contribution and
>>>> maybe get a code grant thinger (again, docs vs code, no idea on
>>>> precedent).
>>>>
>>>> Let me know if you want to head up that discussion or if I should
>>>> start a thread for it.
>>>>
>>>> [1] http://www.apache.org/legal/resolved.html#cc-sa
>>>
>>> Paul, fine with me, I'll pick it up.
>>>
>>> I rebased, squashed, merged & abused people's commits so now we have just
>>> 5:
>>>
>>> https://github.com/dch/couchdb/commits/merge_docs
>>>
>>> - Brian Mitchell - import CB docs
>>> - Jan - hook up futon & makefiles
>>> - Dave - fix perl scripts for export
>>> - Dirkjan - turn into sphinx project, set up chapters
>>> - Alex Shorin - massive clean up
>>> - Dave - tweak a few things (JSON highlighting, set version to 1.3.x)
>>>
>>> Let me know if that's OK with y'all.
>>>
>>> A+
>>> Dave
>>>
>>
>>
>>
>> --
>> NS