Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit c49cbf1

Browse files
authored
Merge branch 'master' into patch-48
2 parents 12deaa3 + 93be5a4 commit c49cbf1

22 files changed

+1077
-39
lines changed

.github/MAINTAINER_GUIDELINES.md

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
# DevDocs maintainer guidelines
2+
3+
In general, the same [guidelines](https://devdocs.magento.com/guides/v2.3/contributor-guide/maintainers.html) for [`magento/magento2`](https://github.com/magento/magento2) maintainers apply to devdocs maintainers. However, there are some additional guidelines specific to devdocs that will help you as a maintainer.
4+
5+
## General expectations
6+
7+
- Self assign issues/pull requests (mostly pull requests)
8+
- Review and approve or request changes
9+
- Enforce the use of the issue/pull requests template
10+
- Ask contributors to link to the code base to validate documentation updates when applicable
11+
- Ask contributors not to contribute to v2.0 docs
12+
- If a maintainer creates a pull request, it should be reviewed by another maintainer or DevDocs staff member
13+
14+
## Labels
15+
16+
Labels are important because they help us identify pull requests and ensure that contributors receive points and recognition. See [devdocs awards and points](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#devdocs-awards-and-points).
17+
18+
Here is a brief summary of the most important labels:
19+
20+
- `New Topic`: Entirely new documents
21+
- `Major Update`: Significant new info: new section in existing topic, etc.
22+
- `Technical`: Changes to technical content/code/processes/naming conventions (any change to technical content)
23+
- `Editorial`: Typos, grammatical inconsistencies, or minor rewrites
24+
- `small changes`: See [Small changes workflow](#small-changes-workflow)
25+
26+
We also use version labels when appropriate.
27+
28+
As a maintainer, we expect you to add or remove labels when appropriate.
29+
30+
See https://github.com/magento/devdocs/labels for all labels and their descriptions.
31+
32+
## Testing
33+
34+
Currently, we only test internal links. In the future, we plan to expand tests to include external links, markdown linting, and spell checking.
35+
36+
We use private CI/CD stack and do not provide access to it.
37+
38+
Every pull request to the `master` branch must pass tests before it can be merged. When a pull request is ready for tests, a member of the [`devdocs-admins`](https://github.com/orgs/magento/teams/devdocs-admins) team must add the test trigger phrase to the pull request as a comment. The trigger phrase is "_running tests_". By approving a pull request, you are signalling an admin that the pull request is ready for tests.
39+
40+
## Projects
41+
42+
We use several projects to help organize issues and pull requests. You can add existing issues and pull requests to these projects as you see fit.
43+
44+
https://github.com/magento/devdocs/projects
45+
46+
## Style
47+
48+
We prefer Markdown over HTML (in most cases). You can use [kramdown](https://kramdown.gettalong.org/syntax.html) syntax for more markup features and [Liquid](https://jekyllrb.com/docs/liquid/) for in-topic scripting.
49+
50+
## Small changes workflow
51+
52+
Before merging a pull request to the `master` branch, it must pass automated testing. Testing takes about 30 minutes to complete for each pull request, so we created a workflow to save time for small changes.
53+
54+
- **Individual pull requests to `master`**—15 individual pull requests to `master` x 30 minutes per pull request = 7.5 hrs of testing time
55+
- **Multiple pull requests using `small_changes`**—1 `small_changes` pull request (containing 15 individual pull requests) to `master` x 30 minutes = 30 minutes of testing time
56+
57+
This workflow is for typos, formatting issues, and minor text additions or deletions. It is not for substantial new content, changes to tables, new files, or files that have been moved.
58+
59+
Periodically, we will create a pull request from `small_changes` to `master` and then run tests on that pull request to save time.
60+
61+
### Process
62+
63+
1. Review the pull request and either approve it or request changes.
64+
1. Apply the `Small changes` label if one of the following labels should also be applied:
65+
66+
- `Editorial`
67+
- `Technical`
68+
69+
1. That's it! A devdocs-admin will run tests and merge.

_data/whats-new.yml

Lines changed: 44 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,45 @@ description: |
44
We exclude from this list proofreading, spelling checks, and all minor updates.
55
link: /whats-new.html
66
thread: /whatsnew-feed.xml
7-
updated: Mon May 13 11:36:22 2019
7+
updated: Mon May 20 13:19:25 2019
88
entries:
9+
- description: Added [reference documentation](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/routing.html#result-object)
10+
about the `result object` returned by the `Action` class.
11+
versions: 2.1.x, 2.2.x, 2.3.x
12+
type: Major update
13+
date: May 20, 2019
14+
link: https://github.com/magento/devdocs/pull/4541
15+
- description: Added information about adding a custom carrier to the [Customize Checkout
16+
tutorial](https://devdocs.magento.com/guides/v2.3/howdoi/checkout/checkout-add-custom-carrier.html).
17+
versions: 2.1.x, 2.2.x, 2.3.x
18+
type: New topic
19+
date: May 20, 2019
20+
link: https://github.com/magento/devdocs/pull/4371
21+
- description: Added examples of [creating and updating a Magento admin user](https://devdocs.magento.com/guides/v2.3/install-gde/install/cli/install-cli-subcommands-admin.html)
22+
with the command line.
23+
versions: 2.1.x, 2.2.x, 2.3.x
24+
type: Major update
25+
date: May 17, 2019
26+
link: https://github.com/magento/devdocs/pull/4526
27+
- description: Added reference documentation for [ZIP code attributes](https://devdocs.magento.com/guides/v2.3/howdoi/checkout/checkout_zip.html),
28+
including a new code sample showing how to pass multiple ZIP code patterns for
29+
the same country.
30+
versions: 2.1.x, 2.3.x, 2.x
31+
type: Major update
32+
date: May 17, 2019
33+
link: https://github.com/magento/devdocs/pull/4530
34+
- description: Added 'webapi.xsd XML schema file' section to [Configure services as
35+
web APIs](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/service-contracts/service-to-web-service.html#validate-webapi).
36+
versions: 2.1.x, 2.2.x, 2.3.x
37+
type: Technical changes
38+
date: May 15, 2019
39+
link: https://github.com/magento/devdocs/pull/4521
40+
- description: Added "Reverting data patches" section to [Develop data and schema
41+
patches](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/declarative-schema/data-patches.html).
42+
versions: 2.3.x
43+
type: Major update
44+
date: May 13, 2019
45+
link: https://github.com/magento/devdocs/pull/4504
946
- description: Added clarity for `InstallData`/`UpgradeData` in relation to customer
1047
EAV attributes for [EAV and extension attributes](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/attributes.html)
1148
for all versions.
@@ -25,21 +62,21 @@ entries:
2562
date: May 12, 2019
2663
link: https://github.com/magento/devdocs/pull/4498
2764
- description: Added a section and code example about using [email templates](https://devdocs.magento.com/guides/v2.3/frontend-dev-guide/translations/translate_theory.html)
28-
to do translations
65+
to do translations.
2966
versions: 2.1.x, 2.2.x, 2.3.x
3067
type: Major update
3168
date: May 10, 2019
3269
link: https://github.com/magento/devdocs/pull/4476
3370
- description: Added information about [page layout types](https://devdocs.magento.com/guides/v2.3/frontend-dev-guide/layouts/layout-types.html)
34-
and a new code example that shows how to use them
71+
and a new code example that shows how to use them.
3572
versions: 2.1.x, 2.2.x, 2.3.x
3673
type: Major update
3774
date: May 10, 2019
3875
link: https://github.com/magento/devdocs/pull/4475
3976
- description: Published Amazon Sales Channel documentation for GA release.<br/>-
4077
[Install](https://devdocs.magento.com/extensions/amazon-sales/)<br/>- [Release
4178
Notes](https://devdocs.magento.com/extensions/amazon-sales/release-notes/)<br/>-
42-
[Compatibility](https://devdocs.magento.com/release/)
79+
[Compatibility](https://devdocs.magento.com/release/).
4380
versions: 2.0.0-asc
4481
type: Major update
4582
date: May 10, 2019
@@ -51,7 +88,7 @@ entries:
5188
date: May 10, 2019
5289
link: https://github.com/magento/devdocs/pull/4392
5390
- description: Added the observer interface implementation to the [observer example](https://devdocs.magento.com/guides/v2.1/coding-standards/technical-guidelines.html)
54-
in the technical guidelines
91+
in the technical guidelines.
5592
versions: 2.1.x, 2.2.x, 2.3.x
5693
type: Major update
5794
date: May 10, 2019
@@ -88,7 +125,7 @@ entries:
88125
date: May 7, 2019
89126
link: https://github.com/magento/devdocs/pull/4437
90127
- description: Added a [new code example](https://devdocs.magento.com/guides/v2.3/javascript-dev-guide/widgets/widget_dialog.html)
91-
showing how to initialize and pass options to the dropdown dialog widget.
128+
showing how to initialize and pass options to the drop-down dialog widget.
92129
versions: 2.1.x, 2.2.x, 2.3.x
93130
type: Major update
94131
date: May 3, 2019
@@ -193,7 +230,7 @@ entries:
193230
date: April 10, 2019
194231
link: https://github.com/magento/devdocs/pull/3524
195232
- description: Added a new [product release information](https://devdocs.magento.com/release/)
196-
topic that describes Magento's release policy, product availability, and extension
233+
topic that describes Magento release policy, product availability, and extension
197234
stability.
198235
versions: 2.3.x
199236
type: New topic

guides/v2.1/contributor-guide/devdocs-maintainers.md

Lines changed: 0 additions & 26 deletions
This file was deleted.

guides/v2.1/contributor-guide/maintainers.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,7 @@ Maintainers take part in these main activities:
3030
- Participate in discussions regarding proposed solutions, created issues, and more
3131
- Help other community members resolve their questions and issues with advice, helpful code snippets, or other examples
3232
- Find and propose better or new methods for pull request reviews, code delivery, QA activities, tests, and more
33+
34+
## Guidelines for DevDocs
35+
36+
In general, the same [guidelines](https://devdocs.magento.com/guides/v2.3/contributor-guide/maintainers.html) for [`magento/magento2`](https://github.com/magento/magento2) maintainers apply to DevDocs maintainers. However, there are some [additional guidelines](https://github.com/magento/devdocs/blob/master/.github/MAINTAINER_GUIDELINES.md) that apply to DevDocs.

guides/v2.1/extension-dev-guide/routing.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,21 @@ $this->_forward('action', 'controller', 'Other_Module')
160160
{: .bs-callout .bs-callout-tip }
161161
Use the [`ActionFactory`] in your router to create an instance of an `Action` class.
162162

163+
164+
{: .bs-callout .bs-callout-info }
165+
Action class should return a `result object`.
166+
167+
## Result object
168+
169+
Name | Description
170+
--- | ---
171+
`json` | Sets `Content-Type:application/json` in the header and returns a json encoded representation of an array with data
172+
`raw` | Returns the data as it's been set. Does not set a `Content-Type` in the header
173+
`redirect` | Creates an external redirect, which the browser follows and requests a new url
174+
`forward` | Internally calls the execute method of another action class and does not trigger a new request from the browser. The URL stays the same
175+
`layout` | View result. You can use a generic layout response to render any kind of layout. The layout comprises a response body from its layout elements and sets it to the HTTP response
176+
`page` | View result. Encapsulates page type, page configuration, and imposes certain layout handles. `page` triggers `layout.xml` to render into HTML
177+
163178
[`FrontController` class]: {{ site.mage2bloburl }}/{{ page.guide_version }}/lib/internal/Magento/Framework/App/FrontController.php
164179
[FrontController]: #frontcontroller-class
165180
[Router class]: {{ site.mage2bloburl }}/{{ page.guide_version }}/lib/internal/Magento/Framework/App/RouterInterface.php

0 commit comments

Comments
 (0)