[qemu-web PATCH v2] Update the documentation links to point to our generated docs

[qemu-web PATCH v2] Update the documentation links to point to our generated docs

[Thomas Huth]

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

Re: [qemu-web PATCH v2] Update the documentation links to point to our generated docs

[Peter Maydell]

On Mon, 3 Feb 2020 at 14:14, Thomas Huth <thuth@redhat.com> wrote:
>
> 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

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

thanks
-- PMM

Re: [qemu-web PATCH v2] Update the documentation links to point to our generated docs

[Thomas Huth]

On 03/02/2020 15.34, Peter Maydell wrote:
> On Mon, 3 Feb 2020 at 14:14, Thomas Huth <thuth@redhat.com> wrote:
>>
>> 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
> 
> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

Thanks, pushed now: https://www.qemu.org/documentation/

 Thomas