qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Daniel P. Berrangé" <berrange@redhat.com>
To: Stefan Hajnoczi <stefanha@gmail.com>
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
	"Eduardo Habkost" <ehabkost@redhat.com>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	qemu-devel <qemu-devel@nongnu.org>,
	"Michael Roth" <mdroth@linux.vnet.ibm.com>,
	"Stefan Hajnoczi" <stefanha@redhat.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"John Snow" <jsnow@redhat.com>
Subject: Re: QEMU HTML documentation now on qemu.org
Date: Thu, 7 Nov 2019 16:01:42 +0000	[thread overview]
Message-ID: <20191107160142.GH120292@redhat.com> (raw)
In-Reply-To: <CAJSP0QX6awKBSx_idYfXB85e09Tp6gKLRvO+zrk-+zrOiySC-w@mail.gmail.com>

On Thu, Nov 07, 2019 at 04:44:34PM +0100, Stefan Hajnoczi wrote:
> On Thu, Nov 7, 2019 at 11:07 AM Daniel P. Berrangé <berrange@redhat.com> wrote:
> >
> > On Wed, Nov 06, 2019 at 05:19:28PM +0100, Stefan Hajnoczi wrote:
> > > Hi,
> > > You can now access the latest QEMU HTML documentation built from
> > > qemu.git/master nightly at:
> > >
> > >   https://wiki.qemu.org/docs/qemu-doc.html
> > >   https://wiki.qemu.org/docs/qemu-qmp-ref.html
> > >   https://wiki.qemu.org/docs/qemu-ga-ref.html
> > >   ...as well as interop/ and specs/
> > >
> > > Feel free to link to the documentation from the QEMU website and/or
> > > wiki!
> >
> > What's the reason for putting on wiki.qemu.org URL ? It feels like
> > having it under www.qemu.org would be a more natural home, especially
> > if we can then make it pick up the jekyll theme around the pages.
> >
> > Ideally we should publish the docs under versioned URL when we
> > make a release. eg  /docs/latest/....  for current GIT master
> > which I presume the above is tracking, and then a /docs/$VERSION/...
> > for each major release we cut.
> >
> > That way users can get an accurate view of features in the QEMU
> > they are actually using.
> 
> Versioned release docs should be generated during the release process.
> I have CCed Mike Roth.  That way the docs are available as soon as the
> release drops.  This container image only runs once a day and would
> leave a window when users cannot access the docs yet.
> 
> Moving from wiki.qemu.org should be possible.  How does the jekyll
> theme you mentioned work?

IIUC, when there's a push to the qemu-web.git repo, some git hook (?)
runs on the server which invokes jekyll to build the content, and
then publish it to the webroot.

To integrate these docs into that we need something along the lines
of:

  1. Generate the HTML files as you do now
  2. Copy them into the qemu-web.git in a /docs/ subdir
  3. Prepend a magic header to make jeykll process the file

     ---
     permalink: /docs/qemu-doc
     ---

  4. Trigger the jekyll builder to refresh the generated docs
  5. Publish the docs to the webroot

You can see what I did here  as an example where I simply committed
the generated docs to qemu-web.git:

  https://www.mail-archive.com/qemu-devel@nongnu.org/msg578110.html

If we're not storing the generated docs in git, then when
pushing to qemu-web.git we need to ensure we preserve the
extra /docs dir content in some manner.

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|



  reply	other threads:[~2019-11-07 16:03 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-06 16:19 QEMU HTML documentation now on qemu.org Stefan Hajnoczi
2019-11-07  9:29 ` Stefan Hajnoczi
2019-11-07 16:04   ` Peter Maydell
2019-11-07 10:06 ` Daniel P. Berrangé
2019-11-07 15:44   ` Stefan Hajnoczi
2019-11-07 16:01     ` Daniel P. Berrangé [this message]
2019-11-08  8:41       ` Stefan Hajnoczi
2019-11-08  9:29         ` Paolo Bonzini
2019-11-08  9:45         ` Daniel P. Berrangé
     [not found] <mailman.2098.1573202511.13329.qemu-devel@nongnu.org>
2019-11-15 14:05 ` G 3
2019-11-21 12:51   ` Stefan Hajnoczi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191107160142.GH120292@redhat.com \
    --to=berrange@redhat.com \
    --cc=alex.bennee@linaro.org \
    --cc=ehabkost@redhat.com \
    --cc=jsnow@redhat.com \
    --cc=mdroth@linux.vnet.ibm.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@gmail.com \
    --cc=stefanha@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).