Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Commit d14257a

Browse files
Merge pull request #1 from magento/master
Master to my form merge
2 parents 65f6d86 + ceccf6a commit d14257a

File tree

7,270 files changed

+381344
-470725
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

7,270 files changed

+381344
-470725
lines changed

.github/CONTRIBUTING.md

Lines changed: 186 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,186 @@
1+
## Contribute to Magento DevDocs
2+
3+
Share your knowledge with the community by contributing to Magento DevDocs!
4+
You can contribute by creating an issue or pull request (PR) on our [DevDocs](https://github.com/magento/devdocs) GitHub repository.
5+
We welcome all types of contributions; from minor typo fixes to new topics.
6+
7+
DevDocs staff members and [Community Maintainers](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributors.html#/community-maintainers) review issues and pull requests on a regular basis. We do our best to address all issues as soon as possible, but working through the backlog takes time. We appreciate your patience.
8+
9+
## Rewards for contributions
10+
11+
DevDocs works with Magento Community Engineering teams and projects.
12+
As you contribute PRs, you gain [Contribution Points](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#points).
13+
14+
If you write and contribute a full topic, we will add your name (or your company's name) at the top of the DevDocs page and link it to your blog or website!
15+
16+
## Get started
17+
18+
![Get started workflow](https://devdocs.magento.com/common/images/contribute-prerequisites.png)
19+
20+
1. Make sure you have a [GitHub account](https://github.com/signup/free).
21+
22+
**Note for partners:** Add [2FA](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#two-factor) protection when contributing to Magento repositories.
23+
24+
1. [Fork](https://help.github.com/articles/fork-a-repo/) the [DevDocs repository](https://github.com/magento/devdocs). Remember to [sync your fork](https://help.github.com/articles/syncing-a-fork/) and update branches as needed.
25+
1. Review the [DevDocs guidelines](#contribution-guidelines).
26+
27+
## Contribute documentation
28+
29+
The following diagram shows the contribution workflow:
30+
31+
![Contributing workflow](https://devdocs.magento.com/common/images/contribute-write-submit-pr.png)
32+
33+
**Tip!** If you are not sure where to start contributing, search for issues with the [`help wanted`](https://github.com/magento/devdocs/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22), [`good first issue`](https://github.com/magento/devdocs/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22), and [`groomed`](https://github.com/magento/devdocs/issues?q=is:issue+is:open+label:%22groomed%22) labels. These issues receive higher priority for processing.
34+
35+
### Create a branch
36+
37+
1. Create a new branch from your fork using a name that best describes the work or references a GitHub issue number.
38+
1. Edit or create markdown (`.md`) files in your branch.
39+
1. Push your branch to your fork.
40+
41+
### Create a pull request
42+
43+
1. Create a pull request to the [magento/devdocs](https://github.com/magento/devdocs) repository.
44+
45+
In general, you should use `master` as the base branch when creating a PR. If your contribution is related to a release that is in progress, use a version-specific integration branch, such as `develop`.
46+
47+
1. Complete the pull request template.
48+
49+
**We will close your pull request if you do not complete the template.**
50+
51+
1. After creating a pull request, a DevDocs staff member or maintainer will review it and may ask you to make revisions.
52+
53+
**We will close your pull request if you do not respond to feedback in two weeks.**
54+
55+
**Note:** If you have not signed the [Magento Contributor Agreement](https://magento.com/content/magento-contributor-agreement), the pull request provides a link. Magento requires a signed form and agreement to the terms for contribution.
56+
57+
## Contribution guidelines
58+
59+
The following guidelines may answer most of your questions and help you get started:
60+
61+
- Write content using Markdown. See the [Templates](#templates) section for examples.
62+
- Review existing [pull requests](https://github.com/magento/devdocs/pulls) and [issues](https://github.com/magento/devdocs/issues) to avoid duplicating work.
63+
- For large contributions, or changes that include multiple files, [open an issue](#report-an-issue) and discuss it with us first. This helps prevent duplicate or unnecessary work.
64+
- Do not make global find-and-replace changes without first creating an issue and discussing it with us. Global changes can have unintended consequences.
65+
- Combine multiple small changes (such as minor editorial and technical changes) into a single pull request. This helps us efficiently and effectively facilitate your contribution.
66+
- Familiarize yourself with the organization and conventions of our existing documentation before creating a pull request. Changes that are consistent with our style and conventions have a higher acceptance rate.
67+
68+
- If you need to update the site navigation, ask for help in Slack ([#devdocs](https://magentocommeng.slack.com/messages/CAN932A3H)).
69+
70+
- Ensure that you update the correct version(s) of documentation (v2.2, v2.3). If you are not sure what directory to put your content in, just do your best. We can help re-locate it (if necessary) during the review process.
71+
- Review your work for basic typos, formatting errors, or ambiguous sentences before opening a pull request.
72+
- Revise pull requests according to review feedback. We will close pull requests that require an inordinate amount of time to review and process (especially for minor changes) if you fail to make revisions according to review feedback.
73+
- Do not directly contact DevDocs team members or maintainers on Slack to review your pull request unless it has been open for more than five days. We have a process and queue for pull requests that everyone must follow.
74+
75+
## Tips for writing content
76+
77+
Use the following guidelines to help you with the writing process:
78+
79+
- Focus your efforts on providing useful information for your fellow Magento developers and community members. For example, consider providing or revising code samples, important notes, and clarifying vague or ambiguous content.
80+
- Define the goal of your topic. What exactly do you want to teach the reader?
81+
- Make the title of your topic reflect the content.
82+
- Keep your sentences concise. Separate conceptual information from procedural steps.
83+
- Batch several small changes into a single pull request (instead of separate ones) to ensure your contributions are approved and merged quickly. Have several typo fixes across several areas of documentation? Combine them into a single PR.
84+
- Remember to write in present tense, use the second person, and use active voice (not passive). For example, _"The log captures commands, output..."_.
85+
- Use notes to alert readers about important details.
86+
- Use cross-references to other topics sparingly. We can help you with the syntax if it is not clear. The template provides an example you can use.
87+
- Need help with markdown? See our [templates](#templates).
88+
89+
### Review changes locally
90+
91+
_(Optional)_ To review your changes in HTML output, follow the instructions in the [README](https://github.com/magento/devdocs/blob/master/README.md) to build the devdocs site locally using Jekyll.
92+
93+
### Templates
94+
95+
We provide templates to help you get started writing new content and understanding Markdown formatting:
96+
97+
- **General topic template** - [Markdown](https://github.com/magento/devdocs/blob/master/guides/v2.3/contributor-guide/templates/basic_template.md) | [HTML](https://devdocs.magento.com/guides/v2.3/contributor-guide/templates/basic_template.html): This is a template for writing any topic with example formats and styles.
98+
- **Tutorial templates**: These templates provide example formats and styles for step-by-step instructions (like how-tos). Each file adds navigation buttons when content is generated. Templates include:
99+
- First introduction topic - [Markdown](https://github.com/magento/devdocs/blob/master/guides/v2.3/contributor-guide/templates/tutorial-template-first.md) | [HTML](https://devdocs.magento.com/guides/v2.3/contributor-guide/templates/tutorial-template-first.html): Introduction to a tutorial for prerequisites and listing steps
100+
- Middle topic - [Markdown](https://github.com/magento/devdocs/blob/master/guides/v2.3/contributor-guide/templates/tutorial-template-middle.md) | [HTML](https://devdocs.magento.com/guides/v2.3/contributor-guide/templates/tutorial-template-middle.html): Use for each step in a tutorial.
101+
- Final step topic - [Markdown](https://github.com/magento/devdocs/blob/master/guides/v2.3/contributor-guide/templates/tutorial-template-last.md) | [HTML](https://devdocs.magento.com/guides/v2.3/contributor-guide/templates/tutorial-template-last.html): Use for the last step of the tutorial.
102+
103+
### Edit metadata
104+
105+
The Markdown (.md) file's metadata is a set of YAML key-value pairs. The metadata section is located at the top of each file. For more info, see the [Basic Template](https://devdocs.magento.com/guides/v2.3/contributor-guide/templates/basic_template.html).
106+
107+
```yaml
108+
109+
---
110+
group: install2
111+
title: Continue with your installation
112+
---
113+
```
114+
115+
> Key-value pair reference:
116+
117+
| Property | Description |
118+
| ------------- | ---------- |
119+
| `group` | Defines the topic's guide or section. Use the table of contents `.yml` file name. This loads your left-side navigation. We will help during the PR process to add new files to the `.yml` file. |
120+
| `title` | Sets the title of the page in the HTML metadata and the main title on the page. |
121+
122+
## Symbolic links
123+
124+
We use symbolic links for topics that are the same across versions of Magento. A file is symlinked if the entire content of the file is a path to the original version, such as [ext-best-practices/tutorials/serialized-to-json-data-upgrade.md](https://github.com/magento/devdocs/blob/master/guides/v2.3/ext-best-practices/tutorials/serialized-to-json-data-upgrade.md). Note that some editors will automatically follow symlinks so it might not be clear if a file is symlinked or not. Check the file on Github directly to be sure.
125+
126+
### Create a symbolic link
127+
128+
When you create a new topic (create a new `.md` file) and its content is the same for 2.2 and 2.3 versions, create a symbolic link.
129+
130+
For example, if you created a new file for v.2.2---`guides/v2.2/install-gde/new-doc-topic.md`---and its content is the same for v.2.3, use the command below to create the symbolic link.
131+
132+
```bash
133+
cd <DEVDOCS_REPOSITORY_ROOT_DIR>
134+
```
135+
136+
```bash
137+
ln -s guides/v2.2/install-gde/new-doc-topic.md guides/v2.3/install-gde/new-doc-topic.md
138+
```
139+
140+
If you have an image that is identical between versions, it is should placed in `/common/images`. Please optimize images before committing them to the repository.
141+
If done correctly, the symbolic link path will start with 3 or 4 instances of `../`, as the above example shows.
142+
143+
### Remove a symbolic link
144+
145+
If your changes are unique to a specific version, remove the symbolic link and add a new file. Copy and paste a previous version of the topic to get started.
146+
147+
The removal should use the `git rm` command specifically. Deleting the file through the regular file system might cause issues with the repository.
148+
149+
For example:
150+
151+
```bash
152+
git rm guides/v2.3/install-gde/composer.md
153+
```
154+
155+
```bash
156+
cp guides/v2.2/install-gde/composer.md guides/v2.3/install-gde/composer.md
157+
```
158+
159+
Once you have the copy in place, you can edit it with the version-specific information.
160+
161+
## Report an issue
162+
163+
If you find a typo or errors in Magento DevDocs, you can either fix it with a pull request (as described above) or you can report it by creating an issue in the DevDocs GitHub repository.
164+
165+
You must complete the issue template. We will close your issue if you fail to complete the template. Enter as much information as you can, including content corrections, steps to reproduce, command or code updates, or questions for clarifications.
166+
167+
**Note:** Check the existing [issues](https://github.com/magento/devdocs/issues) on GitHub to see if someone has already reported the issue.
168+
169+
You can provide feedback using the following options:
170+
171+
- Have general feedback? Create an issue on [GitHub DevDocs](https://github.com/magento/devdocs/issues/new/choose).
172+
- Have feedback on a specific DevDocs page? Click the **Give us feedback** link at the top right of the page to report on the currently open topic.
173+
174+
![Report an issue](https://devdocs.magento.com/common/images/contribute-feedback-link.png)
175+
176+
- Have a Community code contribution that needs documentation? Create an issue to [request DevDocs content](https://github.com/magento/devdocs/issues/new?template=COMMUNITY_ISSUE_TEMPLATE.md).
177+
178+
## Contact DevDocs
179+
180+
Have a question? Need help? Magento DevDocs, Maintainers, and other Contributors are available through:
181+
182+
- [Slack](https://magentocommeng.slack.com/messages/CAN932A3H) ([Join us](http://tinyurl.com/engcom-slack))
183+
- [Twitter @MagentoDevDocs](https://twitter.com/MagentoDevDocs)
184+
- [E-mail](mailto:[email protected])
185+
186+
Thank you for contributing your brilliance to Magento DevDocs!!

.github/ISSUE_TEMPLATE.md

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,25 @@
1-
<!-- (REQUIRED) What is the nature of this issue? -->
2-
## This issue is a:
3-
[ ] Bug on the website
4-
[ ] New topic request
5-
[ ] Topic clarification request
6-
[ ] New DevDocs feature request
7-
[ ] Other
8-
9-
<!-- (REQUIRED) What is the issue/current behavior? -->
1+
# General issue
2+
103
## Description:
11-
12-
<!-- (OPTIONAL) What needs to be done to replicate this issue? (provide Gist if needed) -->
13-
### Steps to reproduce
14-
15-
1. First Step
16-
2. Second Step
17-
3. Etc.
18-
19-
<!-- (REQUIRED) When this issue is resolved, what is the expected result/behavior? -->
20-
## Expected result:
21-
22-
<!-- (OPTIONAL) What would a solution for this issue look like? -->
4+
5+
<!-- (REQUIRED) What is the issue/current behavior? -->
6+
237
## Possible solutions:
24-
25-
<!-- (OPTIONAL) What other information can you provide about this issue? -->
8+
9+
<!-- (OPTIONAL) What would a solution for this issue look like? -->
10+
2611
## Additional information:
2712

13+
<!-- (OPTIONAL) What other information can you provide about this issue? -->
14+
2815
<!--
2916
Thank you for taking the time to report this issue!
3017
GitHub Issues should only be created for problems/topics related to this project's codebase.
31-
18+
3219
Before submitting this issue, please make sure you are complying with our Code of Conduct:
3320
https://github.com/magento/devdocs/blob/develop/.github/CODE_OF_CONDUCT.md
34-
21+
3522
Issues that do not comply with our Code of Conduct or do not contain enough information may be closed at the maintainers' discretion.
3623
3724
Feel free to remove this section before creating this issue.
38-
-->
25+
-->

.github/ISSUE_TEMPLATE/BUG.md

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
---
2+
name: Bug report
3+
about: Create an issue about a bug on the devdocs website
4+
---
5+
6+
# Bug report
7+
8+
## Description
9+
10+
<!-- (REQUIRED) What is the issue/current behavior? -->
11+
12+
### Steps to reproduce
13+
14+
<!-- (OPTIONAL) What needs to be done to replicate this issue? (provide Gist if needed) -->
15+
16+
1. First Step
17+
2. Second Step
18+
3. Etc.
19+
20+
## Expected result
21+
22+
<!-- (REQUIRED) When this issue is resolved, what is the expected result/behavior? -->
23+
24+
## Possible solutions
25+
26+
<!-- (OPTIONAL) What would a solution for this issue look like? -->
27+
28+
## Additional information
29+
30+
<!-- (OPTIONAL) What other information can you provide about this issue? -->
31+
32+
<!--
33+
Thank you for taking the time to report this issue!
34+
GitHub Issues should only be created for problems/topics related to this project's codebase.
35+
36+
Before submitting this issue, please make sure you are complying with our Code of Conduct:
37+
https://github.com/magento/devdocs/blob/develop/.github/CODE_OF_CONDUCT.md
38+
39+
Issues that do not comply with our Code of Conduct or do not contain enough information may be closed at the maintainers' discretion.
40+
41+
Feel free to remove this section before creating this issue.
42+
-->
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
---
2+
name: Community engineering issue
3+
about: Create an issue related to a community engineering effort
4+
---
5+
6+
# Community engineering issue
7+
8+
<!-- (REQUIRED) Provide information for the doc request including any Community code issues or PRs, Magento versions, or devdoc pages. -->
9+
10+
Type of Doc:
11+
12+
- [ ] New topic
13+
- [ ] Topic Update, Devdoc link:
14+
- [ ] Other
15+
16+
Magento 2 GitHub Issue: https://github.com/magento/devdocs/issues/link
17+
18+
Magento 2 GitHub PR: https://github.com/magento/devdocs/pull/link
19+
20+
Magento 2 version:
21+
22+
- [ ] 2.1.X
23+
- [ ] 2.2.X
24+
- [ ] 2.3.X
25+
- [ ] back port
26+
- [ ] forward port
27+
28+
Notifications of Changes:
29+
30+
- [ ] Changes to Admin interface?
31+
- [ ] New software requirements?
32+
- [ ] New REST endpoints or updated GraphQL query syntax?
33+
- [ ] New command line option?
34+
35+
## Content
36+
37+
<!-- (REQUIRED) What new information or updates are required for your Community contribution? -->
38+
39+
## Additional information
40+
41+
<!-- (OPTIONAL) What other information can you provide? -->
42+
43+
<!--
44+
Thank you for taking the time to request updates for your Community Engineering contribution!
45+
GitHub Issues should only be created for problems/topics related to this project's codebase.
46+
47+
Before submitting this issue, please make sure you are complying with our Code of Conduct:
48+
https://github.com/magento/devdocs/blob/develop/.github/CODE_OF_CONDUCT.md
49+
50+
Issues that do not comply with our Code of Conduct or do not contain enough information may be closed at the maintainers' discretion.
51+
52+
Feel free to remove this section before creating this issue.
53+
-->

.github/ISSUE_TEMPLATE/NEW_FEATURE.md

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
---
2+
name: New feature
3+
about: Create a request for new functionality in devdocs
4+
---
5+
6+
# New feature request
7+
8+
## Description
9+
10+
<!-- (REQUIRED) Describe the feature you want added to devdocs -->
11+
12+
## Expected result
13+
14+
<!-- (REQUIRED) What is the expected result/behavior of this feature? -->
15+
16+
## Benefits
17+
18+
<!-- (REQUIRED) How does this feature improve the devdocs experience? -->
19+
20+
## Possible solutions
21+
22+
<!-- (OPTIONAL) What would a solution for this issue look like? -->
23+
24+
## Additional information
25+
26+
<!-- (OPTIONAL) What other information can you provide about this feature? -->
27+
28+
<!--
29+
Thank you for taking the time to report this issue!
30+
GitHub Issues should only be created for problems/topics related to this project's codebase.
31+
32+
Before submitting this issue, please make sure you are complying with our Code of Conduct:
33+
https://github.com/magento/devdocs/blob/develop/.github/CODE_OF_CONDUCT.md
34+
35+
Issues that do not comply with our Code of Conduct or do not contain enough information may be closed at the maintainers' discretion.
36+
37+
Feel free to remove this section before creating this issue.
38+
-->
39+

0 commit comments

Comments
 (0)