Skip to content

Commit f0b39fc

Browse files
committed
Auto merge of #9495 - dunkyl:master, r=ehuss
3 typos and some capitalization 3 typos and... Most of the docs use "command-line" instead of "commandline", changed where it made sense (in plain text). Most of the docs also use "SemVer" instead of "semver", changed for consistency except for the "semver trick" (consistent with context). I believe these are the correct files to change, since none of these changes are in doc/man?
2 parents 44596fa + 4d8c0bb commit f0b39fc

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

src/doc/src/faq.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ compatibility). If Cargo used all of the dependencies' `Cargo.lock` files,
125125
then multiple copies of the library could be used, and perhaps even a version
126126
conflict.
127127

128-
In other words, libraries specify semver requirements for their dependencies but
128+
In other words, libraries specify SemVer requirements for their dependencies but
129129
cannot see the full picture. Only end products like binaries have a full
130130
picture to decide what versions of dependencies should be used.
131131

@@ -165,7 +165,7 @@ are often surprised when Cargo attempts to fetch resources from the network, and
165165
hence the request for Cargo to work offline comes up frequently.
166166

167167
Cargo, at its heart, will not attempt to access the network unless told to do
168-
so. That is, if no crates comes from crates.io, a git repository, or some other
168+
so. That is, if no crates come from crates.io, a git repository, or some other
169169
network location, Cargo will never attempt to make a network connection. As a
170170
result, if Cargo attempts to touch the network, then it's because it needs to
171171
fetch a required resource.
@@ -245,7 +245,7 @@ Some issues we've seen historically which can cause crates to get rebuilt are:
245245
uses timestamps on files to govern whether rebuilding needs to happen, but if
246246
you're using a nonstandard filesystem it may be affecting the timestamps
247247
somehow (e.g. truncating them, causing them to drift, etc). In this scenario,
248-
feel free to open an issue and we can see if we can accomodate the filesystem
248+
feel free to open an issue and we can see if we can accommodate the filesystem
249249
somehow.
250250

251251
* A concurrent build process is either deleting artifacts or modifying files.

src/doc/src/guide/why-cargo-exists.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ invocation. Furthermore, Cargo will automatically fetch from a
5555
[*registry*][def-registry] any dependencies we have defined for our artifact,
5656
and arrange for them to be incorporated into our build as needed.
5757

58-
It is only a slight exageration to say that once you know how to build one
58+
It is only a slight exaggeration to say that once you know how to build one
5959
Cargo-based project, you know how to build *all* of them.
6060

6161
[def-artifact]: ../appendix/glossary.md#artifact '"artifact" (glossary entry)'

src/doc/src/reference/environment-variables.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ system:
2121
* `RUSTC` — Instead of running `rustc`, Cargo will execute this specified
2222
compiler instead. See [`build.rustc`] to set via config.
2323
* `RUSTC_WRAPPER` — Instead of simply running `rustc`, Cargo will execute this
24-
specified wrapper instead, passing as its commandline arguments the rustc
24+
specified wrapper instead, passing as its command-line arguments the rustc
2525
invocation, with the first argument being `rustc`. Useful to set up a build
2626
cache tool such as `sccache`. See [`build.rustc-wrapper`] to set via config.
2727
* `RUSTC_WORKSPACE_WRAPPER` — Instead of simply running `rustc`, Cargo will
2828
execute this specified wrapper instead for workspace members only, passing
29-
as its commandline arguments the rustc invocation, with the first argument
29+
as its command-line arguments the rustc invocation, with the first argument
3030
being `rustc`. It affects the filename hash so that artifacts produced by
3131
the wrapper are cached separately. See [`build.rustc-workspace-wrapper`]
3232
to set via config.
@@ -316,7 +316,7 @@ let out_dir = env::var("OUT_DIR").unwrap();
316316
* `TARGET` — the target triple that is being compiled for. Native code should be
317317
compiled for this triple. See the [Target Triple] description
318318
for more information.
319-
* `HOST` — the host triple of the rust compiler.
319+
* `HOST` — the host triple of the Rust compiler.
320320
* `NUM_JOBS` — the parallelism specified as the top-level parallelism. This can
321321
be useful to pass a `-j` parameter to a system like `make`. Note
322322
that care should be taken when interpreting this environment

src/doc/src/reference/manifest.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,11 @@ Versioning](https://semver.org/), so make sure you follow some basic rules:
9898

9999
See the [Resolver] chapter for more information on how Cargo uses versions to
100100
resolve dependencies, and for guidelines on setting your own version. See the
101-
[Semver compatibility] chapter for more details on exactly what constitutes a
101+
[SemVer compatibility] chapter for more details on exactly what constitutes a
102102
breaking change.
103103

104104
[Resolver]: resolver.md
105-
[Semver compatibility]: semver.md
105+
[SemVer compatibility]: semver.md
106106

107107
<a id="the-authors-field-optional"></a>
108108
#### The `authors` field

src/doc/src/reference/unstable.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ generated if dev-dependencies are skipped.
207207
> versions for direct dependencies.
208208
209209
When a `Cargo.lock` file is generated, the `-Z minimal-versions` flag will
210-
resolve the dependencies to the minimum semver version that will satisfy the
210+
resolve the dependencies to the minimum SemVer version that will satisfy the
211211
requirements (instead of the greatest version).
212212

213213
The intended use-case of this flag is to check, during continuous integration,

0 commit comments

Comments
 (0)