diff --git a/README.md b/README.md index 2794f7bf..cfac87c4 100644 --- a/README.md +++ b/README.md @@ -27,30 +27,22 @@ To make more complex changes, follow the steps below: 2. Install [Github CLI](https://cli.github.com/) which simplifies Git commands. 3. Create a working folder on your local computer. 4. Open a terminal and navigate to that folder using the command `cd `. -5. Fork the `mautic/user-documentation` repository on GitHub by clicking on the fork button at the top right. -6. Once forked, if you know your way around Git and you are are writing documentation for something which is specific to the latest version of Mautic, you should branch from `main`. +5. Fork the `mautic/user-documentation` repository on GitHub by clicking on the 'fork' button at the top right. +6. Once forked, if you know your way around Git and you are writing documentation for something which is specific to the latest version of Mautic, you should branch from `5.x`. + + If you are writing documentation for a feature which is coming in a future release - e.g. `6.0` - then branch off the relevant branch for that release, which should generally speaking match the branch used in the main `mautic/mautic` repository - e.g. `6.x`. -If you are writing documentation for a feature which is coming in a future release - e.g. 5.0 - then branch off the relevant branch for that release, which should generally speaking match the branch used in the main mautic/mautic repository - e.g. `5.x`. 7. Type `gh repo clone [your-forked-repo-name]/user-documentation` to clone your forked repository to your local computer. 8. Open the folder `user-documentation` that is created in your editor. 9. At the bottom left of your screen, you will see the default branch called 'main' is showing as your active branch. Click this, and a box will appear at the top of the page allowing you to 'create a new branch'. Type a name which relates to the work you plan to do. 10. Make your desired changes by editing the files, which you can locate on the left pane. -11. Use the Source Control icon on the menu on the left to view changed files. Click the plus icon next to them to 'stage' them for committing. This lets you save and describe changes in chunks, making it easier to reverse specific changes in the future. +11. Use the 'Source Control' icon on the menu on the left to view changed files. Click the 'plus' icon next to them to 'stage' them for committing. This lets you save and describe changes in chunks, making it easier to reverse specific changes in the future. 12. If editing text, ensure to run necessary commands to update files for translations on Transifex and include those updates in your PR. 13. Commit all your changes, then click the 'Publish Branch' button. This action might prompt you to create a fork of the repository if not done earlier. -14. Under the Source Control icon, navigate to the 'Branches' section. Find your branch, hover over the 'Create pull request' icon, and click it. +14. Under the 'Source Control' icon, navigate to the 'Branches' section. Find your branch, hover over the 'Create pull request' icon, and click it. 15. This action will direct you to the GitHub web interface where you can add an appropriate title and description for your proposed changes. 16. If reviewers request changes, switch back to the branch (as explained in step 9). Implement the necessary changes and follow steps 11-14 again. After updating, commit and push your changes, then notify the reviewer to check the updated content. -### Generating translations files - -Currently, we manually create the translation files necessary for Transifex to inform translators that there are changes to the content. - -To do this, run the following at the command line after following the steps below to build the documentation locally. - -1. Run the command in the /docs folder `sphinx-build -b gettext . docs_translations` -2. Commit the files created with your pull request - ## Build documentation locally - [RST Syntax Cheatsheet][RST Cheatsheet] @@ -65,29 +57,33 @@ The following provides instructions for how to build docs locally for visualizat 4. Install MyST Parser `pip install myst_parser` 5. CD into the docs directory `cd [path to this repo]/docs` 6. Run `make html` -7. This will generate HTML in docs/build/html. Setup a web server with the web root as docs/build/html or open docs/build/html/index.html in a browser. - +7. This will generate HTML in `docs/build/html`. Setup a web server with the web root as `docs/build/html` or open `docs/build/html/index.html` in a browser. + ### Vale + Before pushing, run Vale and address suggestions and errors as applicable. -1. Install [`vale`][Vale] + +1. Install [`vale`][Vale] 2. `vale .` ### PhpStorm/PyCharm File Watcher -You can automatically build changes to rst files using a file watcher. -1. Go to Preferences -> Tools -> File Watchers -> + button -> custom + +You can automatically build changes to `rst` files using a file watcher. + +1. Go to `Preferences -> Tools -> File Watchers -> + button -> custom` 2. Configure the watcher as presented in the screenshot -Screen Shot 2021-10-06 at 15 52 06 + Screen Shot 2021-10-06 at 15 52 06 +[ReadTheDocs]: https://readthedocs.org +[End user docs]: https://github.com/mautic/mautic-documentation +[RTD badge URL]: https://readthedocs.org/projects/mautic-documentation/badge/?version=latest +[RTD URL]: https://mautic-documentation.readthedocs.io/en/latest/?badge=latest +[RST Cheatsheet]: https://github.com/ralsina/rst-cheatsheet/blob/master/rst-cheatsheet.rst +[Sphinx Template]: https://github.com/readthedocs/sphinx_rtd_theme/tree/master/docs/demo +[Sphinx Demo]: https://sphinx-rtd-theme.readthedocs.io/en/stable/demo/structure.html +[Vale]: https://vale.sh/docs/vale-cli/installation/ -[ReadTheDocs]: -[End user docs]: -[RTD badge URL]: -[RTD URL]: -[RST Cheatsheet]: -[Sphinx Template]: -[Sphinx Demo]: -[Vale]: ## Contributors ✨ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):