Skip to content

Commit 6a38927

Browse files
committed
Auto merge of #8803 - ehuss:toml-links, r=alexcrichton
Update TOML website links. Update the links to the new, fancy TOML website. Also added a few more links. Closes #8800
2 parents dd83ae5 + a133f25 commit 6a38927

File tree

5 files changed

+10
-6
lines changed

5 files changed

+10
-6
lines changed

src/doc/src/faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ similar configuration files in directory listings. Sorting files often puts
147147
capital letters before lowercase letters, ensuring files like `Makefile` and
148148
`Cargo.toml` are placed together. The trailing `.toml` was chosen to emphasize
149149
the fact that the file is in the [TOML configuration
150-
format](https://github.com/toml-lang/toml).
150+
format](https://toml.io/).
151151

152152
Cargo does not allow other names such as `cargo.toml` or `Cargofile` to
153153
emphasize the ease of how a Cargo repository can be identified. An option of

src/doc/src/guide/creating-a-new-project.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ edition = "2018"
3737
```
3838

3939
This is called a **manifest**, and it contains all of the metadata that Cargo
40-
needs to compile your package.
40+
needs to compile your package. This file is written in the [TOML] format
41+
(pronounced /tɑməl/).
4142

4243
Here’s what’s in `src/main.rs`:
4344

@@ -89,3 +90,5 @@ $ cargo build --release
8990
Compiling in debug mode is the default for development. Compilation time is
9091
shorter since the compiler doesn't do optimizations, but the code will run
9192
slower. Release mode takes longer to compile, but the code will run faster.
93+
94+
[TOML]: https://toml.io/

src/doc/src/reference/cargo-targets.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ Similarly to tests:
160160
All of the `[lib]`, `[[bin]]`, `[[example]]`, `[[test]]`, and `[[bench]]`
161161
sections in `Cargo.toml` support similar configuration for specifying how a
162162
target should be built. The double-bracket sections like `[[bin]]` are
163-
array-of-table of [TOML](https://github.com/toml-lang/toml#array-of-tables),
163+
[array-of-table of TOML](https://toml.io/en/v1.0.0-rc.3#array-of-tables),
164164
which means you can write more than one `[[bin]]` section to make several
165165
executables in your crate. You can only specify one library, so `[lib]` is a
166166
normal TOML table.

src/doc/src/reference/config.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -937,7 +937,7 @@ Sets the width for progress bar.
937937
[build scripts]: build-scripts.md
938938
[`-C linker`]: ../../rustc/codegen-options/index.md#linker
939939
[override a build script]: build-scripts.md#overriding-build-scripts
940-
[toml]: https://github.com/toml-lang/toml
940+
[toml]: https://toml.io/
941941
[incremental compilation]: profiles.md#incremental
942942
[profile]: profiles.md
943943
[libcurl format]: https://ec.haxx.se/usingcurl-proxies.html

src/doc/src/reference/manifest.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
## The Manifest Format
22

3-
The `Cargo.toml` file for each package is called its *manifest*. Every manifest
4-
file consists of the following sections:
3+
The `Cargo.toml` file for each package is called its *manifest*. It is written
4+
in the [TOML] format. Every manifest file consists of the following sections:
55

66
* [`cargo-features`](unstable.md) — Unstable, nightly-only features.
77
* [`[package]`](#the-package-section) — Defines a package.
@@ -516,6 +516,7 @@ more detail.
516516
[spdx-2.1-license-expressions]: https://spdx.org/spdx-specification-21-web-version#h.jxpfx0ykyb60
517517
[spdx-license-list-3.6]: https://github.com/spdx/license-list-data/tree/v3.6
518518
[SPDX site]: https://spdx.org/license-list
519+
[TOML]: https://toml.io/
519520

520521
<script>
521522
(function() {

0 commit comments

Comments
 (0)