Skip to content

Commit 207c699

Browse files
authored
Merge pull request #5320 from squidfunk/docs/guides
Updated guides
2 parents b2ed2cd + 98569eb commit 207c699

16 files changed

+543
-275
lines changed

.github/ISSUE_TEMPLATE/03-request-a-change.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ body:
5151
description: >-
5252
Please explain how your idea will work from an author's and user's
5353
perspective. Elaborate on how the change would positively impact not only
54-
you but the community and how it aligns with the goals and [philosophy](https://squidfunk.github.io/mkdocs-material/philosophy/)
54+
you but our community and how it aligns with the goals and [philosophy](https://squidfunk.github.io/mkdocs-material/philosophy/)
5555
of the project.
5656
[More](https://squidfunk.github.io/mkdocs-material/contributing/requesting-a-change/#use-cases)
5757
validations:

.github/ISSUE_TEMPLATE/04-add-a-translation.yml renamed to .github/ISSUE_TEMPLATE/04-add-translations.yml

+24-9
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,21 @@ body:
77

88
- type: markdown
99
attributes:
10-
value: >-
11-
**Important**: Before creating a new translation, please make sure that
12-
Material for MkDocs does not already include support for your language.
13-
Please check the list of all [available languages](https://squidfunk.github.io/mkdocs-material/setup/changing-the-language/#site-language)
14-
and help us by adding missing translations.
10+
value: |-
11+
**Important**: Before creating a new translation, please check if
12+
Material for MkDocs already supports your language. Review the list of
13+
[available languages](https://squidfunk.github.io/mkdocs-material/setup/changing-the-language/#site-language),
14+
pick your language to add new or improve existing translations.
1515
1616
- type: textarea
1717
id: translations
1818
attributes:
1919
label: Translations
20-
description: Please translate the labels on the right, e.g., "Copy to clipboard", etc.
20+
description: >-
21+
Please translate the labels on the right. For new languages, translate
22+
each line. For existing languages, only translate lines containing the
23+
icon :arrow_left: and remove the icon before submitting.
24+
[More](https://squidfunk.github.io/mkdocs-material/contributing/adding-a-translation/#translations)
2125
value: |-
2226
{% macro t(key) %}{{ {
2327
"language": "en",
@@ -76,13 +80,25 @@ body:
7680
validations:
7781
required: true
7882

83+
- type: textarea
84+
id: country-flag
85+
attributes:
86+
label: Country flag icon
87+
description: >-
88+
Please add the flag of the country when adding a new language. Select
89+
it on our [Icons, Emojis site](https://squidfunk.github.io/mkdocs-material/reference/icons-emojis/#search)
90+
by entering `flag` in the search field. If your flag is not provided by
91+
Twemoji, please choose the closest matching flag.
92+
[More](https://squidfunk.github.io/mkdocs-material/contributing/adding-a-translation/#country-flag)
93+
placeholder: |-
94+
Post the flag of the country here.
95+
7996
- type: checkboxes
8097
id: checklist
8198
attributes:
8299
label: Before submitting
83100
description: >-
84-
Please ensure that your translation fulfills the following
85-
requirements.
101+
Please ensure that your translation fulfills the following requirements.
86102
options:
87103
- label: I've checked the list of [available languages](https://squidfunk.github.io/mkdocs-material/setup/changing-the-language/#site-language) for existing translations.
88104
required: true
@@ -91,4 +107,3 @@ body:
91107
- label: >-
92108
__Optional__: I want to integrate this translation myself and create a
93109
pull request following the [contribution guide](https://github.com/squidfunk/mkdocs-material/blob/master/CONTRIBUTING.md).
94-

.github/ISSUE_TEMPLATE/config.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,6 @@ blank_issues_enabled: false
2222
contact_links:
2323
- name: Ask a question
2424
url: https://github.com/squidfunk/mkdocs-material/discussions
25-
about: Have a question or need help? Connect with the community on our discussion board
25+
about: >
26+
Have a question or need help? Connect with our community on the
27+
discussion board

CODE_OF_CONDUCT.md

+12-12
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
In the interest of fostering an open and welcoming environment, we as
66
contributors and maintainers pledge to making participation in our project and
77
our community a harassment-free experience for everyone, regardless of age, body
8-
size, disability, ethnicity, gender identity and expression, level of experience,
8+
size, disability, ethnicity, gender identity and expression, level of experience,
99
nationality, personal appearance, race, religion, or sexual identity and
1010
orientation.
1111

@@ -16,7 +16,7 @@ Examples of behavior that contributes to creating a positive environment include
1616
* Using welcoming and inclusive language
1717
* Being respectful of differing viewpoints and experiences
1818
* Gracefully accepting constructive criticism
19-
* Focusing on what is best for the community
19+
* Focusing on what is best for our community
2020
* Showing empathy towards other community members
2121

2222
Examples of unacceptable behavior by participants include:
@@ -36,7 +36,7 @@ Project maintainers are responsible for clarifying the standards of acceptable
3636
behavior and are expected to take appropriate and fair corrective action in
3737
response to any instances of unacceptable behavior.
3838

39-
Project maintainers have the right and responsibility to remove, edit, or reject
39+
Project maintainers have the right and responsibility to remove, edit, or reject
4040
comments, commits, code, wiki edits, issues, and other contributions that are
4141
not aligned to this Code of Conduct, or to ban temporarily or permanently any
4242
contributor for other behaviors that they deem inappropriate, threatening,
@@ -45,21 +45,21 @@ offensive, or harmful.
4545
## Scope
4646

4747
This Code of Conduct applies both within project spaces and in public spaces
48-
when an individual is representing the project or its community. Examples of
48+
when an individual is representing the project or its community. Examples of
4949
representing a project or community include using an official project e-mail
50-
address, posting via an official social media account, or acting as an appointed
51-
representative at an online or offline event. Representation of a project may be
50+
address, posting via an official social media account, or acting as an appointed
51+
representative at an online or offline event. Representation of a project may be
5252
further defined and clarified by project maintainers.
5353

5454
## Enforcement
5555

5656
Instances of abusive, harassing, or otherwise unacceptable behavior may be
57-
reported by contacting the project team at
58-
https://gitter.im/squidfunk/mkdocs-material. The project team will review and
59-
investigate all complaints, and will respond in a way that it deems appropriate
60-
to the circumstances. The project team is obligated to maintain confidentiality
61-
with regard to the reporter of an incident. Further details of specific
62-
enforcement policies may be posted separately.
57+
reported by contacting the project team privately at [email protected]. The
58+
project team will review and investigate all complaints, and will respond in a
59+
way that it deems appropriate to the circumstances. The project team is
60+
obligated to maintain confidentiality with regard to the reporter of an
61+
incident. Further details of specific enforcement policies may be posted
62+
separately.
6363

6464
Project maintainers who do not follow or enforce the Code of Conduct in good
6565
faith may face temporary or permanent repercussions as determined by other

CONTRIBUTING.md

+42-93
Original file line numberDiff line numberDiff line change
@@ -1,112 +1,61 @@
11
# Contributing
22

3-
Interested in contributing to the Material for MkDocs? Have a question? Want to
4-
report a bug? Before you do, please read the following guidelines.
5-
6-
## Submission context
7-
8-
### Got a question or problem?
9-
10-
For quick questions there's no need to open an issue as you can reach us on
11-
[gitter.im].
12-
13-
[gitter.im]: https://gitter.im/squidfunk/mkdocs-material
14-
15-
### Found a bug?
16-
17-
If you found a bug in the source code, you can help us by submitting an issue
18-
to the [issue tracker] in our GitHub repository. Even better, you can submit
19-
a Pull Request with a fix. However, before doing so, please read the
20-
[submission guidelines].
21-
3+
Material for MkDocs is an actively maintained and constantly improved project
4+
that serves a diverse user base with varying backgrounds and needs. In order to
5+
effectively address the needs of all our users, evaluate change requests, and
6+
fix bugs, we maintainers need to put in a lot of work. We have devoted
7+
significant effort to creating better templates for our issue tracker,
8+
optimizing the processes for our users to report bugs, request features or
9+
changes, contribute to the project, or exchange with our community.
10+
11+
Given the wealth of valuable knowledge contained in numerous issues and
12+
discussions, we consider our [issue tracker] and [discussion board] to serve as
13+
a crucial __knowledge base__ that is an important addition to our [documentation]
14+
and brings value to both new and experienced users of Material for MkDocs.
15+
16+
[discussion board]: https://github.com/squidfunk/mkdocs-material/discussions
2217
[issue tracker]: https://github.com/squidfunk/mkdocs-material/issues
23-
[submission guidelines]: #submission-guidelines
24-
25-
### Missing a feature?
26-
27-
You can request a new feature by submitting an issue to our GitHub Repository.
28-
If you would like to implement a new feature, please submit an issue with a
29-
proposal for your work first to be sure that it is of use to everyone, as
30-
Material for MkDocs is highly opinionated. Please consider what kind of change
31-
it is:
32-
33-
* For a **major feature**, first open an issue and outline your proposal so
34-
that it can be discussed. This will also allow us to better coordinate our
35-
efforts, prevent duplication of work, and help you to craft the change so
36-
that it is successfully accepted into the project.
37-
38-
* **Small features and bugs** can be crafted and directly submitted as a Pull
39-
Request. However, there is no guarantee that your feature will make it into
40-
the `master`, as it's always a matter of opinion whether if benefits the
41-
overall functionality of the project.
42-
43-
### Missing translations?
44-
45-
Material for MkDocs supports 60+ languages with the help of community
46-
contributions. When new features are added, sometimes, new translations are
47-
necessary as well. It's impossible for the maintainers of the project to update
48-
all translations (we just don't speak 60+ languages), so we have to rely on
49-
our contributors to update translations incrementally. This process is pretty
50-
simple, so if you find a translation missing in your language, follow these
51-
guidelines:
52-
53-
1. Fork the repository.
18+
[documentation]: https://squidfunk.github.io/mkdocs-material/
5419

55-
2. Open up the [translation file for your language] as well as the
56-
[English translations], as they are always up-to-date. Compare them
57-
side-by-side and add the missing translations. __Important__: only add the
58-
translations that are different from the defaults, e.g. if your language
59-
is left-to-right, don't add the `direction` translation, as English is
60-
left-to-right as well. The following translations are for technical
61-
purposes and should not be updated, so if they're missing from your
62-
language, it's for good reason:
20+
## How to contribute
6321

64-
- `search.config.lang`
65-
- `search.config.pipeline`
66-
- `search.config.separator`
22+
### Creating an issue
6723

68-
3. Create a PR (see below) with your changes.
24+
- #### [Report a bug]
6925

70-
[translation file for your language]: https://github.com/squidfunk/mkdocs-material/tree/master/src/partials/languages
71-
[English translations]: https://github.com/squidfunk/mkdocs-material/tree/master/src/partials/languages/en.html
26+
__Something is not working?__ Report a bug in Material for MkDocs by
27+
creating an issue with a reproduction
7228

73-
## Submission guidelines
29+
- #### [Report a docs issue]
7430

75-
### Submitting an issue
31+
__Missing information in our docs?__ Report missing information or
32+
potential inconsistencies in our documentation
7633

77-
Before you submit an issue, please search the issue tracker, maybe an issue for
78-
your problem already exists, and the discussion might inform you of workarounds
79-
readily available.
34+
- #### [Request a change]
8035

81-
We want to fix all the issues as soon as possible, but before fixing a bug, we
82-
need to reproduce and confirm it. In order to reproduce bugs, we will
83-
systematically ask you to provide a minimal reproduction scenario using the
84-
custom issue template. Please stick to the issue template.
36+
__Want to submit an idea?__ Propose a change, feature request, or
37+
suggest an improvement
8538

86-
Unfortunately, we are not able to investigate / fix bugs without a minimal
87-
reproduction scenario, so if we don't hear back from you, we may close the issue.
39+
- #### [Ask a question]
8840

89-
### Submitting a Pull Request (PR)
41+
__Have a question or need help?__ Ask a question on our [discussion board]
42+
and get in touch with our community
9043

91-
Search GitHub for an open or closed PR that relates to your submission. You
92-
don't want to duplicate effort. If you do not find a related issue or PR,
93-
go ahead.
44+
### Contributing
9445

95-
1. **Development**: Fork the project, set up the [development environment],
96-
make your changes in a separate git branch and add descriptive messages to
97-
your commits.
46+
- #### [Add a translation]
9847

99-
2. **Build**: Before submitting a pull request, [build the theme]. This is
100-
a mandatory requirement for your PR to get accepted, as the theme should be
101-
installable through GitHub at all times.
48+
__Missing support for your language?__ Add missing translations for a new
49+
or already supported language
10250

103-
3. **Pull Request**: After building the theme, commit the compiled output,
104-
push your branch to GitHub and send a PR to `mkdocs-material:master`. If we
105-
suggest changes, make the required updates, rebase your branch and push the
106-
changes to your GitHub repository, which will automatically update your PR.
51+
- #### [Create a pull request]
10752

108-
After your PR is merged, you can safely delete your branch and pull the changes
109-
from the main (upstream) repository.
53+
__Want to create a pull request?__ Learn how to create a comprehensive
54+
and useful pull request (PR)s
11055

111-
[development environment]: https://squidfunk.github.io/mkdocs-material/customization/#environment-setup
112-
[build the theme]: https://squidfunk.github.io/mkdocs-material/customization/#building-the-theme
56+
[Report a bug]: reporting-a-bug.md
57+
[Report a docs issue]: reporting-a-docs-issue.md
58+
[Request a change]: requesting-a-change.md
59+
[Ask a question]: https://github.com/squidfunk/mkdocs-material/discussions
60+
[Add a translation]: https://github.com/squidfunk/mkdocs-material/adding-a-translation
61+
[Create a pull request]: https://github.com/squidfunk/mkdocs-material/pulls

README.md

+6-10
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,15 @@
1717
alt="Build"
1818
/></a>
1919
<a href="https://pypistats.org/packages/mkdocs-material"><img
20-
src="https://img.shields.io/pypi/dm/mkdocs-material.svg"
20+
src="https://img.shields.io/pypi/dm/mkdocs-material.svg"
2121
alt="Downloads"
2222
/></a>
23-
<a href="https://gitter.im/squidfunk/mkdocs-material"><img
24-
src="https://badges.gitter.im/squidfunk/mkdocs-material.svg"
25-
alt="Chat on Gitter"
26-
/></a>
27-
<a href="https://pypi.org/project/mkdocs-material"><img
28-
src="https://img.shields.io/pypi/v/mkdocs-material.svg"
23+
<a href="https://pypi.org/project/mkdocs-material"><img
24+
src="https://img.shields.io/pypi/v/mkdocs-material.svg"
2925
alt="Python Package Index"
3026
/></a>
31-
<a href="https://hub.docker.com/r/squidfunk/mkdocs-material/"><img
32-
src="https://img.shields.io/docker/pulls/squidfunk/mkdocs-material"
27+
<a href="https://hub.docker.com/r/squidfunk/mkdocs-material/"><img
28+
src="https://img.shields.io/docker/pulls/squidfunk/mkdocs-material"
3329
alt="Docker Pulls"
3430
/></a>
3531
</p>
@@ -48,7 +44,7 @@
4844

4945
<p align="center">
5046
<em>
51-
Check out the demo –
47+
Check out the demo –
5248
<a
5349
href="https://squidfunk.github.io/mkdocs-material/"
5450
>squidfunk.github.io/mkdocs-material</a>.

0 commit comments

Comments
 (0)