Skip to content

Commit 9bedfab

Browse files
committed
some formatting,ordering and naming fixes
1 parent 8ae8e1b commit 9bedfab

8 files changed

Lines changed: 48 additions & 40 deletions

File tree

docs/DeveloperWorkflow/bots_and_integrations.rst

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,41 +20,41 @@ This bot is created and maintained by the `all-contributors` organisation `here
2020

2121
@all-contributors please add <username> for <contributions>
2222

23-
* <contribution>: See the `Emoji Key (Contribution Types Reference) <https://allcontributors.org/docs/en/emoji-key>`_ for a list of valid contribution types.
23+
* <contribution> : See the `Emoji Key (Contribution Types Reference) <https://allcontributors.org/docs/en/emoji-key>`_ for a list of valid contribution types.
2424

2525
* **Intent-Based Bot** : Your request to the bot doesn't need to be perfect. The bot will use basic Natural Language Parsing to determine your intent. For example, this will work too:
2626

2727
::
2828

29-
Jane you are crushing it in documentation and your infrastructure work has been great too. Let's
29+
Jane you are crushing it in documentation and your infrastructure work has been great too. Let's
3030
add jane.doe23 for her contributions. cc @all-contributors``
3131

3232
* The bot will then create a Pull Request to add the contributor, then reply with the pull request details.
3333

3434
Contributing
3535
============
3636

37-
If you wish to configure or modify the bot settings according to the needs of the repository, you may update the ``.all-contributorsrc`` JSON file. The data used to generate the contributors list will be stored in there, and you can configure how you want @all-contributors to generate the list.
37+
If you wish to configure or modify the bot settings according to the needs of the repository, you may update the ``.all-contributorsrc`` JSON file. The data used to generate the contributors list will be stored in there, and you can configure how you want ``@all-contributors`` to generate the list.
3838
Here are more details on the `configuration options <https://allcontributors.org/docs/en/bot/configuration>`_ available.
3939

4040

4141
Botmojaglobal
4242
-------------
4343

44-
Botmojaglobal uses @zulipbot, a GitHub workflow bot from the zulip organisation, to handle issues and pull requests in our repositories in order to create a better workflow for contributors.
45-
This bot is created and maintained by the `zulip` organisation `here <https://github.com/zulip/zulipbot>`_.
44+
Botmojaglobal uses **@zulipbot**, a GitHub workflow bot from the zulip organisation, to handle issues and pull requests in our repositories in order to create a better workflow for contributors.
45+
This bot is created and maintained by the **zulip** organisation `here <https://github.com/zulip/zulipbot>`_.
4646

4747
**Usage**
4848
=========
49-
* **Claim an issue** : Comment ``@botmojaglobal claim`` on the issue you want to claim; @botmojaglobal will assign you to the issue and label the issue as ``in progress``.
49+
* **Claim an issue** : Comment ``@botmojaglobal claim`` on the issue you want to claim; **@botmojaglobal** will assign you to the issue and label the issue as ``in progress``.
5050

51-
* If you’re a new contributor, @botmojaglobal will give you read-only collaborator access to the repository and leave a welcome message on the issue you claimed.
51+
* If you’re a new contributor, **@botmojaglobal** will give you read-only collaborator access to the repository and leave a welcome message on the issue you claimed.
5252

5353
* You can also claim an issue that you’ve opened by including ``@botmojaglobal claim`` in the body of your issue.
5454

5555
* If you accidentally claim an issue you didn’t want to claim, comment ``@botmojaglobal abandon`` to abandon an issue.
5656

57-
* **Label your issues** : Add appropriate labels to issues that you opened by including @botmojaglobal add in an issue comment or the body of your issue followed by the desired labels enclosed within double quotes ("").
57+
* **Label your issues** : Add appropriate labels to issues that you opened by including **@botmojaglobal** add in an issue comment or the body of your issue followed by the desired labels enclosed within double quotes ("").
5858

5959
* For example, to add the bug and help wanted labels to your issue, comment or include ``@botmojaglobal add "bug" "help wanted"`` in the issue body.
6060

@@ -64,25 +64,25 @@ This bot is created and maintained by the `zulip` organisation `here <https://gi
6464

6565
* **Find unclaimed issues** : Use the `GitHub search feature <https://help.github.com/en/articles/using-search-to-filter-issues-and-pull-requests>`_ to find unclaimed issues by adding one of the following filters to your search:
6666

67-
* -label: "in progress" (excludes issues labeled with the in progress label)
67+
* -label: ``in progress`` (excludes issues labeled with the in progress label)
6868

6969
* no:assignee (shows issues without assignees)
7070

71-
Issues labeled with the in progress label and/or assigned to other users have already been claimed.
71+
Issues labeled with the ``in progress`` label and/or assigned to other users have already been claimed.
7272

73-
* **Track inactive claimed issues** : If a claimed issue has not been updated for a week, @botmojaglobal will post a comment on the inactive issue to ask the assignee(s) if they are still working on the issue.
73+
* **Track inactive claimed issues** : If a claimed issue has not been updated for a week, **@botmojaglobal** will post a comment on the inactive issue to ask the assignee(s) if they are still working on the issue.
7474

75-
* If you see this comment on an issue you claimed, you should post a comment on the issue to notify @botmojaglobal that you’re still working on it.
75+
* If you see this comment on an issue you claimed, you should post a comment on the issue to notify **@botmojaglobal** that you’re still working on it.
7676

77-
* If @botmojaglobal does not receive a response from the assignee within 3 days of an inactive issue prompt, @botmojaglobal will automatically remove the issue’s current assignee(s) and the in progress label to allow others to work on an inactive issue.
77+
* If **@botmojaglobal** does not receive a response from the assignee within 3 days of an inactive issue prompt, **@botmojaglobal** will automatically remove the issue’s current assignee(s) and the ``in progress`` label to allow others to work on an inactive issue.
7878

7979
Contributing
8080
============
81-
If you wish to help develop and contribute to @botmojaglobal, check out the `mojaglobal/zulipbot <https://github.com/moja-global/zulipbot>`_ repository fork on GitHub and read the project’s contributing guidelines for more information.
81+
If you wish to help develop and contribute to **@botmojaglobal**, check out the `mojaglobal/zulipbot <https://github.com/moja-global/zulipbot>`_ repository fork on GitHub and read the project’s contributing guidelines for more information.
8282

8383
Welcome Bot
8484
-----------
85-
Welcome Bot is a `github app <https://github.com/apps/welcome>`_ that welcomes new users based off maintainer defined comments that should be located in a .github/config.yml. This app is configured for moja global in order to provide a richer experience to all new contributors.
85+
Welcome Bot is a `github app <https://github.com/apps/welcome>`_ that welcomes new users based off maintainer defined comments that should be located in a ``.github/config.yml``. This app is configured for moja global in order to provide a richer experience to all new contributors.
8686
This bot is created and maintained by the `probot` organisation `here <https://github.com/probot>`_.
8787

8888
**Usage**
@@ -96,7 +96,7 @@ This bot is created and maintained by the `probot` organisation `here <https://
9696

9797
* firstPRMergeComment : This message is displayed whenever a new contributor's first pull request gets merged in the repository.
9898

99-
* You can opt out of having the bot comment on first time pull requests, pull request merges, or new issues by not filling in a value for each of the above respective fields.
99+
You can opt out of having the bot comment on first time pull requests, pull request merges, or new issues by not filling in a value for each of the above respective fields.
100100

101101
Contributing
102102
============

docs/DeveloperWorkflow/index.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.. _DeveloperWorkflow:
22

3-
GitHub Workflow Best Practices
4-
##############################
3+
GitHub Workflow
4+
###############
55

66
moja global as an Open source organisation wants to provide their users the best possible collaborative experience while meeting their security requirements and limiting their maintenance effort.
77
Working on a collaborative platform like GitHub at times can be overwhelming, especially as the number of users and repositories grow within an organization.
@@ -14,8 +14,8 @@ Contents:
1414
.. toctree::
1515
:maxdepth: 1
1616

17-
reviewing
17+
repository_maintenance
18+
bots_and_integrations
1819
automated_checks
20+
reviewing
1921
manual_testing_pr
20-
bots_and_integrations
21-
repository_maintenance

docs/DeveloperWorkflow/repository_maintenance.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.. _DeveloperWorkflow:
22

3-
Repository maintenance under GitHub
4-
###################################
3+
GitHub Repository maintenance
4+
#############################
55

66
This section guides contributors and maintainers on the guidelines to follow while setting up a new repository and maintaining it under moja global.
77

@@ -97,6 +97,7 @@ Creating and maintaining Project Boards
9797
Project boards on GitHub help you organize and prioritize your work by creating them for specific feature work, comprehensive roadmaps, or even release checklists.
9898

9999
There are 2 types of project boards available:
100+
100101
* Repository: Boards for use in a single repository.
101102
* Organization: Boards for use in a GitHub organization across multiple repositories (but private to organization members)
102103

docs/DevelopmentSetup/index.rst

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,12 @@
11
.. _DevelopmentSetup:
22

3-
Development Setup
4-
#################
3+
FLINT Development Setup
4+
#######################
55

66
This section guides first-time contributors through installing FLINT development environment on Windows and Ubuntu.
77

88
The recommended method for installing the FLINT development environment is on Windows using cmake, vcpkg and Visual Studio 2017 or 2019. Inorder to setup FLINT on Linux based systems, Docker containers are preferred. This method creates containers which are a simple way to build FLINT and all required dependencies.
99

10-
Contents:
11-
12-
.. toctree::
13-
:maxdepth: 1
14-
15-
windows_installation
16-
docker_installation
17-
1810
**Before Setting Up FLINT**
1911

2012
- Please make sure that all the prerequisites required have been installed and configured correctly.
@@ -27,4 +19,6 @@ Contents:
2719
:maxdepth: 1
2820

2921
git_and_github_guide
22+
windows_installation
23+
docker_installation
3024
FLINT.example_installation

docs/contributing/before_contribute.rst

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,15 @@ Before making a contribution
66
* Please checkout our `Git and Github guide <../DevelopmentSetup/git_and_github_guide.html>`_ for detailed instructions on how to setup this project and make a pull request.
77
* Please follow our `Code of Conduct <coc.html>`_ at all times.
88
* Make sure your contribution follows the `moja global best contribution practices <code_contribution_best_practices.html>`_.
9+
10+
Join our communication Channels
11+
===============================
12+
13+
If you are new to moja global, joining our communication channels can help you connect with community members and fellow contributors who can help answer your queries. In case you are facing any issues with the project setup or are looking for issues to contribute to, this would be a good place to start.
14+
Please check out our `Join us <../contact.html>`_ section for more information on how to join our communication channels.
15+
16+
Contributors Website
17+
====================
18+
19+
If you are a first-timer then please checkout our `Contributor Website <https://contributors-website.herokuapp.com/>`_ . Here you can find out beginner friendly issues across all moja global repositories and even get featured as a new contributor!
20+
Along with checking out our Contributing workflow, you may also reach out to us through the contact form and share your interesting ideas with us!

docs/contributing/code_contribution_best_practices.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ This guide is to inform new contributors about the best practices followed by mo
88
Commit Guidelines
99
-----------------
1010

11-
* Make sure your commit is passing all the tests. If your commit is failing tests then please try to fix the same commit instead of making a new commit by using `git --amend`
11+
* Make sure your commit is passing all the tests. If your commit is failing tests then please try to fix the same commit instead of making a new commit by using ``git --amend``
1212
* Every commit should be directed to solve a single problem instead of trying to solve multiple issues at once. This encourages simplicity and also makes it easier for the reviewers to review.
1313
* If the code introduced in the commit decreases the coverage/requires tests, don't forget to add them too.
1414

15-
Although it’s encouraged to make commits following these guidelines but incase you missed, you can always fix your history using `git rebase -i`.
15+
Although it’s encouraged to make commits following these guidelines but incase you missed, you can always fix your history using ``git rebase -i``.
1616

1717
Commit Message Guidelines
1818
----------------------------
1919

2020
* Keep the commit message short but concise explaining your changes and the problem you are trying to solve.
2121
* Try to write the commit messages in an imperative tone for example:- 'Fix', 'Update', 'Add' instead of 'Fixed', 'Updated', 'Added'.
22-
* Reference the issue solved in the commit message, for example:- `Fixes #8293: Add login api unit tests`. This will automatically close the issue referenced when your pull request gets merged.
22+
* Reference the issue solved in the commit message, for example:- ``Fixes #8293: Add login api unit tests``. This will automatically close the issue referenced when your pull request gets merged.
2323

2424
Developer Certificate of Origin
2525
-------------------------------
@@ -53,6 +53,7 @@ We encourage you to add the mentioned tools as plugins in your editor.
5353
- Coding enforcement: We know that the style guides are long and detailed and not always easy to adhere to. As such, the intention is to use `Clang-Tidy <http://clang.llvm.org/extra/clang-tidy/>`_ as a tool to check and correct code formatting as determined by the Google C++ style guide. This will be implemented as an automated check through the Continuous Integration system.
5454

5555

56+
5657
- **Python Repositories**:
5758

5859
moja global follows the Python Style guide PEP8 that provides coding conventions for Python code. It is fairly common for Python code to follow this style guide. It’s a great place to start since it’s already well-defined.

docs/contributing/index.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ Contents:
1212

1313
.. toctree::
1414
:maxdepth: 1
15-
15+
1616
before_contribute
17+
ways_to_contribute
1718
after_contribute
1819
code_contribution_best_practices
1920
coc
20-
ways_to_contribute

docs/prerequisites/index.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.. _prerequisites:
22

3-
Prerequisites
4-
###############
3+
FLINT Prerequisites
4+
###################
55

66
Before we take a leap into the process of development, please take a moment to verify if you have the necessary tools setup and skills to get started on this project.
77
You should be familiar with the following :-

0 commit comments

Comments
 (0)