Skip to content

guide: use _sample configurations..._ rather than _here_ as link text #17242

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

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/doc/guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,7 @@ Next up is this line:
This line does all of the work in our little program. There are a number of
details that are important here. The first is that it's indented with four
spaces, not tabs. Please configure your editor of choice to insert four spaces
with the tab key. We provide some sample configurations for various editors
[here](https://github.com/rust-lang/rust/tree/master/src/etc).
with the tab key. We provide some [sample configurations for various editors](https://github.com/rust-lang/rust/tree/master/src/etc).
Copy link
Member

Choose a reason for hiding this comment

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

Can you wrap this like the rest of it, please? Markdown doesn't mind if the [ and ] are on different lines.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Should I make a 2nd commit or replace this one?

I'm new to this PR game.

Copy link
Contributor

Choose a reason for hiding this comment

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

Generally while discussion is ongoing, we prefer that you only add more commits so we can quickly see what has changed. However once you believe everything is good to go, we want the commits rebased into a minimal form (often, a single commit, unless the PR is large) to keep the history neat.

In this case, since the PR is small, and this is likely to be the only issue with it, it's safe to just rebase right away.

Copy link
Member

Choose a reason for hiding this comment

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

It depends per project. We prefer replace. Just git commit --amend and force push, and it will update the PR

Sent from my iPhone

On Sep 13, 2014, at 15:30, Dan Connolly [email protected] wrote:

In src/doc/guide.md:

@@ -185,8 +185,7 @@ Next up is this line:
This line does all of the work in our little program. There are a number of
details that are important here. The first is that it's indented with four
spaces, not tabs. Please configure your editor of choice to insert four spaces
-with the tab key. We provide some sample configurations for various editors
-here.
+with the tab key. We provide some sample configurations for various editors.
Should I make a 2nd commit or replace this one?

I'm new to this PR game.


Reply to this email directly or view it on GitHub.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I used the github web interface to make this PR; I haven't made a real clone of rust in a while. I hope to get around to this eventually, but it may be a while.

Copy link
Member

Choose a reason for hiding this comment

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

No worries then! I did it for you over in #17278. Thanks so much for the patch!


The second point is the `println!()` part. This is calling a Rust **macro**,
which is how metaprogramming is done in Rust. If it were a function instead, it
Expand Down