| Message ID | pull.831.git.1609609214040.gitgitgadget@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | doc: fix some typos | expand |
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
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"
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
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.
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
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)