John Snow <[email protected]> writes:

> These are either structs or unions that are used in an inlinable
> context: i.e. the generated documentation is likely to feature a
> version of this documentation block that does not include the intro in
> context of another command, event, or structure.
>
> Signed-off-by: John Snow <[email protected]>
> ---
>  qapi/machine.json | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/qapi/machine.json b/qapi/machine.json
> index 0516112f8e8..13875fc4642 100644
> --- a/qapi/machine.json
> +++ b/qapi/machine.json
> @@ -449,8 +449,7 @@
>  
>  ##
>  # @NumaOptions:
> -#
> -# A discriminated record of NUMA options.  (for OptsVisitor)
> +#     A discriminated record of NUMA options.  (for OptsVisitor)
>  #
>  # @type: NUMA option type
>  #

Trivial conflict with my "[PATCH 1/2] qapi/machine: Drop misleading (for
OptsVisitor) doc".  I'll take care of it.


Reply via email to