Skip to content

Commit deb4ac2

Browse files
authored
Merge pull request #640 from percona/ps-10421-8.4-8.4
PS-10426 [Docs] - Update contributing.md 8.4
2 parents 057a89b + c364517 commit deb4ac2

File tree

1 file changed

+138
-69
lines changed

1 file changed

+138
-69
lines changed

contributing.md

Lines changed: 138 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -2,152 +2,221 @@
22

33
We welcome contributions from all users and the community. By contributing, you agree to the [Percona Community code of conduct](https://percona.community/contribute/coc/). Thank you for deciding to contribute and help us improve the [Percona Server documentation](https://docs.percona.com/percona-server/).
44

5-
You can contribute to the documentation in either of the following ways:
5+
You can contribute to the documentation in the following ways:
66

7-
- [Documentation Contributing Guide](#documentation-contributing-guide)
8-
- [Add a forum topic](#add-a-topic)
9-
- [Request a change with a Jira issue](#request-a-change-with-a-jira-issue)
10-
- [Contribute to documentation yourself](#contribute-to-documentation-yourself)
11-
- [What you should know](#what-you-should-know)
12-
- [What happens after you create the pull request](#what-happens-after-you-create-the-pull-request)
13-
- [Edit documentation online with GitHub](#edit-documentation-online-with-github)
14-
- [Edit documentation locally](#edit-documentation-locally)
15-
- [Building the documentation](#building-the-documentation)
7+
## Rate and comment on documentation pages
168

17-
## Add a topic
9+
Each documentation page includes a **Rate this page** feature at the bottom that allows you to assign stars (1-5) and leave comments. This is a quick and easy way to provide feedback about the documentation.
1810

19-
In the [Percona Product Documentation category](https://forums.percona.com/c/percona-product-documentation/71) in the Percona Community Forum, select **New Topic**. Complete the form and select **Create Topic** to add the topic to the forum.
11+
To rate a page:
12+
13+
1. Scroll to the bottom of any documentation page.
14+
15+
2. Use the star rating system to rate the page (1-5 stars).
16+
17+
3. Leave a comment describing your feedback.
18+
19+
!!! important "Please leave detailed comments"
20+
21+
If you want the documentation team to fix or improve something, **please leave detailed comments** explaining:
22+
23+
* What issue you encountered or what improvement you'd like to see
24+
* Which section or topic needs clarification or correction
25+
* Any specific examples or use cases that would help
26+
* The version or environment you're using (if relevant)
27+
* Steps to reproduce any issues you found
28+
29+
**Detailed comments are essential** - they help us understand your needs and make the documentation better for everyone. Brief comments like "this is confusing" or "needs improvement" are helpful, but specific details about what's confusing or what needs improvement allow us to take action.
30+
31+
## Add a topic in the Percona Community Forum
32+
33+
The [Percona Community Forum](https://forums.percona.com/) is a public discussion platform where you can ask questions, share feedback, or suggest improvements to the documentation. Use the forum to start a conversation about documentation issues, request clarifications, or discuss potential changes with the community and documentation team.
34+
35+
To add a topic, navigate to the [Percona Product Documentation category](https://forums.percona.com/c/percona-product-documentation/71) in the Percona Community Forum and select **New Topic**. Complete the form and select **Create Topic** to add the topic to the forum.
2036

2137
![Create a topic](docs/_static/new-topic.png "Create a topic")
2238

2339
## Request a change with a Jira issue
2440

25-
If you would rather not [contribute to the documentation yourself](#contribute-to-documentation-yourself), let us know about the issue by adding a Jira ticket. Use the following procedure to create a Jira ticket:
41+
Create a Jira ticket to report documentation issues or request changes. This method is useful for formal tracking or when you want the documentation team to handle the changes.
42+
43+
1. Open the [Percona Server Jira project](https://jira.percona.com/projects/PS/issues) in your browser.
44+
45+
2. Sign in (or create a Percona Jira account if you don't have one).
46+
47+
3. Click the **Create** button.
2648

27-
In the Contact Us section, select the link in "open a JIRA ticket"
49+
4. Fill in the required fields:
2850

29-
![JIRA ticket](docs/_static/jira-ticket.png "JIRA ticket")
51+
* **Summary**: Provide a brief description of the issue.
3052

31-
- In the `Contact Us` section, located at the bottom of the page, select the **open a JIRA ticket** link. This action opens the [Jira issue tracker](https://jira.percona.com/projects/PS/issues) for the doc project.
53+
* **Description**: Provide more information about the issue. If needed, add a Steps To Reproduce section and information about your environment (version number, your operating system, etc.). Be detailed.
3254

33-
- Log in (create a Jira account if you don't have one) and select **Create** to open the Jira form.
55+
* **Version**, **Environment**, and other relevant fields as needed.
3456

35-
![Complete the Jira form](docs/_static/create-issue.png "Complete the Jira form")
57+
5. Click **Create** to submit the ticket.
3658

37-
- In the following fields, describe the issue:
38-
- In the Summary, provide a brief description of the issue.
39-
- In the Description, provide more information about the issue. If needed, add a Steps To Reproduce section and information about your environment (version number, your operating system, etc.). Be detailed.
40-
- Select **CREATE** to create the ticket.
59+
!!! tip "Shortcut to the issue creation screen"
4160

42-
## Contribute to documentation yourself
61+
To go directly to the Create Issue form, use this URL: [https://jira.percona.com/secure/CreateIssue!default.jspa?pid=10100](https://jira.percona.com/secure/CreateIssue!default.jspa?pid=10100)
4362

44-
Use either the [Edit documentation online with GitHub](#edit-documentation-online-with-github) method or the [Edit documentation locally](#edit-documentation-locally) method to make changes to the documentation and create a pull request.
63+
64+
## Edit the documentation yourself
65+
66+
Use the [Edit documentation online with GitHub](#edit-documentation-online-with-github) method or the [Edit documentation locally](#edit-documentation-locally) method to make changes to the documentation and create a pull request.
4567

4668
### What you should know
4769

48-
Most of the document is in plain text, but you may use [Markdown](https://www.markdownguide.org/) to add syntax elements (notes, tables, and so on) to the documentation.
70+
The documentation is primarily in plain text, but you may use [Markdown](https://www.markdownguide.org/) to add syntax elements (notes, tables, and so on) to the documentation.
4971

5072
### What happens after you create the pull request
5173

52-
A core developer reviews your request and either comments or approves the request. A core developer merges the approved request to the **main** branch usually when a newer version of the product is released.
74+
Our team reviews your pull request and provides feedback or approval. Once approved, we merge your changes into the appropriate branch. Thank you for taking the time to improve our documentation!
5375

5476
!!! note
5577

56-
We appreciate your work but the pull request may be redone to meet internal requirements.
78+
We appreciate your work, but the PR may be revised to meet internal requirements.
5779

5880
### Edit documentation online with GitHub
5981

60-
Next to the page title, select the pencil icon to open the source file in the GitHub editor. In this editor, you can make the changes, view the changes in the Preview tab, and create a pull request. The source `.md` file of the page opens in a GitHub editor in your browser. If you haven't worked with the repository before, GitHub creates a [fork](https://docs.github.com/en/github/getting-started-with-github/fork-a-repo).
82+
1. At the top of the documentation page, select **Edit this page on GitHub** (or the pencil icon) to open the source file in the GitHub editor. If you haven't worked with the repository before, GitHub creates a [fork](https://docs.github.com/en/github/getting-started-with-github/fork-a-repo) automatically.
6183

62-
Edit the page using the [Markdown](https://www.markdownguide.org/) syntax.
84+
2. Edit the page using the [Markdown](https://www.markdownguide.org/) syntax.
6385

64-
You should review your changes on the **Preview** tab.
86+
3. Review your changes by clicking the **Preview** tab to see how they will appear.
6587

66-
Commit your changes to a pull request.
88+
4. Scroll to the bottom of the page to the **Commit changes** section.
6789

68-
In the **Commit changes** section, add a summary (72 characters or less) of what was changed.
69-
70-
Then select the **Create a new branch for this commit and start a pull request** option. Accept the name for the branch and then Select **Commit changes**.
90+
5. Add a commit message (72 characters or less) describing what you changed.
91+
92+
6. Select the **Create a new branch for this commit and start a pull request** option. GitHub will suggest a branch name, which you can accept or modify.
7193

72-
GitHub creates a branch and a commit for your changes. The operation loads a page that shows the following:
94+
7. Click **Commit changes**.
7395

74-
- a base branch where you offer your changes
75-
76-
- your commit message
77-
78-
- a visual representation of your changes against the original page
96+
8. GitHub creates a branch and commit for your changes, then displays a page where you can create a pull request. This page shows:
7997

80-
Review the information and click **Create pull request**.
98+
* The base branch where you're proposing your changes
8199

82-
For more information, see [Editing files in GitHub](https://docs.github.com/en/repositories/working-with-files/managing-files/editing-files)
100+
* Your commit message
83101

84-
### Edit documentation locally
102+
* A visual diff of your changes
103+
104+
9. Review the information and click **Create pull request**.
105+
106+
For more information, see [Editing files in GitHub](https://docs.github.com/en/repositories/working-with-files/managing-files/editing-files).
85107

86-
This option is for users who are comfortable with [git](https://git-scm.com/) commands.
108+
### Edit documentation locally
87109

88-
The steps are the following:
110+
This option is for users who are comfortable with [git](https://git-scm.com/) commands.
89111

90-
1. Fork this repository.
112+
1. Fork this repository on GitHub.
91113

92-
2. Clone the forked repository to your machine:
114+
2. Clone your forked repository to your machine:
93115

94116
```shell
95-
git clone git@github.com:<your_github_name>/proxysql-admin-tool-doc.git
96-
cd <directory name>/proxysql-admin-tool-doc
117+
git clone https://github.com/<your_github_name>/psmysql-docs.git
118+
cd psmysql-docs
97119
```
98120

99-
3. Add the remote origin repository:
121+
!!! note "SSH alternative"
122+
123+
If you have SSH keys set up with GitHub, you can use `git@github.com:<your_github_name>/psmysql-docs.git` instead.
124+
125+
3. Add the upstream remote to track the original repository:
100126

101127
```shell
102-
git remote add origin https://github.com/percona/proxysql-admin-tool-doc.git
128+
git remote add upstream https://github.com/percona/psmysql-docs.git
103129
```
104130

105-
4. Checkout the appropriate branch and pull the latest changes from origin:
131+
4. Checkout the appropriate branch for the version you're working on (for example, `8.4` for version 8.4 documentation) and pull the latest changes from upstream:
106132
107133
```shell
108-
git checkout main && git pull origin main
134+
git checkout 8.4
135+
git pull upstream 8.4
109136
```
110137
138+
!!! note "Which branch to use"
139+
140+
Use the branch that matches the version of the documentation you're editing. For example, use the `8.4` branch for Percona Server 8.4 documentation. If the branch doesn't exist locally, Git will create a tracking branch automatically.
141+
111142
5. Create a separate branch for your changes:
112143
113144
```shell
114145
git checkout -b <my_changes>
115146
```
116147
117-
6. Work in the `/docs` directory. Add code examples, if necessary. We recommend that you check your changes using either a Preview built into your editor (if you have one) or [build HTML on your machine](#building-the-documentation).
148+
6. Edit the files in the `/docs` directory. Add code examples, if necessary. We recommend that you check your changes using either a Preview built into your editor (if you have one) or [build HTML on your machine](#building-the-documentation).
118149
119-
7. Add the changed file:
150+
7. Add the changed file (replace `docs/example.md` with your actual file path):
120151
121152
```shell
122-
git add <changed file>
153+
git add docs/example.md
123154
```
124155
125-
8. Commit your changes:
156+
8. Commit your changes (replace the message with a description of your changes):
126157
127158
```shell
128-
git commit -m 'Fixed typing error in <document name>'
159+
git commit -m 'Fixed typo in install-audit-log-filter.md'
129160
```
130161
131-
9. Open a pull request to Percona:
162+
9. Push your branch to your fork:
132163
133164
```shell
134-
git push <my repo> <my_changes>
165+
git push -u origin <my_changes>
135166
```
136167
168+
10. On GitHub, you'll see a notification banner with a **Compare & pull request** button. Click it to open a pull request to the Percona repository. Alternatively, navigate to your fork and click **Create pull request**.
169+
137170
### Building the documentation
138171

139-
To verify your changes, you can use a MkDocs command to build HTML.
172+
To verify your changes, you can use MkDocs to build and preview the documentation locally.
173+
174+
!!! note "Prerequisites"
175+
176+
You need Python 3.x installed on your system. If you don't have Python installed, see the [Python installation guide](https://www.python.org/downloads/).
177+
178+
1. Install the required dependencies:
179+
180+
```shell
181+
pip install -r requirements.txt
182+
```
183+
184+
2. In the root directory, start the local development server:
185+
186+
```shell
187+
mkdocs serve
188+
```
189+
190+
3. Open your browser and navigate to `http://127.0.0.1:8000/` to view the documentation. The server automatically reloads when you make changes to the files.
191+
192+
4. Navigate to the document you changed to verify your edits. The documentation structure matches the `/docs` directory, so you can find your file by following the same path structure in the browser.
193+
194+
### Building the PDF documentation
195+
196+
!!! tip "Browser recommendation"
197+
198+
This procedure works best in Google Chrome. Other browsers may not render the PDF correctly.
199+
200+
To build the PDF documentation:
201+
202+
1. Build the documentation site:
203+
204+
```shell
205+
mkdocs build
206+
```
207+
208+
2. Open the `site/print_page.html` file in Chrome. You can do this by:
209+
210+
* Navigating to the file in your file manager and double-clicking it, or
140211
141-
Follow the [MkDocs Installation](https://www.mkdocs.org/user-guide/installation/) instructions.
212+
* Opening Chrome and using **File > Open File** to navigate to `site/print_page.html`
142213
143-
After the installation, in the root directory, run the following command to build the documentation:
214+
3. In Chrome, press `Ctrl+P` (or `Cmd+P` on Mac) to open the Print dialog, or select **Print** from the menu.
144215
145-
```shell
146-
mkdocs serve
147-
```
216+
4. In the Print dialog:
148217
149-
The output is the following:
218+
* Set the **Destination** to **Save as PDF**
150219
151-
![Running MkDocs](docs/_static/mkdocs.png "Running MkDocs")
220+
* Adjust any print settings as needed (margins, paper size, etc.)
152221
153-
Open a browser and navigate to `http://127.0.0.1:8000/percona-server/8.0/` or `http://127.0.0.1:8000/percona-server/5.7/` to see the HTML files. You may need to navigate to the document that you have changed.
222+
* Click **Save** and choose where to save the PDF file

0 commit comments

Comments
 (0)