Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update book for rustup #38122

Merged
merged 2 commits into from
Dec 17, 2016
Merged

Update book for rustup #38122

merged 2 commits into from
Dec 17, 2016

Conversation

brson
Copy link
Contributor

@brson brson commented Dec 2, 2016

Supersedes #37934

Don't land yet. Needs coordination with rust-lang/prev.rust-lang.org#621

Fixes #35653

r? @steveklabnik

@steveklabnik
Copy link
Member

/cc @rust-lang/docs @carols10cents

Installing on Windows is nearly as easy: download and run
[rustup-init.exe]. It will run the installation in a console and
present the above message on success. For other installation options
and information, visit the [install] page of the Rust website.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For other installation options and information, visit the [install] page of the Rust website.

Nit: It might make sense to put this on a different line than the Windows instructions.


If we're on Linux or a Mac, all we need to do is open a terminal and type this:
All we need to do on On Unix systems like Linux and macOS is open a
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know the tense didn't change with this PR, but maybe this "we" should be a "you'll"?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, "On" doesn't need to be capitalized.

shells, and bugs in installation, you may need to restart your shell,
log out of the system, or configure `PATH` manually. If necessary,
configure your `PATH` variable as appropriate for your operating
environment.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This last sentence doesn't seem necessary to me, but I don't feel strongly.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, it could be combined with the previous sentence imo:

Due to differences in operating systems, command shells, and bugs in installation, you may need to restart your shell, log out of the system, or configure PATH manually as appropriate for your operating environment.

@carols10cents
Copy link
Member

in general r+, I agree with the suggestions @frewsxcv made though! (also i don't have r)

@brson
Copy link
Contributor Author

brson commented Dec 15, 2016

Made all suggested edits. Thanks for the reviews @frewsxcv and @carols10cents .

log out of the system, or configure `PATH` manually. If necessary,
configure your `PATH` variable as appropriate for your operating
environment.
log out of the system, or configure PATH manually as appropriate for
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit:

`PATH`

Copy link
Member

@GuillaumeGomez GuillaumeGomez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a few suggestions.

```

This will download a script, and start the installation. If it all goes well,
you’ll see this appear:
That will download a script, and start the installation. If it all
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"It will"?

This will download a script, and start the installation. If it all goes well,
you’ll see this appear:
That will download a script, and start the installation. If it all
goes well, you’ll see this appear:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"If everything goes well"?

```

From here, press `y` for ‘yes’, and then follow the rest of the prompts.
Installing on Windows is nearly as easy: download and run
[rustup-init.exe]. It will run the installation in a console and
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't like the "run" repetition. You could maybe replace it with "It will start the installation"?

@brson
Copy link
Contributor Author

brson commented Dec 15, 2016

Made all suggested edits again. Thanks for the review @GuillaumeGomez.

@GuillaumeGomez
Copy link
Member

I don't see any difference @brson. Did you forget to push? :p

@brson
Copy link
Contributor Author

brson commented Dec 15, 2016

I did forget to push.

@brson
Copy link
Contributor Author

brson commented Dec 16, 2016

@bors r=steveklabnik

@bors
Copy link
Contributor

bors commented Dec 16, 2016

📌 Commit 7628582 has been approved by steveklabnik

@brson
Copy link
Contributor Author

brson commented Dec 16, 2016

Rebased.

@bors r=steveklabnik

@bors
Copy link
Contributor

bors commented Dec 16, 2016

📌 Commit 7550e32 has been approved by steveklabnik

@brson brson added beta-nominated Nominated for backporting to the compiler in the beta channel. beta-accepted Accepted for backporting to the compiler in the beta channel. and removed beta-nominated Nominated for backporting to the compiler in the beta channel. labels Dec 16, 2016
@bors
Copy link
Contributor

bors commented Dec 17, 2016

⌛ Testing commit 7550e32 with merge 4a008cc...

bors added a commit that referenced this pull request Dec 17, 2016
Update book for rustup

Supersedes #37934

Don't land yet. Needs coordination with rust-lang/prev.rust-lang.org#621

Fixes #35653

r? @steveklabnik
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants