Return-Path: X-Original-To: apmail-couchdb-dev-archive@www.apache.org Delivered-To: apmail-couchdb-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 14F1D995A for ; Wed, 22 Feb 2012 07:35:13 +0000 (UTC) Received: (qmail 27806 invoked by uid 500); 22 Feb 2012 07:35:12 -0000 Delivered-To: apmail-couchdb-dev-archive@couchdb.apache.org Received: (qmail 27623 invoked by uid 500); 22 Feb 2012 07:35:12 -0000 Mailing-List: contact dev-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list dev@couchdb.apache.org Received: (qmail 27613 invoked by uid 99); 22 Feb 2012 07:35:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Feb 2012 07:35:11 +0000 X-ASF-Spam-Status: No, hits=1.5 required=5.0 tests=HTML_MESSAGE,RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of randall.leeds@gmail.com designates 209.85.210.52 as permitted sender) Received: from [209.85.210.52] (HELO mail-pz0-f52.google.com) (209.85.210.52) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Feb 2012 07:35:05 +0000 Received: by dado14 with SMTP id o14so10540434dad.11 for ; Tue, 21 Feb 2012 23:34:44 -0800 (PST) Received-SPF: pass (google.com: domain of randall.leeds@gmail.com designates 10.68.129.162 as permitted sender) client-ip=10.68.129.162; Authentication-Results: mr.google.com; spf=pass (google.com: domain of randall.leeds@gmail.com designates 10.68.129.162 as permitted sender) smtp.mail=randall.leeds@gmail.com; dkim=pass header.i=randall.leeds@gmail.com Received: from mr.google.com ([10.68.129.162]) by 10.68.129.162 with SMTP id nx2mr29971959pbb.94.1329896084181 (num_hops = 1); Tue, 21 Feb 2012 23:34:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=40mpLiUcUSinOPOYO3ti17NCaLdDwBwKDpekEa/F5zo=; b=EQ6Exz6ppFI6qPXCD1XDbJFL4tDM/zictgOzPlOASz6YXKHvF8uFbH6twOu4wfy9d9 qRiMRfEAhCh+rCkcbduuaLPkK8UuNKdV36wVIimGGau2j59F5WlEMT0s3Wste/LXBHSP pBI8PeQOy0tfREWXjEVOGxD7NG0VzSpsU5K8g= MIME-Version: 1.0 Received: by 10.68.129.162 with SMTP id nx2mr24428686pbb.94.1329896084087; Tue, 21 Feb 2012 23:34:44 -0800 (PST) Received: by 10.68.221.98 with HTTP; Tue, 21 Feb 2012 23:34:44 -0800 (PST) Received: by 10.68.221.98 with HTTP; Tue, 21 Feb 2012 23:34:44 -0800 (PST) In-Reply-To: References: Date: Tue, 21 Feb 2012 23:34:44 -0800 Message-ID: Subject: Re: API Docs (finally) From: Randall Leeds To: dev@couchdb.apache.org Cc: MC Brown Content-Type: multipart/alternative; boundary=047d7b10ce2fae244904b9888fa0 X-Virus-Checked: Checked by ClamAV on apache.org --047d7b10ce2fae244904b9888fa0 Content-Type: text/plain; charset=UTF-8 I think it works out fine so long as git commits don't hit upstream until after someone has 'git svn rebase'd them locally and then 'svn dcommit'd them. Otherwise you need to force push the git copy. In other words git commits that have not been pushed to svn are provisional and will have their hashed changed after they hit svn. Nothing prevents us from collaborating in git as long as we push first to svn before using the git-svn copy to push to the canonical git repo. On Feb 21, 2012 9:28 PM, "Paul Davis" wrote: > On Tue, Feb 21, 2012 at 7:07 PM, Jason Smith wrote: > > Jan, easy question: > > > > CouchDB is now in Git, and now there are two additional projects > > people are talking about: the web site and now the documentation. > > > > I wonder if the same repo could host all three projects, with > > dissimilar, independent history trees. (I know the web site has svn > > requirements but most would agree that git-svn is quite excellent > > dealing with this.) > > > > Someone feel free to correct me if I'm wrong, but I think this would > require that our Git repo mirror some form of an SVN url. Plus our > history has been disconnected so we'd have to do some fancy dancing to > get things back in sync. > > So basically, no. But I can't think of a reason that we can't host > both in the Git repo and then write a script that forcibly updates > some random SVN url. Me and Benoit have a very similar setup for > handling all the documentation for Gunicorn (though its based on > GitHub's Pages thing in a branch (but the basic idea is the same). > > > On Wed, Feb 22, 2012 at 3:36 AM, Jan Lehnardt wrote: > >> Hi all, > >> > >> I finally got my act together and prepared the CouchDB API docs that MC > Brown made for Couchbase for your consideration to be added to the project. > >> > >> I put it up on GitHub so you can check it out. > >> > >> The repo is: > >> > >> https://github.com/janl/couchdb-docs > >> > >> To build all docs, you run `make everything`. I put the results on > GitHub Pages. > >> > >> It includes multiple HTML builds with different granularities (single > page, break by section, break by chapter) as well as PDF and ePub versions: > >> > >> Single Page: > http://janl.github.com/couchdb-docs/couchdb-manual-1.1/couchdb-manual.html > >> By Chapter: > http://janl.github.com/couchdb-docs/couchdb-manual-1.1/couchdb-manual.html-dir/index.html > >> By Section: > http://janl.github.com/couchdb-docs/couchdb-manual-1.1/couchdb-manual.html-section/index.html > >> PDF: > http://janl.github.com/couchdb-docs/couchdb-manual-1.1/couchdb-manual.pdf > >> ePub > http://janl.github.com/couchdb-docs/couchdb-manual-1.1/couchdb-manual.epub > >> > >> There's also a CouchDB 1.1. release guide that explains all the new > features in depth: > >> > >> Single Page: > http://janl.github.com/couchdb-docs/couchdb-release-1.1/couchdb-release-1.1.html > >> By Chapter: > http://janl.github.com/couchdb-docs/couchdb-release-1.1/couchdb-release-1.1.html-dir/index.html > >> By Section: > http://janl.github.com/couchdb-docs/couchdb-release-1.1/couchdb-release-1.1.html-section/index.html > >> PDF: > http://janl.github.com/couchdb-docs/couchdb-release-1.1/couchdb-release-1.1.pdf > >> ePub > http://janl.github.com/couchdb-docs/couchdb-release-1.1/couchdb-release-1.1.epub > >> > >> The README.md files outlines the build dependencies. > >> > >> The license is CC 3.0 but we can adapt that to whatever is required. > >> > >> There's a few rough edges, no styling should be obvious and the few > screenshots are using our old Single Server branded Futon, but I don't > consider these things to block adoption. > >> > >> Let me know what you think. I hope you like it! :) > >> > >> (weeee finally!) > >> > >> Cheers > >> Jan > >> -- > >> > > > > > > > > -- > > Iris Couch > --047d7b10ce2fae244904b9888fa0--