[PATCH] doc: fix some typos

[PATCH] doc: fix some typos

[Thomas Ackermann via GitGitGadget]

From: Thomas Ackermann <th.acker@arcor.de>

Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
---
    doc: fix some typos
    
    Signed-off-by: Thomas Ackermann th.acker@arcor.de

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-831%2Ftacker66%2Ffix_some_typos-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-831/tacker66/fix_some_typos-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/831

 Documentation/config/http.txt        | 4 ++--
 Documentation/config/trace2.txt      | 2 +-
 Documentation/git-maintenance.txt    | 2 +-
 Documentation/git-p4.txt             | 2 +-
 Documentation/githooks.txt           | 2 +-
 Documentation/technical/reftable.txt | 2 +-
 contrib/buildsystems/CMakeLists.txt  | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Documentation/config/http.txt b/Documentation/config/http.txt
index 3968fbb697a..7003661c0db 100644
--- a/Documentation/config/http.txt
+++ b/Documentation/config/http.txt
@@ -42,12 +42,12 @@ http.proxySSLKey::
 http.proxySSLCertPasswordProtected::
 	Enable Git's password prompt for the proxy SSL certificate.  Otherwise OpenSSL
 	will prompt the user, possibly many times, if the certificate or private key
-	is encrypted. Can be overriden by the `GIT_PROXY_SSL_CERT_PASSWORD_PROTECTED`
+	is encrypted. Can be overridden by the `GIT_PROXY_SSL_CERT_PASSWORD_PROTECTED`
 	environment variable.
 
 http.proxySSLCAInfo::
 	Pathname to the file containing the certificate bundle that should be used to
-	verify the proxy with when using an HTTPS proxy. Can be overriden by the
+	verify the proxy with when using an HTTPS proxy. Can be overridden by the
 	`GIT_PROXY_SSL_CAINFO` environment variable.
 
 http.emptyAuth::
diff --git a/Documentation/config/trace2.txt b/Documentation/config/trace2.txt
index 01d3afd8a8b..fe1642f0d40 100644
--- a/Documentation/config/trace2.txt
+++ b/Documentation/config/trace2.txt
@@ -54,7 +54,7 @@ trace2.envVars::
 	`GIT_HTTP_USER_AGENT,GIT_CONFIG` would cause the trace2 output to
 	contain events listing the overrides for HTTP user agent and the
 	location of the Git configuration file (assuming any are set).  May be
-	overriden by the `GIT_TRACE2_ENV_VARS` environment variable.  Unset by
+	overridden by the `GIT_TRACE2_ENV_VARS` environment variable.  Unset by
 	default.
 
 trace2.destinationDebug::
diff --git a/Documentation/git-maintenance.txt b/Documentation/git-maintenance.txt
index d1f9b5172df..6fe1e5e1055 100644
--- a/Documentation/git-maintenance.txt
+++ b/Documentation/git-maintenance.txt
@@ -38,7 +38,7 @@ register::
 	for running in the background without disrupting foreground
 	processes.
 +
-The `register` subcomand will also set the `maintenance.strategy` config
+The `register` subcommand will also set the `maintenance.strategy` config
 value to `incremental`, if this value is not previously set. The
 `incremental` strategy uses the following schedule for each maintenance
 task:
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index ec233ac0c1c..f89e68b424c 100644
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -397,7 +397,7 @@ changelist text. Exiting with a non-zero status from the script
 will abort the process.
 
 The purpose of the hook is to edit the message file in place,
-and it is not supressed by the `--no-verify` option. This hook
+and it is not suppressed by the `--no-verify` option. This hook
 is called even if `--prepare-p4-only` is set.
 
 p4-changelist
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index ffccfc77608..1f3b57d04db 100644
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -644,7 +644,7 @@ changelist text. Exiting with a non-zero status from the script
 will abort the process.
 
 The purpose of the hook is to edit the message file in place,
-and it is not supressed by the `--no-verify` option. This hook
+and it is not suppressed by the `--no-verify` option. This hook
 is called even if `--prepare-p4-only` is set.
 
 Run `git-p4 submit --help` for details.
diff --git a/Documentation/technical/reftable.txt b/Documentation/technical/reftable.txt
index 2951840e9c9..8095ab2590c 100644
--- a/Documentation/technical/reftable.txt
+++ b/Documentation/technical/reftable.txt
@@ -446,7 +446,7 @@ especially if readers will not use the object name to ref mapping.
 Object blocks use unique, abbreviated 2-32 object name keys, mapping to
 ref blocks containing references pointing to that object directly, or as
 the peeled value of an annotated tag. Like ref blocks, object blocks use
-the file's standard block size. The abbrevation length is available in
+the file's standard block size. The abbreviation length is available in
 the footer as `obj_id_len`.
 
 To save space in small files, object blocks may be omitted if the ref
diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
index c151dd7257f..8f77baa678f 100644
--- a/contrib/buildsystems/CMakeLists.txt
+++ b/contrib/buildsystems/CMakeLists.txt
@@ -442,7 +442,7 @@ endif()
 check_c_source_compiles("
 #include <regex.h>
 #ifndef REG_STARTEND
-#error oops we dont have it
+#error oops we don't have it
 #endif
 
 int main(void)

base-commit: 71ca53e8125e36efbda17293c50027d31681a41f
-- 
gitgitgadget

Re: [PATCH] doc: fix some typos

[Martin Ågren]

On Sat, 2 Jan 2021 at 18:43, Thomas Ackermann via GitGitGadget
<gitgitgadget@gmail.com> wrote:

[Snip several typo fixes in Documentation/, all of which I agree with.]

> diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
> index c151dd7257f..8f77baa678f 100644
> --- a/contrib/buildsystems/CMakeLists.txt
> +++ b/contrib/buildsystems/CMakeLists.txt

Hmm... This does not match the "doc:" prefix of the patch.

> @@ -442,7 +442,7 @@ endif()
>  check_c_source_compiles("
>  #include <regex.h>
>  #ifndef REG_STARTEND
> -#error oops we dont have it
> +#error oops we don't have it
>  #endif

I don't think this is correct. This omission of the single quote somehow
looks like it's done on purpose. I don't build using this system, but I
tried making some silly code like this in another file, which I actually
do use:

#if 0
#error might or mightn't work
#endif

My compiler refused to compile: "error: missing terminating ' character
[-Werror]". So I fear this change to CMakeLists.txt would make us
needlessly fail to autodetect whatever it is we're looking for here.

If this change to CMakeLists.txt is dropped, this patch looks good
to me.

Martin

Re: [PATCH] doc: fix some typos

[Felipe Contreras]

Martin Ågren wrote:
> On Sat, 2 Jan 2021 at 18:43, Thomas Ackermann via GitGitGadget
> <gitgitgadget@gmail.com> wrote:
> 
> [Snip several typo fixes in Documentation/, all of which I agree with.]
> 
> > diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
> > index c151dd7257f..8f77baa678f 100644
> > --- a/contrib/buildsystems/CMakeLists.txt
> > +++ b/contrib/buildsystems/CMakeLists.txt
> 
> Hmm... This does not match the "doc:" prefix of the patch.
> 
> > @@ -442,7 +442,7 @@ endif()
> >  check_c_source_compiles("
> >  #include <regex.h>
> >  #ifndef REG_STARTEND
> > -#error oops we dont have it
> > +#error oops we don't have it
> >  #endif
> 
> I don't think this is correct. This omission of the single quote somehow
> looks like it's done on purpose. I don't build using this system, but I
> tried making some silly code like this in another file, which I actually
> do use:
> 
> #if 0
> #error might or mightn't work
> #endif

But this works:

#error "might or mightn't work"

-- 
Felipe Contreras

Re: [PATCH] doc: fix some typos

[Martin Ågren]

On Sat, 2 Jan 2021 at 23:26, Felipe Contreras
<felipe.contreras@gmail.com> wrote:
>
> Martin Ågren wrote:
> > On Sat, 2 Jan 2021 at 18:43, Thomas Ackermann via GitGitGadget
> > <gitgitgadget@gmail.com> wrote:
> >
> > [Snip several typo fixes in Documentation/, all of which I agree with.]
> >
> > > diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
> > > index c151dd7257f..8f77baa678f 100644
> > > --- a/contrib/buildsystems/CMakeLists.txt
> > > +++ b/contrib/buildsystems/CMakeLists.txt
> >
> > Hmm... This does not match the "doc:" prefix of the patch.
> >
> > > @@ -442,7 +442,7 @@ endif()
> > >  check_c_source_compiles("
> > >  #include <regex.h>
> > >  #ifndef REG_STARTEND
> > > -#error oops we dont have it
> > > +#error oops we don't have it
> > >  #endif
> >
> > I don't think this is correct. This omission of the single quote somehow
> > looks like it's done on purpose. I don't build using this system, but I
> > tried making some silly code like this in another file, which I actually
> > do use:
> >
> > #if 0
> > #error might or mightn't work
> > #endif
>
> But this works:
>
> #error "might or mightn't work"

Yeah, I pondered writing something like that. But then I thought I would
also need to write something about how, at the least, it should still be
a separate patch, but also how even if it were a separate patch, I would
probably sort it under code churn (IMVHO).

The error is not really intended for anyone's eyes, at least assuming my
reading is correct. So I refrained from suggesting to Thomas that here's
how you could go about making such a change.

And now I ended up laying out my thoughts anyway. :-) Of course, others
may well disagree with me about this being code churn.

Martin

Re: [PATCH] doc: fix some typos

[Felipe Contreras]

Martin Ågren wrote:
> On Sat, 2 Jan 2021 at 23:26, Felipe Contreras
> <felipe.contreras@gmail.com> wrote:
> > Martin Ågren wrote:

> > > #if 0
> > > #error might or mightn't work
> > > #endif
> >
> > But this works:
> >
> > #error "might or mightn't work"

[...]

> And now I ended up laying out my thoughts anyway. :-) Of course, others
> may well disagree with me about this being code churn.

Either way it's not integral to the rest of the patch. The change can
be dropped, or fixed properly. It probably doesn't matter much.

-- 
Felipe Contreras

[PATCH v2] doc: fix some typos

[Thomas Ackermann via GitGitGadget]

From: Thomas Ackermann <th.acker@arcor.de>

Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
---
    doc: fix some typos
    
    Changed since v1:
    
     * Removed changes in non-doc file contrib/buildsystems/CMakeLists.txt
       from the patch. Thanks to Martin and Felipe for pointing this out.
    
    Signed-off-by: Thomas Ackermann th.acker@arcor.de

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-831%2Ftacker66%2Ffix_some_typos-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-831/tacker66/fix_some_typos-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/831

Range-diff vs v1:

 1:  7016f417044 ! 1:  67e26552cb6 doc: fix some typos
     @@ Documentation/technical/reftable.txt: especially if readers will not use the obj
       the footer as `obj_id_len`.
       
       To save space in small files, object blocks may be omitted if the ref
     -
     - ## contrib/buildsystems/CMakeLists.txt ##
     -@@ contrib/buildsystems/CMakeLists.txt: endif()
     - check_c_source_compiles("
     - #include <regex.h>
     - #ifndef REG_STARTEND
     --#error oops we dont have it
     -+#error oops we don't have it
     - #endif
     - 
     - int main(void)


 Documentation/config/http.txt        | 4 ++--
 Documentation/config/trace2.txt      | 2 +-
 Documentation/git-maintenance.txt    | 2 +-
 Documentation/git-p4.txt             | 2 +-
 Documentation/githooks.txt           | 2 +-
 Documentation/technical/reftable.txt | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Documentation/config/http.txt b/Documentation/config/http.txt
index 3968fbb697a..7003661c0db 100644
--- a/Documentation/config/http.txt
+++ b/Documentation/config/http.txt
@@ -42,12 +42,12 @@ http.proxySSLKey::
 http.proxySSLCertPasswordProtected::
 	Enable Git's password prompt for the proxy SSL certificate.  Otherwise OpenSSL
 	will prompt the user, possibly many times, if the certificate or private key
-	is encrypted. Can be overriden by the `GIT_PROXY_SSL_CERT_PASSWORD_PROTECTED`
+	is encrypted. Can be overridden by the `GIT_PROXY_SSL_CERT_PASSWORD_PROTECTED`
 	environment variable.
 
 http.proxySSLCAInfo::
 	Pathname to the file containing the certificate bundle that should be used to
-	verify the proxy with when using an HTTPS proxy. Can be overriden by the
+	verify the proxy with when using an HTTPS proxy. Can be overridden by the
 	`GIT_PROXY_SSL_CAINFO` environment variable.
 
 http.emptyAuth::
diff --git a/Documentation/config/trace2.txt b/Documentation/config/trace2.txt
index 01d3afd8a8b..fe1642f0d40 100644
--- a/Documentation/config/trace2.txt
+++ b/Documentation/config/trace2.txt
@@ -54,7 +54,7 @@ trace2.envVars::
 	`GIT_HTTP_USER_AGENT,GIT_CONFIG` would cause the trace2 output to
 	contain events listing the overrides for HTTP user agent and the
 	location of the Git configuration file (assuming any are set).  May be
-	overriden by the `GIT_TRACE2_ENV_VARS` environment variable.  Unset by
+	overridden by the `GIT_TRACE2_ENV_VARS` environment variable.  Unset by
 	default.
 
 trace2.destinationDebug::
diff --git a/Documentation/git-maintenance.txt b/Documentation/git-maintenance.txt
index d1f9b5172df..6fe1e5e1055 100644
--- a/Documentation/git-maintenance.txt
+++ b/Documentation/git-maintenance.txt
@@ -38,7 +38,7 @@ register::
 	for running in the background without disrupting foreground
 	processes.
 +
-The `register` subcomand will also set the `maintenance.strategy` config
+The `register` subcommand will also set the `maintenance.strategy` config
 value to `incremental`, if this value is not previously set. The
 `incremental` strategy uses the following schedule for each maintenance
 task:
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index ec233ac0c1c..f89e68b424c 100644
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -397,7 +397,7 @@ changelist text. Exiting with a non-zero status from the script
 will abort the process.
 
 The purpose of the hook is to edit the message file in place,
-and it is not supressed by the `--no-verify` option. This hook
+and it is not suppressed by the `--no-verify` option. This hook
 is called even if `--prepare-p4-only` is set.
 
 p4-changelist
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index ffccfc77608..1f3b57d04db 100644
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -644,7 +644,7 @@ changelist text. Exiting with a non-zero status from the script
 will abort the process.
 
 The purpose of the hook is to edit the message file in place,
-and it is not supressed by the `--no-verify` option. This hook
+and it is not suppressed by the `--no-verify` option. This hook
 is called even if `--prepare-p4-only` is set.
 
 Run `git-p4 submit --help` for details.
diff --git a/Documentation/technical/reftable.txt b/Documentation/technical/reftable.txt
index 2951840e9c9..8095ab2590c 100644
--- a/Documentation/technical/reftable.txt
+++ b/Documentation/technical/reftable.txt
@@ -446,7 +446,7 @@ especially if readers will not use the object name to ref mapping.
 Object blocks use unique, abbreviated 2-32 object name keys, mapping to
 ref blocks containing references pointing to that object directly, or as
 the peeled value of an annotated tag. Like ref blocks, object blocks use
-the file's standard block size. The abbrevation length is available in
+the file's standard block size. The abbreviation length is available in
 the footer as `obj_id_len`.
 
 To save space in small files, object blocks may be omitted if the ref

base-commit: 71ca53e8125e36efbda17293c50027d31681a41f
-- 
gitgitgadget

Re: [PATCH] doc: fix some typos

[Chris Torek]

On Sat, Jan 2, 2021 at 2:31 PM Felipe Contreras
<felipe.contreras@gmail.com> wrote:
> But this works:
>
> #error "might or mightn't work"

Right: the rule here is that the preprocessor, even inside "#if 0"
sections, is working with "pp-token"s.  Single quotes are still
character constants and must be paired.  Double quotes are still
string constants (token-wise) and also must be paired like this,
but now you can hide apostrophes.

Chris

Re: [PATCH v2] doc: fix some typos

[Martin Ågren]

Hi Thomas,

On Sun, 3 Jan 2021 at 15:25, Thomas Ackermann via GitGitGadget
<gitgitgadget@gmail.com> wrote:
>
> From: Thomas Ackermann <th.acker@arcor.de>
>
> Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
> ---
>     doc: fix some typos
>
>     Changed since v1:
>
>      * Removed changes in non-doc file contrib/buildsystems/CMakeLists.txt
>        from the patch. Thanks to Martin and Felipe for pointing this out.

This looks good to me.

Martin

Re: [PATCH v2] doc: fix some typos

[Junio C Hamano]

Martin Ågren <martin.agren@gmail.com> writes:

> Hi Thomas,
>
> On Sun, 3 Jan 2021 at 15:25, Thomas Ackermann via GitGitGadget
> <gitgitgadget@gmail.com> wrote:
>>
>> From: Thomas Ackermann <th.acker@arcor.de>
>>
>> Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
>> ---
>>     doc: fix some typos
>>
>>     Changed since v1:
>>
>>      * Removed changes in non-doc file contrib/buildsystems/CMakeLists.txt
>>        from the patch. Thanks to Martin and Felipe for pointing this out.
>
> This looks good to me.
>
> Martin

Thanks, all.

[PATCH] doc: fix some typos

[Luc Van Oostenryck]

Fix some silly typos.

Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
---
 Documentation/types.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/types.rst b/Documentation/types.rst
index e5d07def0bc2..5c10725fa71a 100644
--- a/Documentation/types.rst
+++ b/Documentation/types.rst
@@ -13,7 +13,7 @@ For the purpose of this document, things can be simplified into:
 		struct ctype {
 			struct symbol *base_type;
 			unsigned long modifiers;
-			unsigned long alignement;
+			unsigned long alignment;
 			struct context_list *contexts;
 			struct indent *as;
 		};
@@ -68,7 +68,7 @@ have their own modifiers, address_space, contexts or alignment
 as well as the declaration's identifier.
 
 Usage:
-  * .ctype.base_type points to the unmodified type (wich must not
+  * .ctype.base_type points to the unmodified type (which must not
     be a SYM_NODE itself)
   * .ctype.modifiers, .as, .alignment, .contexts will contains
     the 'variation' (MOD_CONST, the attributes, ...).
-- 
2.27.0

Re: [PATCH] doc: fix some typos

[Wei Liu]

On Fri, Sep 02, 2016 at 09:30:48AM +0100, Wei Liu wrote:
> On Thu, Sep 01, 2016 at 01:02:45PM +0200, Juergen Gross wrote:
> > Fix some typos in docs/man/xl.cfg.pod.5.in
> > 
> > Signed-off-by: Juergen Gross <jgross@suse.com>
> 
> Acked-by: Wei Liu <wei.liu2@citrix.com>

Pushed.

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [PATCH] doc: fix some typos

[Wei Liu]

On Thu, Sep 01, 2016 at 01:02:45PM +0200, Juergen Gross wrote:
> Fix some typos in docs/man/xl.cfg.pod.5.in
> 
> Signed-off-by: Juergen Gross <jgross@suse.com>

Acked-by: Wei Liu <wei.liu2@citrix.com>

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

[PATCH] doc: fix some typos

[Juergen Gross]

Fix some typos in docs/man/xl.cfg.pod.5.in

Signed-off-by: Juergen Gross <jgross@suse.com>
---
 docs/man/xl.cfg.pod.5.in | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/docs/man/xl.cfg.pod.5.in b/docs/man/xl.cfg.pod.5.in
index 6feee52..77a1be3 100644
--- a/docs/man/xl.cfg.pod.5.in
+++ b/docs/man/xl.cfg.pod.5.in
@@ -32,7 +32,7 @@ A string, surrounded by either single or double quotes.
 =item B<NUMBER>
 
 A number, in either decimal, octal (using a C<0> prefix) or
-hexadecimal (using an C<0x> prefix).
+hexadecimal (using a C<0x> prefix).
 
 =item B<BOOLEAN>
 
@@ -480,7 +480,7 @@ devices which the guest will contain.
 
 Specifies the disks (both emulated disks and Xen virtual block
 devices) which are to be provided to the guest, and what objects on
-the they should map to.  See F<docs/misc/xl-disk-configuration.txt>.
+the host they should map to.  See F<docs/misc/xl-disk-configuration.txt>.
 
 =item B<vif=[ "NET_SPEC_STRING", "NET_SPEC_STRING", ...]>
 
@@ -501,7 +501,7 @@ settings, from the following list:
 
 =item C<backend=DOMAIN>
 
-Specify the backend domain name of id. This value is required!
+Specify the backend domain name or id. This value is required!
 If this domain is a guest, the backend should be set to the
 vtpm domain name. If this domain is a vtpm, the
 backend should be set to the vtpm manager domain name.
@@ -607,7 +607,7 @@ configuration after boot and signalling to in-guest agents. Please see
 F<docs/misc/channels.txt> for more details.
 
 Each B<CHANNEL_SPEC_STRING> is a comma-separated list of C<KEY=VALUE>
-seettings. Leading and trailing whitespace is ignored in both KEY and
+settings. Leading and trailing whitespace is ignored in both KEY and
 VALUE. Neither KEY nor VALUE may contain ',', '=' or '"'. Defined values
 are:
 
@@ -630,7 +630,7 @@ names unique by including domain name and version number in the string
 
 =item C<connection=CONNECTION>
 
-Specify how the backend will be implemented. This following options are
+Specify how the backend will be implemented. The following options are
 available:
 
 =over 4
@@ -715,7 +715,7 @@ When that conflict is unsolved,
 attached in the case of hotplug.
 
 "relaxed" allows VM to be created but may cause VM to crash if
-pass-through device accesses RDM. For exampl,e Windows IGD GFX driver
+pass-through device accesses RDM. For example Windows IGD GFX driver
 always accessed RDM regions so it leads to VM crash.
 
 Note this may be overridden by rdm_policy option in PCI device configuration.
@@ -759,7 +759,7 @@ Specifies the usb controller version.  Possible values include
 Specifies the total ports of the usb controller. The maximum
 number is 31. Default is 8.
 
-USB controler ids start from 0.  In line with the USB spec, however,
+USB controller ids start from 0.  In line with the USB spec, however,
 ports on a controller start from 1.
 
 E.g.
@@ -847,7 +847,7 @@ Possible B<KEY>s are:
 
 By default pciback only allows PV guests to write "known safe" values
 into PCI config space, likewise QEMU (both qemu-xen and
-qemu-traditional) imposes the same contraint on HVM guests. However
+qemu-traditional) imposes the same constraint on HVM guests. However
 many devices require writes to other areas of config space in order to
 operate properly.  This option tells the backend (pciback or QEMU) to
 allow all writes to PCI config space of this device by this domain.
@@ -929,7 +929,7 @@ any kind of sharing of the GPU, so you can only assign the GPU to one
 single VM at a time.
 
 gfx_passthru also enables various legacy VGA memory ranges, BARs, MMIOs,
-and ioports to be passed thru to the VM, since those are required
+and ioports to be passed through to the VM, since those are required
 for correct operation of things like VGA BIOS, text mode, VBE, etc.
 
 Enabling gfx_passthru option also copies the physical graphics card
@@ -988,7 +988,7 @@ wiki page.
 Number of megabytes to set a boundary for checking rdm conflict.
 
 When RDM conflicts with RAM, RDM probably scatter the whole RAM space.
-Especially multiple RDM entries would worsen this to lead a complicated
+Especially multiple RDM entries would worsen this to lead to a complicated
 memory layout. So here we're trying to figure out a simple solution to
 avoid breaking existing layout. So when a conflict occurs,
 
@@ -1172,7 +1172,7 @@ Number of megabytes to set aside for shadowing guest pagetable pages
 state. By default this is 1MB per guest vcpu plus 8KB per MB of guest
 RAM. You should not normally need to adjust this value. However if you
 are not using hardware assisted paging (i.e. you are using shadow
-mode) and your guest workload consists of a a very large number of
+mode) and your guest workload consists of a very large number of
 similar processes then increasing this value may improve performance.
 
 =back
@@ -1374,7 +1374,7 @@ preceded by a 32b integer indicating the size of the next structure.
 
 Provide a VM generation ID to the guest.
 
-The VM generation ID as a 128-bit random number that a guest may use
+The VM generation ID is a 128-bit random number that a guest may use
 to determine if the guest has been restored from an earlier snapshot
 or cloned.
 
@@ -1820,7 +1820,7 @@ B<-serial> option in the L<qemu(1)> manpage for details of the valid
 B<DEVICE> options. Default is B<vc> when in graphical mode and
 B<stdio> if B<nographics=1> is used.
 
-The form serial=DEVICE is also accepted for backwards compatibilty.
+The form serial=DEVICE is also accepted for backwards compatibility.
 
 =item B<soundhw=DEVICE>
 
-- 
2.6.6


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [PATCH] doc: fix some typos

[Xishi Qiu]

On 2013/9/15 0:49, Randy Dunlap wrote:

> On 09/13/13 20:49, Xishi Qiu wrote:
> 
>> diff --git a/Documentation/kprobes.txt b/Documentation/kprobes.txt
>> index 0cfb00f..ca278d5 100644
>> --- a/Documentation/kprobes.txt
>> +++ b/Documentation/kprobes.txt
>> @@ -92,7 +92,7 @@ stack contents as the probed function.  When it is done, the handler
>>  calls jprobe_return(), which traps again to restore the original stack
>>  contents and processor state and switch to the probed function.
>>  
>> -By convention, the callee owns its arguments, so gcc may produce code
> 
> Are you sure about that?
> It looks correct to me (before the patch).
>

Hi Randy, you are right, I confused caller and callee.

Thanks,
Xishi Qiu

>> +By convention, the caller owns its arguments, so gcc may produce code
>>  that unexpectedly modifies that portion of the stack.  This is why
>>  Kprobes saves a copy of the stack and restores it after the jprobe
>>  handler has run.  Up to MAX_STACK_SIZE bytes are copied -- e.g.,
>>
> 
> 

Re: [PATCH] doc: fix some typos

[Randy Dunlap]

On 09/13/13 20:49, Xishi Qiu wrote:

> diff --git a/Documentation/kprobes.txt b/Documentation/kprobes.txt
> index 0cfb00f..ca278d5 100644
> --- a/Documentation/kprobes.txt
> +++ b/Documentation/kprobes.txt
> @@ -92,7 +92,7 @@ stack contents as the probed function.  When it is done, the handler
>  calls jprobe_return(), which traps again to restore the original stack
>  contents and processor state and switch to the probed function.
>  
> -By convention, the callee owns its arguments, so gcc may produce code

Are you sure about that?
It looks correct to me (before the patch).

> +By convention, the caller owns its arguments, so gcc may produce code
>  that unexpectedly modifies that portion of the stack.  This is why
>  Kprobes saves a copy of the stack and restores it after the jprobe
>  handler has run.  Up to MAX_STACK_SIZE bytes are copied -- e.g.,
> 


-- 
~Randy

[PATCH] doc: fix some typos

[Xishi Qiu]

Fix some typos in documentation.

Signed-off-by: Xishi Qiu <qiuxishi@huawei.com>
---
 Documentation/IRQ-domain.txt    |    2 +-
 Documentation/email-clients.txt |    2 +-
 Documentation/io-mapping.txt    |    2 +-
 Documentation/kprobes.txt       |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation/IRQ-domain.txt b/Documentation/IRQ-domain.txt
index 9bc9594..03df71a 100644
--- a/Documentation/IRQ-domain.txt
+++ b/Documentation/IRQ-domain.txt
@@ -141,7 +141,7 @@ will use a legacy domain only if an IRQ range is supplied by the
 system and will otherwise use a linear domain mapping. The semantics
 of this call are such that if an IRQ range is specified then
 descriptors will be allocated on-the-fly for it, and if no range is
-specified it will fall through to irq_domain_add_linear() which meand
+specified it will fall through to irq_domain_add_linear() which means
 *no* irq descriptors will be allocated.
 
 A typical use case for simple domains is where an irqchip provider
diff --git a/Documentation/email-clients.txt b/Documentation/email-clients.txt
index 860c29a..e9f5dac 100644
--- a/Documentation/email-clients.txt
+++ b/Documentation/email-clients.txt
@@ -104,7 +104,7 @@ Then from the "Message" menu item, select insert file and choose your patch.
 As an added bonus you can customise the message creation toolbar menu
 and put the "insert file" icon there.
 
-Make the the composer window wide enough so that no lines wrap. As of
+Make the composer window wide enough so that no lines wrap. As of
 KMail 1.13.5 (KDE 4.5.4), KMail will apply word wrapping when sending
 the email if the lines wrap in the composer window. Having word wrapping
 disabled in the Options menu isn't enough. Thus, if your patch has very
diff --git a/Documentation/io-mapping.txt b/Documentation/io-mapping.txt
index 473e43b..5ca7842 100644
--- a/Documentation/io-mapping.txt
+++ b/Documentation/io-mapping.txt
@@ -38,7 +38,7 @@ maps are more efficient:
 
 	void io_mapping_unmap_atomic(void *vaddr)
 
-		'vaddr' must be the the value returned by the last
+		'vaddr' must be the value returned by the last
 		io_mapping_map_atomic_wc call. This unmaps the specified
 		page and allows the task to sleep once again.
 
diff --git a/Documentation/kprobes.txt b/Documentation/kprobes.txt
index 0cfb00f..ca278d5 100644
--- a/Documentation/kprobes.txt
+++ b/Documentation/kprobes.txt
@@ -92,7 +92,7 @@ stack contents as the probed function.  When it is done, the handler
 calls jprobe_return(), which traps again to restore the original stack
 contents and processor state and switch to the probed function.
 
-By convention, the callee owns its arguments, so gcc may produce code
+By convention, the caller owns its arguments, so gcc may produce code
 that unexpectedly modifies that portion of the stack.  This is why
 Kprobes saves a copy of the stack and restores it after the jprobe
 handler has run.  Up to MAX_STACK_SIZE bytes are copied -- e.g.,
-- 
1.7.1