Build all docs in a single manual

[PATCH v2 1/2] docs: Add qemu-storage-daemon(1) manpage to meson.build

Posted by Peter Maydell 5 years, 1 month ago

In commit 1982e1602d15 we added a new qemu-storage-daemon(1) manpage.
At the moment new manpages have to be listed both in the conf.py for
Sphinx and also in docs/meson.build for Meson. We forgot the second
of those -- correct the omission.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 docs/meson.build | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/meson.build b/docs/meson.build
index 71641b4fe07..fae9849b79b 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -62,6 +62,7 @@ if build_docs
         'qemu-img.1': (have_tools ? 'man1' : ''),
         'qemu-nbd.8': (have_tools ? 'man8' : ''),
         'qemu-pr-helper.8': (have_tools ? 'man8' : ''),
+        'qemu-storage-daemon.1': (have_tools ? 'man1' : ''),
         'qemu-trace-stap.1': (config_host.has_key('CONFIG_TRACE_SYSTEMTAP') ? 'man1' : ''),
         'virtfs-proxy-helper.1': (have_virtfs_proxy_helper ? 'man1' : ''),
         'virtiofsd.1': (have_virtiofsd ? 'man1' : ''),
-- 
2.20.1

Re: [PATCH v2 1/2] docs: Add qemu-storage-daemon(1) manpage to meson.build

Posted by Philippe Mathieu-Daudé 5 years, 1 month ago

On 1/8/21 5:14 PM, Peter Maydell wrote:
> In commit 1982e1602d15 we added a new qemu-storage-daemon(1) manpage.
> At the moment new manpages have to be listed both in the conf.py for
> Sphinx and also in docs/meson.build for Meson. We forgot the second
> of those -- correct the omission.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

> ---
>  docs/meson.build | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/docs/meson.build b/docs/meson.build
> index 71641b4fe07..fae9849b79b 100644
> --- a/docs/meson.build
> +++ b/docs/meson.build
> @@ -62,6 +62,7 @@ if build_docs
>          'qemu-img.1': (have_tools ? 'man1' : ''),
>          'qemu-nbd.8': (have_tools ? 'man8' : ''),
>          'qemu-pr-helper.8': (have_tools ? 'man8' : ''),
> +        'qemu-storage-daemon.1': (have_tools ? 'man1' : ''),
>          'qemu-trace-stap.1': (config_host.has_key('CONFIG_TRACE_SYSTEMTAP') ? 'man1' : ''),
>          'virtfs-proxy-helper.1': (have_virtfs_proxy_helper ? 'man1' : ''),
>          'virtiofsd.1': (have_virtiofsd ? 'man1' : ''),
>

Re: [PATCH v2 1/2] docs: Add qemu-storage-daemon(1) manpage to meson.build

Posted by Alex Bennée 5 years, 1 month ago

Peter Maydell <peter.maydell@linaro.org> writes:

> In commit 1982e1602d15 we added a new qemu-storage-daemon(1) manpage.
> At the moment new manpages have to be listed both in the conf.py for
> Sphinx and also in docs/meson.build for Meson. We forgot the second
> of those -- correct the omission.
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

> ---
>  docs/meson.build | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/docs/meson.build b/docs/meson.build
> index 71641b4fe07..fae9849b79b 100644
> --- a/docs/meson.build
> +++ b/docs/meson.build
> @@ -62,6 +62,7 @@ if build_docs
>          'qemu-img.1': (have_tools ? 'man1' : ''),
>          'qemu-nbd.8': (have_tools ? 'man8' : ''),
>          'qemu-pr-helper.8': (have_tools ? 'man8' : ''),
> +        'qemu-storage-daemon.1': (have_tools ? 'man1' : ''),
>          'qemu-trace-stap.1': (config_host.has_key('CONFIG_TRACE_SYSTEMTAP') ? 'man1' : ''),
>          'virtfs-proxy-helper.1': (have_virtfs_proxy_helper ? 'man1' : ''),
>          'virtiofsd.1': (have_virtiofsd ? 'man1' : ''),


-- 
Alex Bennée