All of lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Peter Maydell <peter.maydell@linaro.org>
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	"Stefan Hajnoczi" <stefanha@redhat.com>
Subject: [qemu-web PATCH v2] Update the documentation links to point to our generated docs
Date: Mon,  3 Feb 2020 15:13:46 +0100	[thread overview]
Message-ID: <20200203141346.11790-1-thuth@redhat.com> (raw)

We are now providing the generated QEMU documentation files directly
on our www.qemu.org webserver, so we should link to these files now.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 v2: Do not link to qemu-doc anymore, use the index page instead

 _includes/footer.html |  2 +-
 documentation.md      | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/_includes/footer.html b/_includes/footer.html
index 1669ef7..b71663b 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -14,7 +14,7 @@
 		</ul>
 		<ul class="style">
 			<li><a href="/documentation">Documentation</a></li>
-			<li><a href="https://qemu.weilnetz.de/qemu-doc.html">Manual</a></li>
+			<li><a href="https://www.qemu.org/docs/master/">Main docs</a></li>
 			<li><a href="https://wiki.qemu.org/Category:Developer_documentation">Developer docs</a></li>
 			<li><a href="https://wiki.qemu.org/">Wiki</a></li>
 		</ul>
diff --git a/documentation.md b/documentation.md
index f4ef9f4..bb3cc82 100644
--- a/documentation.md
+++ b/documentation.md
@@ -3,9 +3,14 @@ title: QEMU documentation
 permalink: /documentation/
 ---
 
-The [QEMU user manual](https://qemu.weilnetz.de/qemu-doc.html) can be read online, courtesy of Stefan Weil.
-More documentation is found in the <a href="https://git.qemu.org/?p=qemu.git;a=tree;f=docs;hb=master">`docs`</a>
-directory of the QEMU git tree.
+The [main documentation section](https://www.qemu.org/docs/master/)
+is the first place to go in case you have questions about using QEMU.
+
+Most of the documentation is generated automatically from the QEMU git source
+tree, however some text files have not been converted to the new format yet.
+These documentation files can be browsed via the
+[git web interface](https://git.qemu.org/?p=qemu.git;a=tree;f=docs;hb=master)
+instead.
 
 The [QEMU wiki](https://wiki.qemu.org) contains more
 [user documentation](https://wiki.qemu.org/Category:User_documentation) and
-- 
2.18.1



             reply	other threads:[~2020-02-03 14:14 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-03 14:13 Thomas Huth [this message]
2020-02-03 14:34 ` [qemu-web PATCH v2] Update the documentation links to point to our generated docs Peter Maydell
2020-02-03 14:39   ` Thomas Huth

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=20200203141346.11790-1-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=alex.bennee@linaro.org \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.