Skip to content

Commit 786a3d2

Browse files
eksperimentaljosevalim
authored andcommitted
Review of README.md (#9086)
1 parent a6e7b8a commit 786a3d2

File tree

3 files changed

+46
-34
lines changed

3 files changed

+46
-34
lines changed

CODE_OF_CONDUCT.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ If you participate in or contribute to the Elixir ecosystem in any way, you are
3939

4040
Explicit enforcement of the Code of Conduct applies to the official mediums operated by the Elixir project:
4141

42-
* The official GitHub projects and code reviews.
42+
* The [official GitHub projects][1] and code reviews.
4343
* The official elixir-lang mailing lists.
44-
* The #elixir-lang IRC channel on Freenode.
44+
* The **[#elixir-lang][2]** IRC channel on [Freenode][3].
4545

46-
Other Elixir activities (such as conferences, meetups, and other unofficial forums) are encouraged to adopt this Code of Conduct. Such groups must provide their own contact information.
46+
Other Elixir activities (such as conferences, meetups, and unofficial forums) are encouraged to adopt this Code of Conduct. Such groups must provide their own contact information.
4747

4848
Project maintainers may remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct.
4949

@@ -54,3 +54,7 @@ Instances of abusive, harassing, or otherwise unacceptable behavior may be repor
5454
## Acknowledgements
5555

5656
This document was based on the Code of Conduct from the Go project with parts derived from Django's Code of Conduct, Rust's Code of Conduct and the Contributor Covenant.
57+
58+
[1]: https://github.com/elixir-lang/
59+
[2]: https://webchat.freenode.net/?channels=#elixir-lang
60+
[3]: https://www.freenode.net

ISSUE_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
### Precheck
22

3-
* Do not use the issues tracker for help or support (try Elixir Forum, Stack Overflow, IRC, etc.)
3+
* Do not use the issue tracker for help or support (try Elixir Forum, Stack Overflow, IRC, etc.)
44
* For proposing a new feature, please start a discussion on the Elixir Core mailing list: https://groups.google.com/group/elixir-lang-core
55
* For bugs, do a quick search and make sure the bug has not yet been reported
66
* Please disclose security vulnerabilities privately at [email protected]

README.md

Lines changed: 38 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,20 @@ and maintainable applications.
1010
For more about Elixir, installation and documentation,
1111
[check Elixir's website](https://elixir-lang.org/).
1212

13-
## Announcements
13+
## Policies
1414

15-
New releases are announced in the
16-
[announcements mailing list](https://groups.google.com/group/elixir-lang-ann).
17-
All security releases [will be tagged with `[security]`](https://groups.google.com/forum/#!searchin/elixir-lang-ann/%5Bsecurity%5D%7Csort:date).
15+
New releases are announced in the [announcement mailing list][8].
16+
You can subscribe by sending an email to [email protected] and replying to the confirmation email.
17+
18+
All security releases [will be tagged with `[security]`][10]. For more information, please read our [Security Policy][9].
19+
20+
All interactions in our official communication channels follow our [Code of Conduct][1].
21+
22+
## Bug reports
23+
24+
For reporting bugs, [visit our issue tracker][2] and follow the steps
25+
for reporting a new issue. **Please disclose security vulnerabilities
26+
privately at [email protected]**.
1827

1928
## Compiling from source
2029

@@ -38,9 +47,9 @@ If Elixir fails to build (specifically when pulling in a new version via
3847
`git`), be sure to remove any previous build artifacts by running
3948
`make clean`, then `make test`.
4049

41-
If tests pass, you can Interactive Elixir by running `bin/iex` in your terminal.
50+
If tests pass, you can use Interactive Elixir by running `bin/iex` in your terminal.
4251

43-
However, if tests fail, it is likely you have an outdated Erlang/OTP version
52+
However, if tests fail, it is likely that you have an outdated Erlang/OTP version
4453
(Elixir requires Erlang/OTP 20.0 or later). You can check your Erlang/OTP version
4554
by calling `erl` in the command line. You will see some information as follows:
4655

@@ -49,51 +58,42 @@ by calling `erl` in the command line. You will see some information as follows:
4958
If you have properly set up your dependencies and tests still fail,
5059
you may want to open up a bug report, as explained next.
5160

52-
## Bug reports
53-
54-
For reporting bugs, [visit our issues tracker][2] and follow the steps
55-
for reporting a new issue. **Please disclose security vulnerabilities
56-
privately at [email protected]**.
57-
5861
## Proposing new features
5962

6063
For proposing new features, please start a discussion in the
6164
[Elixir Core mailing list][3]. Keep in mind that it is your responsibility
6265
to argue and explain why a feature is useful and how it will impact the
6366
codebase and the community.
6467

65-
Once a proposal is accepted, it will be added to [the issues tracker][2].
66-
The issues tracker focuses on *actionable items* and it holds a list of
68+
Once a proposal is accepted, it will be added to [the issue tracker][2].
69+
The issue tracker focuses on *actionable items* and it holds a list of
6770
upcoming enhancements and pending bugs. All entries in the tracker are
6871
tagged for clarity and to ease collaboration.
6972

7073
Features and bug fixes that have already been merged and will be included
71-
in the next release are marked as "closed" in the issues tracker and are
72-
added to the [CHANGELOG](CHANGELOG.md).
73-
74-
Finally, remember all interactions in our official spaces follow our
75-
[Code of Conduct][1].
74+
in the next release are marked as "closed" in the issue tracker and are
75+
added to the [changelog][7].
7676

7777
## Contributing
7878

7979
We welcome everyone to contribute to Elixir. To do so, there are a few
8080
things you need to know about the code. First, Elixir code is divided
8181
in applications inside the `lib` folder:
8282

83-
* `elixir` - Contains Elixir's kernel and stdlib
83+
* `elixir` - Elixir's kernel and standard library
8484

85-
* `eex` - Template engine that allows you to embed Elixir
85+
* `eex` - EEx is the template engine that allows you to embed Elixir
8686

87-
* `ex_unit` - Simple test framework that ships with Elixir
87+
* `ex_unit` - ExUnit is a simple test framework that ships with Elixir
8888

89-
* `iex` - IEx, Elixir's interactive shell
89+
* `iex` - IEx stands for Interactive Elixir: Elixir's interactive shell
9090

91-
* `logger` - The built-in logger
91+
* `logger` - Logger is the built-in logger
9292

93-
* `mix` - Elixir's build tool
93+
* `mix` - Mix is Elixir's build tool
9494

9595
You can run all tests in the root directory with `make test` and you can
96-
also run tests for a specific framework `make test_#{NAME}`, for example,
96+
also run tests for a specific framework `make test_#{APPLICATION}`, for example,
9797
`make test_ex_unit`. If you just changed something in the Elixir's standard
9898
library, you can run only that portion through `make test_stdlib`.
9999

@@ -126,7 +126,7 @@ make clean_elixir compile
126126
Similarly, if you can't get Elixir to compile or the tests to pass after
127127
updating an existing checkout, run `make clean compile`. You can check
128128
[the official build status on Travis-CI](https://travis-ci.org/elixir-lang/elixir).
129-
More tasks can be found by reading the [Makefile](./Makefile).
129+
More tasks can be found by reading the [Makefile](Makefile).
130130

131131
With tests running and passing, you are ready to contribute to Elixir and
132132
[send a pull request](https://help.github.com/articles/using-pull-requests/).
@@ -158,7 +158,8 @@ another team member can merge it.
158158

159159
When the review finishes, your pull request will be squashed and merged
160160
into the repository. If you have carefully organized your commits and
161-
believe they should be merged without squashing, leave a comment.
161+
believe they should be merged without squashing, please mention it in
162+
a comment.
162163

163164
## Building documentation
164165

@@ -186,16 +187,23 @@ the `doc` directory. If you are planning to contribute documentation,
186187

187188
* [Elixir Documentation][6]
188189
* [Elixir Core Mailing list (development)][3]
189-
* [Issues tracker][2]
190+
* [Announcement mailing list][8]
190191
* [Code of Conduct][1]
192+
* [Issue tracker][2]
193+
* [Changelog][7]
194+
* [Security Policy][9]
191195
* **[#elixir-lang][4]** on [Freenode][5] IRC
192196

193197
[1]: CODE_OF_CONDUCT.md
194198
[2]: https://github.com/elixir-lang/elixir/issues
195199
[3]: https://groups.google.com/group/elixir-lang-core
196200
[4]: https://webchat.freenode.net/?channels=#elixir-lang
197-
[5]: http://www.freenode.net
201+
[5]: https://www.freenode.net
198202
[6]: https://elixir-lang.org/docs.html
203+
[7]: CHANGELOG.md
204+
[8]: https://groups.google.com/group/elixir-lang-ann
205+
[9]: SECURITY.md
206+
[10]: https://groups.google.com/forum/#!searchin/elixir-lang-ann/%5Bsecurity%5D%7Csort:date
199207

200208
## License
201209

0 commit comments

Comments
 (0)