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

Commit ba6a755

Browse files
authored
Merge pull request #7743 from magento/small-changes
Small changes
2 parents 34f70aa + 428b837 commit ba6a755

File tree

10 files changed

+13
-11
lines changed

10 files changed

+13
-11
lines changed

src/_data/toc/b2b-developer-guide.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,5 @@ pages:
7171

7272
- label: Develop B2B extensions
7373
url: /b2b/extensions.html
74+
- label: B2B Release Notes
75+
url: /release-notes/b2b-release-notes.html

src/guides/v2.3/config-guide/multi-site/ms_websites.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Creating a root category is optional, but we show how to do it in this tutorial
2424
{% collapsible To create a root category: %}
2525

2626
1. Log in to the Magento Admin as a user authorized to create categories.
27-
1. Click **Products** > **Categories**.
27+
1. Click **Catalog** > **Categories**.
2828
1. Click **Add Root Category**.
2929
1. In the **Category Name** field, enter a unique name to identify this category.
3030
1. Make sure **Enable Category** is set to **Yes**.

src/guides/v2.3/extension-dev-guide/build/composer-integration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Here is the example of composer.json file.
3535
"AFL-3.0"
3636
],
3737
"require": {
38-
"php": "~7.1.3||~7.2.0||~7.3.0"
38+
"php": "~7.2.0||~7.3.0"
3939
},
4040
"autoload": {
4141
"files": [ "registration.php" ],

src/guides/v2.3/extension-dev-guide/build/create_component.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Refer to [Module version dependencies]({{ page.baseurl }}/extension-dev-guide/ve
5151
"name": "your-name/module-Acme",
5252
"description": "Test component for Magento 2",
5353
"require": {
54-
"php": "~7.1.3||~7.2.0",
54+
"php": "~7.2.0||~7.3.0",
5555
"magento/module-store": "102.1",
5656
"magento/module-catalog": "102.1",
5757
"magento/module-catalog-inventory": "102.1",

src/guides/v2.3/extension-dev-guide/package/package_module.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ The following example is a `composer.json` for a metapackage:
4949
"version": "2.0.0",
5050
"type": "metapackage",
5151
"require": {
52-
"php": "~7.1.3|~7.2.0",
52+
"php": "~7.2.0||~7.3.0",
5353
"zendframework/zend-stdlib": "~2.4.6",
5454
"zendframework/zend-code": "~2.4.6",
5555
"zendframework/zend-server": "~2.4.6",
@@ -99,7 +99,7 @@ The following example is a `composer.json` file for a module:
9999
"AFL-3.0"
100100
],
101101
"require": {
102-
"php": "~7.1.3|~7.2.0",
102+
"php": "~7.2.0||~7.3.0",
103103
"magento/framework": "~100.0.4"
104104
},
105105
"autoload": {

src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ Extending layout:
456456
In layout files you can change the elements order on a page. This can be done using one of the following:
457457

458458
- [`<move>` instruction]({{page.baseurl}}/frontend-dev-guide/layouts/xml-instructions.html#fedg_layout_xml-instruc_ex_mv): allows changing elements' order and parent.
459-
- [`before` and `after` attributes of `<block>`]({{page.baseurl}}/frontend-dev-guide/layouts/xml-instructions.html#fedg_xml-instrux_before-after): allows changing elements' order within one parent.
459+
- [`before` and `after` attributes of `<block>`]({{page.baseurl}}/frontend-dev-guide/layouts/xml-instructions.html#fedg_xml-instrux_before-after): sets the order of elements within a parent.
460460

461461
**Example of `<move>` usage:**
462462
put the stock availability and SKU blocks next to the product price on a product page.

src/guides/v2.3/frontend-dev-guide/translations/translate_theory.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ To ensure that your new string is added to the dictionary and translated, use th
1818
For example:
1919

2020
```php
21-
<?php echo __('Create Backup') ?>
21+
<?= __('Create Backup') ?>
2222
```
2323

2424
If your string contains a variable, to add a placeholder for this variable in the dictionary, use syntax similar to the following:
2525

2626
```php
27-
<?php echo __('Hello %1', $yourVariable) ?>
27+
<?= __('Hello %1', $yourVariable) ?>
2828
```
2929

3030
In this example, the _'Hello %1'_ string is added to the dictionary when the i18n tool is run.

src/guides/v2.3/howdoi/checkout/checkout-add-custom-carrier.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ ComponentRegistrar::register(
4747
"name": "vendor/custom-shipping",
4848
"description": "Custom shipping module",
4949
"require": {
50-
"php": "~7.1.3||~7.2.0",
50+
"php": "~7.2.0||~7.3.0",
5151
"magento/framework": "102.0.*",
5252
"magento/module-backend": "101.0.*",
5353
"magento/module-catalog": "103.0.*",

src/guides/v2.3/ui_comp_guide/components/ui-exportbutton.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ group: ui-components-guide
33
title: ExportButton component
44
---
55

6-
The ExportButton component implements the ability to export grid data to the specified data format (cvs, xml, and so on).
6+
The ExportButton component implements the ability to export grid data to the specified data format (csv, xml, and so on).
77

88
## Configuration options
99

src/marketplace/eqp/v1/help.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Use these resources if you need additional help.
77

88
**Slack:**
99

10-
- workspace: Magento Community Engineering
10+
- workspace: [Magento Community Engineering](https://opensource.magento.com/slack)
1111
- channel: **# marketplace-eqp-api**
1212

1313
**Email:**

0 commit comments

Comments
 (0)