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

Commit 10023f4

Browse files
committed
Fixed errors in coding standards, comp-mgr, contributor
1 parent 992b771 commit 10023f4

File tree

12 files changed

+71
-70
lines changed

12 files changed

+71
-70
lines changed

_checks/styles/style-rules-prod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ rule 'MD025'
2222
exclude_rule 'MD026'
2323
exclude_rule 'MD027'
2424
exclude_rule 'MD028'
25-
exclude_rule 'MD029'
25+
rule 'MD029'
2626
exclude_rule 'MD030'
2727
exclude_rule 'MD031'
2828
exclude_rule 'MD032'

guides/v2.2/coding-standards/docblock-standard-general.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ The following is assumed by default:
3232
The documentation should follow two simple principles:
3333

3434
1. Be as short as possible.
35-
2. Include all necessary information without duplication.
35+
1. Include all necessary information without duplication.
3636

3737
### Short documentation
3838

@@ -71,10 +71,11 @@ Below are ways of improving code to help simplify documentation:
7171
### Include all the necessary details
7272

7373
1. Identify the details a developer needs to work with your code.
74-
2. Ignore the implementation details (i.e. private methods/properties and method bodies) and focus on what the public interface signature provides.
74+
1. Ignore the implementation details (i.e. private methods/properties and method bodies) and focus on what the public interface signature provides.
7575

7676
If possible, improve the interface to provide more information.
77-
3. Add any remaining information that a developer may need to the DocBlock.
77+
78+
1. Add any remaining information that a developer may need to the DocBlock.
7879

7980
## Files
8081
{:#files}

guides/v2.2/coding-standards/technical-vision/webapi.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ To extend an interface, use [extension attributes]({{ page.baseurl }}/extension-
6464

6565
1. Add a `schema.graphqls` file to the `<ModuleName>GraphQl` module. Magento merges this file with configurations from other modules using the same merge rules as other types of configuration.
6666

67-
2. Write any necessary plugins for existing resolvers related to the query, or create a custom resolver and enable it via override in `schema.graphqls`
67+
1. Write any necessary plugins for existing resolvers related to the query, or create a custom resolver and enable it via override in `schema.graphqls`
6868

6969
### Model Consistency Constraints
7070

guides/v2.2/comp-mgr/marketplace/marketplace.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ If you don't have an account yet:
2121

2222
![Sign in to Marketplace]({{ site.baseurl }}/common/images/marketplace_sign-in.png){:width="600px"}
2323

24-
2. In the right pane, click **Create an account**.
24+
1. In the right pane, click **Create an account**.
2525

2626
![Create a Marketplace account]({{ site.baseurl }}/common/images/marketplace_create-acct.png){:width="300px"}
2727

@@ -44,4 +44,3 @@ When you're ready, click **Go to Checkout** and follow the prompts on your scree
4444
### Install your new purchases
4545

4646
Use the [Component Manager]({{ page.baseurl }}/comp-mgr/module-man/compman-checklist.html) to install your purchases.
47-

guides/v2.2/comp-mgr/upgrader/upgrade-main-pg.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,18 +69,18 @@ To upgrade components:
6969

7070
![Select the version of Magento core components to which to upgrade]({{ site.baseurl }}/common/images/upgr_step1_core-ver.png)
7171

72-
2. For each third-party component:
72+
1. For each third-party component:
7373

74-
* If you *do* want to upgrade it, set **Upgrade** to **Yes** and click the version from the **Update Version** list.
74+
* If you *do* want to upgrade it, set **Upgrade** to **Yes** and click the version from the **Update Version** list.
7575

7676
A sample follows.
7777

7878
![Upgrade this component]({{ site.baseurl }}/common/images/upgr_comp_yes.png)
7979

80-
* If you *do not* want to upgrade it, set **Upgrade** to **No**.
80+
* If you *do not* want to upgrade it, set **Upgrade** to **No**.
8181

8282
A sample follows.
8383

8484
![Do not upgrade this component]({{ site.baseurl }}/common/images/upgr_comp_no.png)
8585

86-
3. Click **Next** and continue with [Step 2. Readiness check]({{ page.baseurl }}/comp-mgr/upgrader/upgrade-readiness.html)
86+
1. Click **Next** and continue with [Step 2. Readiness check]({{ page.baseurl }}/comp-mgr/upgrader/upgrade-readiness.html)

guides/v2.2/contributor-guide/templates/basic_template.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,23 +57,23 @@ Lists are useful for organizing and displaying related items. Below are examples
5757

5858
*Output:*
5959

60-
* List Item 1
61-
* List Item 2
62-
* List Item 3
60+
* List Item 1
61+
* List Item 2
62+
* List Item 3
6363

6464
**Ordered List:**
6565

6666
```markdown
6767
1. First Step
68-
2. Second Step
69-
3. Third Step
68+
1. Second Step
69+
1. Third Step
7070
```
7171

7272
*Output:*
7373

7474
1. First Step
75-
2. Second Step
76-
3. Third Step
75+
1. Second Step
76+
1. Third Step
7777

7878
### Images {#images}
7979

guides/v2.2/design-styleguide/content-voice-tone/content-voice-tone.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ Consistency is critical. For example, wherever content is displayed in [Data Tab
182182
Take a neutral tone – don’t blame a merchant or in any way indicate that the merchant made a mistake. Use “business casual” and easy-to-understand language. Avoid personal pronouns and technical jargon. Content structure and formatting should follow this order:
183183

184184
1. Tell merchants what went wrong, in specific terms.
185-
2. Instruct how to fix the problem and continue the current task. If the error can’t be resolved online, try to give merchants an appropriate offline contact option and a timeframe when they should try again.
185+
1. Instruct how to fix the problem and continue the current task. If the error can’t be resolved online, try to give merchants an appropriate offline contact option and a timeframe when they should try again.
186186

187187
*Example:*
188188

guides/v2.2/design-styleguide/errors-and-messages/errors-and-messages.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,27 @@ menu_node:
88
---
99
Magento uses different types of dynamic messaging to alert users when:
1010

11-
* An error has occurred and blocks them in completing a task
11+
* An error has occurred and blocks them in completing a task
1212

13-
* Users need to know important information before continuing a task
13+
* Users need to know important information before continuing a task
1414

1515
## Types of Errors and Messages
1616

17-
* **Information information.** This messaging is not an error. It's used when a person can continue with the task but needs to be alerted regarding information critical to completing a task.
17+
* **Information information.** This messaging is not an error. It's used when a person can continue with the task but needs to be alerted regarding information critical to completing a task.
1818

19-
* **Recoverable error.** Used when a person is blocked and can only continue by taking an action to fix the problem.
19+
* **Recoverable error.** Used when a person is blocked and can only continue by taking an action to fix the problem.
2020

21-
* **Not recoverable / catastrophic error.** Used when a person can’t complete the task currently. Usually, it’s due to system error, the server is down, etc. For ideal next steps for users, include a contact method to fix the issue. If a contact method isn't available, provide guidance for the user to try again at a later time.
21+
* **Not recoverable / catastrophic error.** Used when a person can’t complete the task currently. Usually, it’s due to system error, the server is down, etc. For ideal next steps for users, include a contact method to fix the issue. If a contact method isn't available, provide guidance for the user to try again at a later time.
2222

2323
## How to Write Errors Content
2424

2525
Use complete sentences and brief, exact, but conversational language.
2626

2727
1. Avoid the following words – personal pronouns, "please", and "sorry".
2828

29-
2. Specify what went wrong.
29+
1. Specify what went wrong.
3030

31-
3. Tell users how to fix the problem and continue the current task. If the problem can’t be resolved online, give users appropriate options to contact us or try again at a later time.
31+
1. Tell users how to fix the problem and continue the current task. If the problem can’t be resolved online, give users appropriate options to contact us or try again at a later time.
3232

3333
### Tone and Language
3434

guides/v2.3/comp-mgr/cli/cli-upgrade.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ functional_areas:
1212

1313
You can upgrade your Magento application from the command line if you installed the software by:
1414

15-
- Downloading the [metapackage][] using `composer create-project`.
16-
- Installing the compressed archive.
15+
- Downloading the [metapackage][] using `composer create-project`.
16+
- Installing the compressed archive.
1717

1818
Do not use this method to upgrade if you cloned the Magento 2 GitHub repository.
1919
Instead, see [Update the Magento application][] for upgrade instructions.
@@ -22,10 +22,10 @@ Instead, see [Update the Magento application][] for upgrade instructions.
2222

2323
Complete the following prerequisites to prepare your environment before starting the upgrade process:
2424

25-
- **Complete the Update and upgrade checklist**—To avoid possible errors during installation or upgrading, complete the [Update and upgrade checklist].
26-
- **Set the `pub/` directory root**—See [Modify docroot to improve security][] for more details.
27-
- **Check PHP and environment settings**—Verify that your PHP and other environment settings are compatible with the [system requirements].
28-
- **Switch to maintenance mode**—To prevent access to your store while it's being upgraded, switch your store to maintenance mode:
25+
- **Complete the Update and upgrade checklist**—To avoid possible errors during installation or upgrading, complete the [Update and upgrade checklist].
26+
- **Set the `pub/` directory root**—See [Modify docroot to improve security][] for more details.
27+
- **Check PHP and environment settings**—Verify that your PHP and other environment settings are compatible with the [system requirements].
28+
- **Switch to maintenance mode**—To prevent access to your store while it's being upgraded, switch your store to maintenance mode:
2929

3030
```bash
3131
bin/magento maintenance:enable
@@ -230,11 +230,11 @@ Open your storefront URL in a web browser to check whether the upgrade was succe
230230
If the application fails with a `We're sorry, an error has occurred while generating this email.` error:
231231
232232
1. Reset [file system ownership and permissions] as a user with `root` privileges.
233-
2. Clear the following directories:
234-
- `var/cache/`
235-
- `var/page_cache/`
236-
- `generated/code/`
237-
3. Check your storefront in your web browser again.
233+
1. Clear the following directories:
234+
- `var/cache/`
235+
- `var/page_cache/`
236+
- `generated/code/`
237+
1. Check your storefront in your web browser again.
238238
239239
## Alternatives
240240
@@ -243,7 +243,7 @@ There are alternatives methods that automate parts of the upgrade process:
243243
1. [Upgrade using the script][] (semi-automated process)
244244
Upgrading using the script process is a bit easier and less intensive if you have not made updates to values that the script affects.
245245
If you previously made updates, do not upgrade using the script. The script will override your updates.
246-
2. EXPERIMENTAL: [Upgrade using the custom Composer plugin][]
246+
1. EXPERIMENTAL: [Upgrade using the custom Composer plugin][]
247247
We are developing a [custom Composer plugin][] that enhances the semi-automated upgrade process.
248248
249249
The upgrading scenario is the same for each of these options. Both use Composer and a command line interface.

guides/v2.3/comp-mgr/cli/upgrade-with-plugin.md

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -98,23 +98,24 @@ composer show magento/product-enterprise-edition {{ page.guide_version }}.* --al
9898
_Optional_—If the Magento updater is installed (it is located in `update/`) modify it:
9999

100100
1. Backup `update/` directory.
101-
2. Create a Composer project.
101+
1. Create a Composer project.
102102

103103
_{{ ce }} version {{ page.guide_version }}.2:_
104104

105-
```bash
106-
composer create-project --repository=https://repo.magento.com magento/project-community-edition={{ page.guide_version }}.2 temp_dir --no-install
107-
```
105+
```bash
106+
composer create-project --repository=https://repo.magento.com magento/project-community-edition={{ page.guide_version }}.2 temp_dir --no-install
107+
```
108+
109+
_{{ ee }} version {{ page.guide_version }}.2:_
108110

109-
_{{ ee }} version {{ page.guide_version }}.2:_
111+
```bash
112+
composer create-project --repository=https://repo.magento.com magento/project-enterprise-edition={{ page.guide_version }}.2 temp_dir --no-install
113+
```
110114

111-
```bash
112-
composer create-project --repository=https://repo.magento.com magento/project-enterprise-edition={{ page.guide_version }}.2 temp_dir --no-install
113-
```
115+
{: .bs-callout-info }
116+
If you need to use a repository that contains non-public packages, such as internal sandboxes, change the URL in `--repository` accordingly.
114117

115-
{: .bs-callout-info }
116-
If you need to use a repository that contains non-public packages, such as internal sandboxes, change the URL in `--repository` accordingly.
117-
3. Remove the old `update/` directory and move the `temp_dir/update/` to the `update/` directory:
118+
1. Remove the old `update/` directory and move the `temp_dir/update/` to the `update/` directory:
118119

119120
```bash
120121
rm -rf update
@@ -195,11 +196,11 @@ Open your storefront URL in a web browser to check whether the upgrade was succe
195196
If the application fails with a `We're sorry, an error has occurred while generating this email.` error:
196197

197198
1. Reset [file system ownership and permissions] as a user with `root` privileges.
198-
2. Clear these directories:
199-
- `var/cache`
200-
- `var/page_cache`
201-
- `generated/code`
202-
3. Check your storefront in your web browser again.
199+
1. Clear these directories:
200+
- `var/cache`
201+
- `var/page_cache`
202+
- `generated/code`
203+
1. Check your storefront in your web browser again.
203204

204205
<!-- Link definitions -->
205206

guides/v2.3/comp-mgr/cli/upgrade-with-script.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ Use [the manual process] if you previously made updates to the same values that
1212

1313
The upgrade script:
1414

15-
- Updates Magento with the {{ page.guide_version }} requirements.
16-
- Backs up the `composer.json` file.
17-
- Specifies the new version of the Magento metapackage.
18-
- Updates the `"require-dev"` section in the `composer.json` file.
19-
- Adds `"Zend\\Mvc\\Controller\\": "setup/src/Zend/Mvc/Controller/"` to the `"autoload":"psr-4"` section in the `composer.json` file.
20-
- Backs up and updates the `magento/updater`, if it has been installed.
21-
- Updates the `"name"`, `"version"`, and `"description"` fields in the `composer.json` file.
15+
- Updates Magento with the {{ page.guide_version }} requirements.
16+
- Backs up the `composer.json` file.
17+
- Specifies the new version of the Magento metapackage.
18+
- Updates the `"require-dev"` section in the `composer.json` file.
19+
- Adds `"Zend\\Mvc\\Controller\\": "setup/src/Zend/Mvc/Controller/"` to the `"autoload":"psr-4"` section in the `composer.json` file.
20+
- Backs up and updates the `magento/updater`, if it has been installed.
21+
- Updates the `"name"`, `"version"`, and `"description"` fields in the `composer.json` file.
2222

2323
## Before you begin
2424

@@ -94,11 +94,11 @@ Open your storefront URL in a web browser to check whether the upgrade was succe
9494
If the application fails with a `We're sorry, an error has occurred while generating this email.` error:
9595

9696
1. Reset [file system ownership and permissions] as a user with `root` privileges.
97-
2. Clear these directories:
98-
- `<magento_root>/var/cache`
99-
- `<magento_root>/var/page_cache`
100-
- `<magento_root>/generated/code`
101-
3. Check your storefront in your web browser again.
97+
1. Clear these directories:
98+
- `<magento_root>/var/cache`
99+
- `<magento_root>/var/page_cache`
100+
- `<magento_root>/generated/code`
101+
1. Check your storefront in your web browser again.
102102

103103
<!-- Link definitions -->
104104

guides/v2.3/contributor-guide/contributing.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,10 @@ This tool ports fixes automatically across versions with a few simple steps. It
196196
Access the tool at [porting.engcom.dev.magento.com](https://porting.engcom.dev.magento.com/). The first time you visit, you must log in and authorize with GitHub credentials. The tool performs all actions using your token.
197197

198198
1. Visit [porting.engcom.dev.magento.com](https://porting.engcom.dev.magento.com/) and **Login with GitHub**.
199-
2. Copy and paste the pull request URL in **Select Pull Request for porting** and click **Next**.
200-
3. Select the target version for your port: **Up Port** or **Back Port**.
201-
4. Verify the summary of changes in **Port information**.
202-
5. Click **Create Job**. A job is created and started shortly after.
199+
1. Copy and paste the pull request URL in **Select Pull Request for porting** and click **Next**.
200+
1. Select the target version for your port: **Up Port** or **Back Port**.
201+
1. Verify the summary of changes in **Port information**.
202+
1. Click **Create Job**. A job is created and started shortly after.
203203

204204
![Magento Porting Tool]({{ site.baseurl }}/common/images/porting-tool-steps.png)
205205

0 commit comments

Comments
 (0)