Skip to content

Commit b8b66ef

Browse files
committed
Auto merge of #4476 - behnam:book, r=alexcrichton
[doc/book] Move section content to */index.md This gives a better over-all structure to the book, which we can also follow for other books on <doc.rust-lang.org>. Also, confirming fix for broken links with the latest (0.0.24) `mdbook` release.
2 parents 053b634 + 71acd8f commit b8b66ef

File tree

8 files changed

+14
-15
lines changed

8 files changed

+14
-15
lines changed

src/doc/MIGRATION_MAP

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
index.md book/src/SUMMARY.md book/src/getting-started.md book/src/getting-started/*.md
2-
guide.md book/src/guide.md book/src/guide/*.md
1+
index.md book/src/index.md book/src/getting-started/index.md book/src/getting-started/*.md
2+
guide.md book/src/guide/index.md book/src/guide/*.md
33
build-script.md book/src/reference/build-scripts.md
44
config.md book/src/reference/config.md
55
crates-io.md book/src/reference/publishing.md

src/doc/book/src/SUMMARY.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
[Introduction](index.md)
44

5-
* [Getting Started](getting-started.md)
5+
* [Getting Started](getting-started/index.md)
66
* [Installation](getting-started/installation.md)
77
* [First Steps with Cargo](getting-started/first-steps.md)
88

9-
* [Cargo Guide](guide.md)
9+
* [Cargo Guide](guide/index.md)
1010
* [Why Cargo Exists](guide/why-cargo-exists.md)
1111
* [Creating a New Project](guide/creating-a-new-project.md)
1212
* [Working on an Existing Project](guide/working-on-an-existing-project.md)
@@ -16,7 +16,7 @@
1616
* [Tests](guide/tests.md)
1717
* [Continuous Integration](guide/continuous-integration.md)
1818

19-
* [Cargo Reference](reference.md)
19+
* [Cargo Reference](reference/index.md)
2020
* [Specifying Dependencies](reference/specifying-dependencies.md)
2121
* [The Manifest Format](reference/manifest.md)
2222
* [Configuration](reference/config.md)

src/doc/book/src/getting-started/first-steps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,4 @@ Hello, world!
6767

6868
### Going further
6969

70-
For more details on using Cargo, check out the [Cargo Guide](guide.html)
70+
For more details on using Cargo, check out the [Cargo Guide](guide/index.html)
File renamed without changes.

src/doc/book/src/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ dependencies, compiles your project, makes packages, and upload them to
1313

1414
To get started with Cargo, install Cargo (and Rust) and set up your first crate.
1515

16-
**[Cargo Guide](guide.html)**
16+
**[Cargo Guide](guide/index.html)**
1717

1818
The guide will give you all you need to know about how to use Cargo to develop
1919
Rust projects.
2020

21-
**[Cargo Reference](reference.html)**
21+
**[Cargo Reference](reference/index.html)**
2222

2323
The reference covers the details of various areas of Cargo.
2424

File renamed without changes.

src/doc/book/src/reference/specifying-dependencies.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ development. Let's take a look at how to do each of these.
1111

1212
Cargo is configured to look for dependencies on [crates.io] by default. Only
1313
the name and a version string are required in this case. In [the cargo
14-
guide](guide.html), we specified a dependency on the `time` crate:
14+
guide](guide/index.html), we specified a dependency on the `time` crate:
1515

1616
```toml
1717
[dependencies]
@@ -126,12 +126,11 @@ rand = { git = "https://github.com/rust-lang-nursery/rand", branch = "next" }
126126

127127
### Specifying path dependencies
128128

129-
Over time, our `hello_world` project from [the guide](guide.html) has grown
130-
significantly in size! It’s gotten to the point that we probably want to
131-
split out a separate crate for others to use. To do this Cargo supports
132-
**path dependencies** which are typically sub-crates that live within one
133-
repository. Let’s start off by making a new crate inside of our `hello_world`
134-
project:
129+
Over time, our `hello_world` project from [the guide](guide/index.html) has
130+
grown significantly in size! It’s gotten to the point that we probably want to
131+
split out a separate crate for others to use. To do this Cargo supports **path
132+
dependencies** which are typically sub-crates that live within one repository.
133+
Let’s start off by making a new crate inside of our `hello_world` project:
135134

136135
```shell
137136
# inside of hello_world/

0 commit comments

Comments
 (0)