Skip to content

Commit aca26fd

Browse files
authored
Merge pull request #19 from JohnTitor/tweak-docs
2 parents 149f908 + b65f188 commit aca26fd

7 files changed

+14
-53
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
.sass-cache
22
_site
3-
*~
3+
*~

CODE_OF_CONDUCT.md

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,3 @@
11
# The Rust Code of Conduct
22

3-
A version of this document [can be found online](https://www.rust-lang.org/conduct.html).
4-
5-
## Conduct
6-
7-
**Contact**: [[email protected]](mailto:[email protected])
8-
9-
* We are committed to providing a friendly, safe and welcoming environment for all, regardless of level of experience, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, nationality, or other similar characteristic.
10-
* On IRC, please avoid using overtly sexual nicknames or other nicknames that might detract from a friendly, safe and welcoming environment for all.
11-
* Please be kind and courteous. There's no need to be mean or rude.
12-
* Respect that people have differences of opinion and that every design or implementation choice carries a trade-off and numerous costs. There is seldom a right answer.
13-
* Please keep unstructured critique to a minimum. If you have solid ideas you want to experiment with, make a fork and see how it works.
14-
* We will exclude you from interaction if you insult, demean or harass anyone. That is not welcome behaviour. We interpret the term "harassment" as including the definition in the <a href="http://citizencodeofconduct.org/">Citizen Code of Conduct</a>; if you have any lack of clarity about what might be included in that concept, please read their definition. In particular, we don't tolerate behavior that excludes people in socially marginalized groups.
15-
* Private harassment is also unacceptable. No matter who you are, if you feel you have been or are being harassed or made uncomfortable by a community member, please contact one of the channel ops or any of the [Rust moderation team][mod_team] immediately. Whether you're a regular contributor or a newcomer, we care about making this community a safe place for you and we've got your back.
16-
* Likewise any spamming, trolling, flaming, baiting or other attention-stealing behaviour is not welcome.
17-
18-
## Moderation
19-
20-
21-
These are the policies for upholding our community's standards of conduct. If you feel that a thread needs moderation, please contact the [Rust moderation team][mod_team].
22-
23-
1. Remarks that violate the Rust standards of conduct, including hateful, hurtful, oppressive, or exclusionary remarks, are not allowed. (Cursing is allowed, but never targeting another user, and never in a hateful manner.)
24-
2. Remarks that moderators find inappropriate, whether listed in the code of conduct or not, are also not allowed.
25-
3. Moderators will first respond to such remarks with a warning.
26-
4. If the warning is unheeded, the user will be "kicked," i.e., kicked out of the communication channel to cool off.
27-
5. If the user comes back and continues to make trouble, they will be banned, i.e., indefinitely excluded.
28-
6. Moderators may choose at their discretion to un-ban the user if it was a first offense and they offer the offended party a genuine apology.
29-
7. If a moderator bans someone and you think it was unjustified, please take it up with that moderator, or with a different moderator, **in private**. Complaints about bans in-channel are not allowed.
30-
8. Moderators are held to a higher standard than other community members. If a moderator creates an inappropriate situation, they should expect less leeway than others.
31-
32-
In the Rust community we strive to go the extra step to look out for each other. Don't just aim to be technically unimpeachable, try to be your best self. In particular, avoid flirting with offensive or sensitive issues, particularly if they're off-topic; this all too often leads to unnecessary fights, hurt feelings, and damaged trust; worse, it can drive people away from the community entirely.
33-
34-
And if someone takes issue with something you said or did, resist the urge to be defensive. Just stop doing what it was they complained about and apologize. Even if you feel you were misinterpreted or unfairly accused, chances are good there was something you could've communicated better — remember that it's your responsibility to make your fellow Rustaceans comfortable. Everyone wants to get along and we are all here first and foremost because we want to talk about cool technology. You will find that people will be eager to assume good intent and forgive as long as you earn their trust.
35-
36-
The enforcement policies listed above apply to all official Rust venues; including official IRC channels (#rust, #rust-internals, #rust-tools, #rust-libs, #rustc, #rust-beginners, #rust-docs, #rust-community, #rust-lang, and #cargo); GitHub repositories under rust-lang, rust-lang-nursery, and rust-lang-deprecated; and all forums under rust-lang.org (users.rust-lang.org, internals.rust-lang.org). For other projects adopting the Rust Code of Conduct, please contact the maintainers of those projects for enforcement. If you wish to use this code of conduct for your own project, consider explicitly mentioning your moderation policy or making a copy with your own moderation policy so as to avoid confusion.
37-
38-
*Adapted from the [Node.js Policy on Trolling](http://blog.izs.me/post/30036893703/policy-on-trolling) as well as the [Contributor Covenant v1.3.0](https://www.contributor-covenant.org/version/1/3/0/).*
39-
40-
[mod_team]: https://www.rust-lang.org/team.html#Moderation-team
3+
The Code of Conduct for this repository [can be found online](https://www.rust-lang.org/policies/code-of-conduct).

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ This project has been forked from the awesome [GitHub repo] of the [RustLang blo
2121

2222
A deeper guide on how to setup a jekyll blog can be found [here](https://www.smashingmagazine.com/2014/08/build-blog-jekyll-github-pages/). I'll probably create one too if it helps.
2323

24-
The theme and layout can be found under _includes / _layouts _sass and / css.
24+
The theme and layout can be found under `/_includes`, `/_layouts`, `/_sass`, and `/css`.
2525

2626
The favicon is [here](favicon.ico).
2727

@@ -39,4 +39,4 @@ Any project I create and I take part of respects the [Rust Code of Conduct](CODE
3939

4040
If there is any issue send me a message and I will make sure the code is respected.
4141

42-
Happy blogging and happy coding ! :)
42+
Happy blogging and happy coding ! :)

_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ exclude:
1717
# Build settings
1818
highlighter: rouge
1919

20-
root: "https://check-out-my-awesome-blog.org" # Not really sure this is useful, need to cross check with blog writers :)
20+
root: "https://check-out-my-awesome-blog.org" # Not really sure this is useful, need to cross check with blog writers :)

_posts/2018-05-10-blog-boilerplate.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
---
22
layout: post
3-
title: "This is an example article, modify me to create your first blog post !"
4-
author: You ! :)
3+
title: "This is an example article, modify me to create your first blog post!"
4+
author: You! :)
55
---
66

7-
Here is a boilerplate you can modify to write your first blog post !
7+
Here is a boilerplate you can modify to write your first blog post!
88

99
All of the [markdown rules](https://guides.github.com/features/mastering-markdown/) apply here.
1010

11-
For example, you can write something in *italic* like this, you can write in **bold** like that.
11+
For example, you can write something in *italic* like this, you can write in **bold** like that.
1212

1313
# This is an h1 (big) title
1414

1515
## This title is a bit smaller
1616

1717
### This one is even more smaller etc.
1818

19-
Don't hesitate and visit [mastering-markdown](https://guides.github.com/features/mastering-markdown/) to get more information !
19+
Don't hesitate and visit [mastering-markdown](https://guides.github.com/features/mastering-markdown/) to get more information!
2020

21-
# The name of the file is important !
22-
This will generate the url, and complete the blog post meta informations (Such as the date for example).
21+
# The name of the file is important!
22+
This will generate the url, and complete the blog post meta information (Such as the date for example).
2323

24-
A relevant page name, which matches the title pretty well might help [Search Engine Optimization](https://en.wikipedia.org/wiki/Search_engine_optimization) (Making sure the post is well referenced on search engines)
24+
A relevant page name, which matches the title pretty well might help [Search Engine Optimization](https://en.wikipedia.org/wiki/Search_engine_optimization) (Making sure the post is well referenced on search engines)

css/center-img.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@
1818
margin-left: 15px;
1919
margin-bottom: 15px;
2020
clear: right;
21-
}
21+
}

css/main.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
---
44
@charset "utf-8";
55

6-
7-
86
// Our variables
97
$base-font-family: Helvetica, Arial, sans-serif;
108
$base-font-size: 16px;

0 commit comments

Comments
 (0)