Skip to content

Commit 8a2c50f

Browse files
Merge pull request #3204 from OctoPie23/docs-edit
Add docs, changelog and authors in CONTRIBUTION and fix typos and errors
2 parents 80ecd35 + 3eab071 commit 8a2c50f

2 files changed

Lines changed: 36 additions & 24 deletions

File tree

AUTHORS.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ The following organizations or individuals have contributed to ScanCode:
7979
- Sebastian Schuberth @sschuberth
8080
- Shankhadeep Dey @Iamshankhadeep
8181
- Sharikzama @ZamaSharik
82+
- Shrijal Acharya @OctoPie23
8283
- Shivam Chauhan @chashiv
8384
- Shivam Sandbhor @sbs2001
8485
- Steven Esser @majurg

CONTRIBUTING.rst

Lines changed: 35 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Contributing
33
============
44

55
Contributions are welcome and appreciated!
6-
Every little bit helps, and credit will always be given.
6+
Every little bit helps, and a credit will always be given.
77

88
.. _issues : https://github.com/nexB/scancode-toolkit/issues
99
__ issues_
@@ -14,15 +14,15 @@ check `easy issues <https://github.com/nexB/scancode-toolkit/labels/easy>`_
1414
When contributing to ScanCode (such as code, bugs, documentation, etc.) you
1515
agree to the Developer `Certificate of Origin <http://developercertificate.org/>`_
1616
and the ScanCode license (see the `NOTICE <https://github.com/nexB/scancode-toolkit/blob/develop/NOTICE>`_ file).
17-
The same approach is used by the Linux Kernel developers and several other projects.
17+
The same approach is used by Linux Kernel developers and several other projects.
1818

1919
For commits, it is best to simply add a line like this to your commit message,
2020
with your name and email::
2121

2222
Signed-off-by: Jane Doe <developer@example.com>
2323

2424
Please try to write a good commit message, see `good commit message wiki
25-
<https://aboutcode.readthedocs.io/en/latest/contributing/writing_good_commit_messages.html>` for
25+
<https://aboutcode.readthedocs.io/en/latest/contributing/writing_good_commit_messages.html>`_ for
2626
details. In particular use the imperative for your commit subject: think that
2727
you are giving an order to the codebase to update itself.
2828

@@ -35,7 +35,7 @@ To send feedback or ask a question, `file an issue <issues_>`_
3535
If you are proposing a feature:
3636

3737
* Explain how it would work.
38-
* Keep the scope simple possible to make it easier to implement.
38+
* Keep the scope as simple as possible to make it easier to implement.
3939
* Remember that your contributions are welcomed to implement this feature!
4040

4141

@@ -54,23 +54,21 @@ For other questions, discussions, and chats, we have:
5454
This is a busy place with a lot of CI and commit notifications that makes
5555
actual chat sometimes difficult!
5656

57-
- a mailing list at `sourceforge <https://lists.sourceforge.net/lists/listinfo/aboutcode-discuss>`_
58-
5957
- a Gitter channel to discuss Documentation at https://gitter.im/aboutcode-org/gsod-season-of-docs
6058

6159
Bug reports
6260
===========
6361

6462
When `reporting a bug`__ please include:
6563

66-
* Your operating system name, version and architecture (32 or 64 bits).
64+
* Your operating system name, version, and architecture (32 or 64 bits).
6765
* Your Python version.
6866
* Your ScanCode version.
6967
* Any additional details about your local setup that might be helpful to
7068
diagnose this bug.
7169
* Detailed steps to reproduce the bug, such as the commands you ran and a link
7270
to the code you are scanning.
73-
* The errors messages or failure trace if any.
71+
* The error messages or failure trace if any.
7472
* If helpful, you can add a screenshot as an issue attachment when relevant or
7573
some extra file as a link to a `Gist <https://gist.github.com>`_.
7674

@@ -83,11 +81,11 @@ any other general upgrades, etc. Even a minor typo fix is welcomed.
8381

8482
If something is missing in the documentation or if you found some part confusing,
8583
please file an issue with your suggestions for improvement. Use the “Documentation Improvement”
86-
template. Your help and contributions makes ScanCode docs better, we love hearing from you!
84+
template. Your help and contribution make ScanCode docs better, we love hearing from you!
8785

8886
The ScanCode documentation is hosted at `scancode-toolkit.readthedocs.io <https://scancode-toolkit.readthedocs.io/en/latest/>`_.
8987

90-
If you want to contribute to Scancode Dcoumentation, you'll find `this guide here <https://scancode-toolkit.readthedocs.io/en/latest/contribute/contrib_doc.html>`_ helpful.
88+
If you want to contribute to Scancode Documentation, you'll find `this guide here <https://scancode-toolkit.readthedocs.io/en/latest/contribute/contrib_doc.html>`_ helpful.
9189

9290
Development
9391
===========
@@ -124,11 +122,13 @@ To set up ScanCode for local development:
124122
3. Create a branch for local development::
125123

126124
git checkout -b name-of-your-bugfix-or-feature
125+
126+
4. Check out the Contributing to Code Development `documentation <https://scancode-toolkit.readthedocs.io/en/stable/contribute/contrib_dev.html>`_, as it contains more in-depth guide for contributing code and documentation.
127127

128-
4. To configure your local environment for development, locate to the main
129-
directory of the local repository, run the configure script.
128+
5. To configure your local environment for development, locate to the main
129+
directory of the local repository, and run the configure script.
130130
The configure script creates an isolated Python `virtual environment` in
131-
your checkout directory, the Python `pip` tool, and installs the thirdparty
131+
your checkout directory, the Python `pip` tool, and installs the third-party
132132
libraries (from the `thirdparty/ directory`), setup the paths, etc.
133133
See https://virtualenv.pypa.io/en/latest/ for more details.
134134

@@ -157,10 +157,20 @@ To set up ScanCode for local development:
157157
When you pull new code from git, rerun ./configure
158158

159159

160-
5. Now you can make your code changes in your local clone.
160+
6. Now you can make your code changes in your local clone.
161161
Please create new unit tests for your code. We love tests!
162162

163-
6. When you are done with your changes, run all the tests.
163+
7. An update to the ``CHANGELOG`` is required if any important changes are made that needs to be communicated such as:
164+
165+
* Changes in the API.
166+
167+
* Addition or deletion of CLI options.
168+
169+
* Addition of any new feature or any other miscellaneous changes to the program.
170+
171+
8. If there is a code change, a significant document, or any other changes, you must update the ``AUTHORS`` to include your own name.
172+
173+
9. When you are done with your changes, run all the tests.
164174
Use this command::
165175

166176
py.test
@@ -169,7 +179,7 @@ To set up ScanCode for local development:
169179

170180
py.test -n6
171181

172-
If you are running this on a RedHat based OS you may come across this
182+
If you are running this on a RedHat-based OS you may come across this
173183
failure::
174184

175185
OSError: libbz2.so.1.0: cannot open shared object file: No such file or directory
@@ -182,18 +192,18 @@ To set up ScanCode for local development:
182192

183193
See `this issue <https://github.com/nexB/scancode-toolkit/issues/443>`_ for more information.
184194

185-
7. Check the status of your local repository before commit, regarding files changed::
195+
10. Check the status of your local repository before committing, regarding files changed::
186196

187-
git status
197+
git status
188198

189199

190-
8. Commit your changes and push your branch to your GitHub fork::
200+
11. Commit your changes and push your branch to your GitHub fork::
191201

192-
git add <file-changed-1> <file-changed-2> <file-changed-3>
193-
git commit -m "Your detailed description of your changes." --signoff
194-
git push <repository-alias-name> name-of-your-bugfix-or-feature
202+
git add <file-changed-1> <file-changed-2> <file-changed-3>
203+
git commit -m "Your detailed description of your changes." --signoff
204+
git push <repository-alias-name> name-of-your-bugfix-or-feature
195205

196-
9. Submit a pull request through the GitHub website for this branch.
206+
12. Submit a pull request through the GitHub website for this branch.
197207

198208

199209
Pull Request Guidelines
@@ -205,7 +215,7 @@ create a pull request. You can add new commits to your branch as needed.
205215
For merging, your request would need to:
206216

207217
1. Include unit tests that are passing (run ``py.test``).
208-
2. Update documentation as needed for new API, functionality etc.
218+
2. Update documentation as needed for new API, functionality, etc.
209219
3. Add a note to ``CHANGELOG.rst`` about the changes.
210220
4. Add your name to ``AUTHORS.rst``.
211221

@@ -228,3 +238,4 @@ To run tests in parallel on eight processors::
228238
To run tests verbosely, displaying all print statements to terminal::
229239

230240
py.test -vvs
241+

0 commit comments

Comments
 (0)