From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58354) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzKdI-0006lP-Dv for qemu-devel@nongnu.org; Wed, 26 Oct 2016 05:36:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bzKdE-0002jd-8t for qemu-devel@nongnu.org; Wed, 26 Oct 2016 05:36:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37542) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bzKdE-0002iS-3z for qemu-devel@nongnu.org; Wed, 26 Oct 2016 05:36:24 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BAB6413A5D for ; Wed, 26 Oct 2016 09:36:22 +0000 (UTC) From: Markus Armbruster References: <20160925181836.18293-1-marcandre.lureau@redhat.com> Date: Wed, 26 Oct 2016 11:36:20 +0200 In-Reply-To: <20160925181836.18293-1-marcandre.lureau@redhat.com> (=?utf-8?Q?=22Marc-Andr=C3=A9?= Lureau"'s message of "Sun, 25 Sep 2016 22:18:25 +0400") Message-ID: <87shrjmoyz.fsf@dusky.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2 00/11] qapi doc generation (whole version, squashed) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?utf-8?Q?Marc-Andr=C3=A9?= Lureau Cc: qemu-devel@nongnu.org Marc-Andr=C3=A9 Lureau writes: > Hi, > > Add a qapi2texi script to generate the documentation from the qapi > schemas. Build various new documentation targets for it: pdf, man, > txt. The 7th patch in this series is a squashed version of the > documentation move from qmp-commands.txt to the schemas. The whole > version (not sent on the ML to avoid spamming) is in the following git > branch: https://github.com/elmarco/qemu/commits/qapi-doc I apologize for the delay in review, in particular since parts of this series rot rather quickly. You already rebased your git branch to commit 4387f56 on master. The branch has PATCH 07 split. The branch doesn't rebase cleanly to current master, but the conflicts are all in the shards of PATCH 07. For review, I applied the patches as sent to current master (commit ede0cbe). Two patches conflict. PATCH 07 "(SQUASHED) qmp-commands docs move to schema" I simply skipped. PATCH 11 "build-sys: make and install the generated schema docs" conflicts with commit 78e8779 "qemu-doc: merge qemu-tech and qemu-doc", but it's easy enough to resolve, and you already did it in your git branch. Next: actual review the patches.