diff mbox series

[v2,05/30] qga/qapi-schema.json: Fix indent level on doc comments

Message ID 20200213175647.17628-6-peter.maydell@linaro.org
State Superseded
Headers show
Series Convert QAPI doc comments to generate rST instead of texinfo | expand

Commit Message

Peter Maydell Feb. 13, 2020, 5:56 p.m. UTC
The texinfo doc generation doesn't care much about indentation
levels, but we would like to add a rST backend, and rST does care
about indentation.

Make the doc comments more strongly consistent about indentation
for multiline constructs like:

@arg: description line 1
      description line 2

Returns: line one
         line 2

so that there is always exactly one space after the colon, and
subsequent lines align with the first.

This commit is a purely whitespace change, and it does not alter the
generated .texi files (because the texi generation code strips away
all the extra whitespace).  This does mean that we end up with some
over-length lines.

Note that when the documentation for an argument fits on a single
line like this:

@arg: one line only

then stray extra spaces after the ':' don't affect the rST output, so
I have not attempted to methodically fix them, though the preference
is a single space here too.

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

Reviewed-by: Markus Armbruster <armbru@redhat.com>

---
 qga/qapi-schema.json | 62 ++++++++++++++++++++++----------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

-- 
2.20.1

Comments

Markus Armbruster Feb. 14, 2020, 12:36 p.m. UTC | #1
Peter Maydell <peter.maydell@linaro.org> writes:

> The texinfo doc generation doesn't care much about indentation


Let's spell Texinfo with a capital T.

> levels, but we would like to add a rST backend, and rST does care

> about indentation.


Nitpick: an rST *backend* should not care about the doc generator's
*input* format.  We actually intend to change the input format into a
domain-specific dialect of rST, as you state in your cover letter: "This
series switches all our QAPI doc comments over from texinfo format to
rST."

Perhaps:

  The current doc generation doesn't care much about indentation levels,
  but we would like to switch to an rST format, and rST does care about
  indentation.

> Make the doc comments more strongly consistent about indentation

> for multiline constructs like:

>

> @arg: description line 1

>       description line 2

>

> Returns: line one

>          line 2

>

> so that there is always exactly one space after the colon, and

> subsequent lines align with the first.

>

> This commit is a purely whitespace change, and it does not alter the

> generated .texi files (because the texi generation code strips away

> all the extra whitespace).  This does mean that we end up with some

> over-length lines.

>

> Note that when the documentation for an argument fits on a single

> line like this:

>

> @arg: one line only

>

> then stray extra spaces after the ':' don't affect the rST output, so

> I have not attempted to methodically fix them, though the preference

> is a single space here too.

>

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

> Reviewed-by: Markus Armbruster <armbru@redhat.com>


R-by stands even without the commit message improvement I suggested.
Peter Maydell Feb. 14, 2020, 12:40 p.m. UTC | #2
On Fri, 14 Feb 2020 at 12:36, Markus Armbruster <armbru@redhat.com> wrote:
>

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

>

> > The texinfo doc generation doesn't care much about indentation

>

> Let's spell Texinfo with a capital T.

>

> > levels, but we would like to add a rST backend, and rST does care

> > about indentation.

>

> Nitpick: an rST *backend* should not care about the doc generator's

> *input* format.  We actually intend to change the input format into a

> domain-specific dialect of rST, as you state in your cover letter: "This

> series switches all our QAPI doc comments over from texinfo format to

> rST."

>

> Perhaps:

>

>   The current doc generation doesn't care much about indentation levels,

>   but we would like to switch to an rST format, and rST does care about

>   indentation.


Works for me. Let me know if you're OK just making this kind
of commit message tweak/minor fixup and sending a pull, or
if you want me to roll a v3.

thanks
-- PMM
Markus Armbruster Feb. 14, 2020, 2:26 p.m. UTC | #3
Peter Maydell <peter.maydell@linaro.org> writes:

> On Fri, 14 Feb 2020 at 12:36, Markus Armbruster <armbru@redhat.com> wrote:

>>

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

>>

>> > The texinfo doc generation doesn't care much about indentation

>>

>> Let's spell Texinfo with a capital T.

>>

>> > levels, but we would like to add a rST backend, and rST does care

>> > about indentation.

>>

>> Nitpick: an rST *backend* should not care about the doc generator's

>> *input* format.  We actually intend to change the input format into a

>> domain-specific dialect of rST, as you state in your cover letter: "This

>> series switches all our QAPI doc comments over from texinfo format to

>> rST."

>>

>> Perhaps:

>>

>>   The current doc generation doesn't care much about indentation levels,

>>   but we would like to switch to an rST format, and rST does care about

>>   indentation.

>

> Works for me. Let me know if you're OK just making this kind

> of commit message tweak/minor fixup and sending a pull, or

> if you want me to roll a v3.


I'm happy to tweak commit messages myself.  As always in such cases,
I'll appreciate an eye-over before the merge.
diff mbox series

Patch

diff --git a/qga/qapi-schema.json b/qga/qapi-schema.json
index 23ce6af597d..7661b2b3b45 100644
--- a/qga/qapi-schema.json
+++ b/qga/qapi-schema.json
@@ -416,7 +416,7 @@ 
 # Returns: GuestFsfreezeStatus ("thawed", "frozen", etc., as defined below)
 #
 # Note: This may fail to properly report the current state as a result of
-# some other guest processes having issued an fs freeze/thaw.
+#       some other guest processes having issued an fs freeze/thaw.
 #
 # Since: 0.15.0
 ##
@@ -431,13 +431,13 @@ 
 # unfreeze.
 #
 # Note: On Windows, the command is implemented with the help of a
-# Volume Shadow-copy Service DLL helper. The frozen state is limited
-# for up to 10 seconds by VSS.
+#       Volume Shadow-copy Service DLL helper. The frozen state is limited
+#       for up to 10 seconds by VSS.
 #
 # Returns: Number of file systems currently frozen. On error, all filesystems
-# will be thawed. If no filesystems are frozen as a result of this call,
-# then @guest-fsfreeze-status will remain "thawed" and calling
-# @guest-fsfreeze-thaw is not necessary.
+#          will be thawed. If no filesystems are frozen as a result of this call,
+#          then @guest-fsfreeze-status will remain "thawed" and calling
+#          @guest-fsfreeze-thaw is not necessary.
 #
 # Since: 0.15.0
 ##
@@ -455,7 +455,7 @@ 
 #               Invalid mount points are ignored.
 #
 # Returns: Number of file systems currently frozen. On error, all filesystems
-# will be thawed.
+#          will be thawed.
 #
 # Since: 2.2
 ##
@@ -511,12 +511,12 @@ 
 # Discard (or "trim") blocks which are not in use by the filesystem.
 #
 # @minimum:
-#       Minimum contiguous free range to discard, in bytes. Free ranges
-#       smaller than this may be ignored (this is a hint and the guest
-#       may not respect it).  By increasing this value, the fstrim
-#       operation will complete more quickly for filesystems with badly
-#       fragmented free space, although not all blocks will be discarded.
-#       The default value is zero, meaning "discard every free block".
+#           Minimum contiguous free range to discard, in bytes. Free ranges
+#           smaller than this may be ignored (this is a hint and the guest
+#           may not respect it).  By increasing this value, the fstrim
+#           operation will complete more quickly for filesystems with badly
+#           fragmented free space, although not all blocks will be discarded.
+#           The default value is zero, meaning "discard every free block".
 #
 # Returns: A @GuestFilesystemTrimResponse which contains the
 #          status of all trimmed paths. (since 2.4)
@@ -693,7 +693,7 @@ 
 # @ip-addresses: List of addresses assigned to @name
 #
 # @statistics: various statistic counters related to @name
-# (since 2.11)
+#              (since 2.11)
 #
 # Since: 1.1
 ##
@@ -743,7 +743,7 @@ 
 # This is a read-only operation.
 #
 # Returns: The list of all VCPUs the guest knows about. Each VCPU is put on the
-# list exactly once, but their order is unspecified.
+#          list exactly once, but their order is unspecified.
 #
 # Since: 1.5
 ##
@@ -937,8 +937,8 @@ 
 # This is a read-only operation.
 #
 # Returns: The list of all memory blocks the guest knows about.
-# Each memory block is put on the list exactly once, but their order
-# is unspecified.
+#          Each memory block is put on the list exactly once, but their order
+#          is unspecified.
 #
 # Since: 2.3
 ##
@@ -971,9 +971,9 @@ 
 # @response: the result of memory block operation.
 #
 # @error-code: the error number.
-#               When memory block operation fails, we assign the value of
-#               'errno' to this member, it indicates what goes wrong.
-#               When the operation succeeds, it will be omitted.
+#              When memory block operation fails, we assign the value of
+#              'errno' to this member, it indicates what goes wrong.
+#              When the operation succeeds, it will be omitted.
 #
 # Since: 2.3
 ##
@@ -1040,15 +1040,15 @@ 
 # @exited: true if process has already terminated.
 # @exitcode: process exit code if it was normally terminated.
 # @signal: signal number (linux) or unhandled exception code
-#       (windows) if the process was abnormally terminated.
+#          (windows) if the process was abnormally terminated.
 # @out-data: base64-encoded stdout of the process
 # @err-data: base64-encoded stderr of the process
-#       Note: @out-data and @err-data are present only
-#       if 'capture-output' was specified for 'guest-exec'
+#            Note: @out-data and @err-data are present only
+#            if 'capture-output' was specified for 'guest-exec'
 # @out-truncated: true if stdout was not fully captured
-#       due to size limitation.
+#                 due to size limitation.
 # @err-truncated: true if stderr was not fully captured
-#       due to size limitation.
+#                 due to size limitation.
 #
 # Since: 2.5
 ##
@@ -1131,8 +1131,8 @@ 
 
 ##
 # @GuestUser:
-# @user:       Username
-# @domain:     Logon domain (windows only)
+# @user: Username
+# @domain: Logon domain (windows only)
 # @login-time: Time of login of this user on the computer. If multiple
 #              instances of the user are logged in, the earliest login time is
 #              reported. The value is in fractional seconds since epoch time.
@@ -1156,10 +1156,10 @@ 
 ##
 # @GuestTimezone:
 #
-# @zone:    Timezone name. These values may differ depending on guest/OS and
-#           should only be used for informational purposes.
-# @offset:  Offset to UTC in seconds, negative numbers for time zones west of
-#           GMT, positive numbers for east
+# @zone: Timezone name. These values may differ depending on guest/OS and
+#        should only be used for informational purposes.
+# @offset: Offset to UTC in seconds, negative numbers for time zones west of
+#          GMT, positive numbers for east
 #
 # Since: 2.10
 ##