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

Small changes #6007

Merged
merged 41 commits into from
Nov 15, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
f8883e4
update file extension
hguthrie Nov 12, 2019
8d5649d
Fix small grammatical issue
Nov 12, 2019
f8c4b09
Merge branch 'master' into hg-mc4655-blackfireyaml
dobooth Nov 12, 2019
0ccec6a
Merge pull request #5977 from magento/hg-mc4655-blackfireyaml
dobooth Nov 12, 2019
9599d71
Fixed incorrect link syntax
drpayyne Nov 12, 2019
436c427
Merge branch 'master' into collapsible-widget-grammar
dobooth Nov 12, 2019
6da5a5e
Merge master
dobooth Nov 12, 2019
abba21e
Merge pull request #5978 from enderandpeter/collapsible-widget-grammar
dobooth Nov 12, 2019
7f83d4b
Merge pull request #5979 from drpayyne/patch-45
dobooth Nov 12, 2019
d74e9a2
magento/devdocs#: Add deleteCustomerAddress mutation API errors
atwixfirster Nov 13, 2019
ab6a633
Update theme-create.md
Serhii190336 Nov 13, 2019
f0a0fc0
magento/devdocs#: Add updateCustomerAddress mutation API errors
atwixfirster Nov 13, 2019
b55278d
Editing for grammar
keharper Nov 13, 2019
7e30a34
Editing for grammar
keharper Nov 13, 2019
e956a4c
Merge branch 'master' into api-errors-updateCustomerAddress
dobooth Nov 13, 2019
ef0c347
Merge master
dobooth Nov 13, 2019
646dcae
Merge pull request #5991 from atwixfirster/api-errors-updateCustomerA…
dobooth Nov 13, 2019
2ac9138
Merge branch 'master' into api-errors-deleteCustomerAddress
dobooth Nov 13, 2019
50b1d26
Merge pull request #5988 from atwixfirster/api-errors-deleteCustomerA…
dobooth Nov 13, 2019
074a08a
Add contributor metadata info
shrielenee Nov 13, 2019
193c25f
Change wording
shrielenee Nov 13, 2019
8e1dc57
Merge branch 'master' into spangler-contribmeta
shrielenee Nov 14, 2019
0465630
Merge master
dobooth Nov 14, 2019
0689c6b
Merge pull request #5994 from magento/spangler-contribmeta
dobooth Nov 14, 2019
749e32b
Update database-caching.md
gustavolcdev Nov 14, 2019
e36478e
Update create-cache-type.md
gustavolcdev Nov 14, 2019
e85fac2
Update lifecycle.md
gustavolcdev Nov 14, 2019
fd7df58
Merge branch 'master' into patch-3
dobooth Nov 15, 2019
c8276ca
Merge master
dobooth Nov 15, 2019
bb85f52
Merge pull request #6003 from gustavo11star/patch-3
dobooth Nov 15, 2019
65fea69
Merge branch 'master' into patch-2
dobooth Nov 15, 2019
89ac927
Merge pull request #6002 from gustavo11star/patch-2
dobooth Nov 15, 2019
9225af4
Merge branch 'master' into patch-1
dobooth Nov 15, 2019
5bfd82c
Merge pull request #6000 from gustavo11star/patch-1
dobooth Nov 15, 2019
699927a
Merge branch 'master' into patch-1
dobooth Nov 15, 2019
93fed52
Merge pull request #5990 from Serj190336/patch-1
dobooth Nov 15, 2019
4c0cff6
Typo fix
dobooth Nov 15, 2019
3c3f56c
Merge branch 'master' into dobooth-patch-1
dobooth Nov 15, 2019
72bbdfc
Merge master
dobooth Nov 15, 2019
66031b2
Merge pull request #6006 from magento/dobooth-patch-1
dobooth Nov 15, 2019
720dd5a
Merge branch 'master' into small-changes
dobooth Nov 15, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions guides/v2.2/cloud/project/project-integrate-blackfire.md
Original file line number Diff line number Diff line change
Expand Up @@ -235,11 +235,11 @@ By simply defining a set of key requests for Blackfire to profile— `/home`, `/

### Writing your first automated tests and scenarios

You can easily write tests and scenarios for Blackfire to execute. Create a `.blackfire.yml` file and store it at your project root directory.
You can easily write tests and scenarios for Blackfire to execute. Create a `.blackfire.yaml` file and store it at your project root directory.

Try adding the following scenarios in the file:

> .blackfire.yml
> .blackfire.yaml

```yaml
scenarios:
Expand All @@ -257,7 +257,7 @@ See the Blackfire documentation on [Writing tests](https://blackfire.io/docs/coo

### Running your tests automatically {#automation}

Once you create and deploy your `.blackfire.yml` file, you can enable Blackfire to run your tests automatically in various ways:
Once you create and deploy your `.blackfire.yaml` file, you can enable Blackfire to run your tests automatically in various ways:

- **Automated builds on Integration**—Whenever you push code on an Integration, Staging, or Production branch, Blackfire automatically runs your tests. You can receive a notification of the results in various ways, such as a commit status level when using GitHub or Bitbucket. See Blackfire notifications.

Expand Down
5 changes: 3 additions & 2 deletions guides/v2.2/contributor-guide/templates/basic_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@ Parameter | Description
`functional_areas:` | Optional. Adds facets for search results. Available facets include: Sales, Products, Carts, Customers, Marketing, Account, Content, Reports, Stores, System, Catalog, Orders, Frontend, Theme, Staging, Search, Configurations, Integration, Services, Tools, Setup, Testing, test, Standards, Install, Upgrade, B2B, Cloud, and Bundled extensions. These facets are case sensitive and support multiple facets separated by commas. For example: `functional_areas: Install`.
`redirect_from` | Optional. Add a list of other pages in DevDocs that should redirect to this page. The link should start with the `/guides` directory. For an example, see the source code for this template page.
`ee_only:` | Optional. If set to `true`, graphics/cues display on the page indicating it applies to {{site.data.var.ee}}.
`contributor_name` | Optional. Add a contributor's name to the metadata to add a "Thanks for contributing to this topic!" attribution in the top right corner of a topic.
`contributor_link:` | Optional. Add a link to the contributor's GitHub profile or website. The attribution will include this link.

{% include note.html type='info' content='If you need help with metadata, we can help in your submitted pull requests.'
%}
If you need help with metadata, we can assist!

## Basic Markdown Syntax {#basic}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ The tag *scope* provides a mechanism for a cache type.
To create a new cache type:

```php
class %Namespace%\%Module%\Model\Cache\Type extends \Magento\Framework\Cache\Frontend\Decorator\TagScope
class VendorName\ModuleName\Model\Cache\Type extends \Magento\Framework\Cache\Frontend\Decorator\TagScope
{
const TYPE_IDENTIFIER = '%cache_type_id%';
const CACHE_TAG = '%CACHE_TYPE_TAG%';
Expand All @@ -24,7 +24,7 @@ class %Namespace%\%Module%\Model\Cache\Type extends \Magento\Framework\Cache\Fro

You must specify the following parameters:

* `Namespace\Module` defines the name of a [module](https://glossary.magento.com/module) that uses a cache type. A module can use several cache types and a cache type can be used in several modules.
* `VendorName\ModuleName` defines the name of a [module](https://glossary.magento.com/module) that uses a cache type. A module can use several cache types and a cache type can be used in several modules.
* `%cache_type_id%` defines unique identifier of a cache type.
* `%CACHE_TYPE_TAG%` defines unique tag to be used in the cache type scoping.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,24 +47,24 @@ To modify `di.xml`:
1. Open `di.xml` in a text editor and locate the following block:

```xml
<type name="Magento\Framework\App\Cache\Frontend\Pool">
<arguments>
<argument name="frontendSettings" xsi:type="array">
<item name="page_cache" xsi:type="array">
<item name="backend_options" xsi:type="array">
<item name="cache_dir" xsi:type="string">page_cache</item>
</item>
</item>
</argument>
</arguments>
</type>
<type name="Magento\Framework\App\Cache\Type\FrontendPool">
<arguments>
<argument name="typeFrontendMap" xsi:type="array">
<item name="full_page" xsi:type="string">page_cache</item>
</argument>
</arguments>
</type>
<type name="Magento\Framework\App\Cache\Frontend\Pool">
<arguments>
<argument name="frontendSettings" xsi:type="array">
<item name="page_cache" xsi:type="array">
<item name="backend_options" xsi:type="array">
<item name="cache_dir" xsi:type="string">page_cache</item>
</item>
</item>
</argument>
</arguments>
</type>
<type name="Magento\Framework\App\Cache\Type\FrontendPool">
<arguments>
<argument name="typeFrontendMap" xsi:type="array">
<item name="full_page" xsi:type="string">page_cache</item>
</argument>
</arguments>
</type>
```

The `<type name="Magento\Framework\App\Cache\Frontend\Pool">` node configures options for the in-memory pool of all frontend cache instances.
Expand Down
2 changes: 1 addition & 1 deletion guides/v2.2/frontend-dev-guide/themes/theme-create.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ The folder name conventionally matches naming used in the theme's code: any alph

## Declare your theme {#fedg_create_theme_how-to_declare}

After you create a directory for your theme, you must create `theme.xml` containing at least the theme name. Optionally, you can specifiy the parent theme name (if the theme [inherits]({{page.baseurl}}/frontend-dev-guide/themes/theme-inherit.html) from one) and, if necessary, where the theme preview image is stored.
After you create a directory for your theme, you must create `theme.xml` containing at least the theme name. Optionally, you can specify the parent theme name (if the theme [inherits]({{page.baseurl}}/frontend-dev-guide/themes/theme-inherit.html) from one) and, if necessary, where the theme preview image is stored.

1. Add or copy from an existing `theme.xml` file to your theme directory `app/design/frontend/<Vendor>/<theme>`.

Expand Down
2 changes: 1 addition & 1 deletion guides/v2.2/howdoi/checkout/checkout_customize.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ functional_areas:
- Checkout
---

This topic contains the basic information about how to customize the view of an existing [checkout](https://glossary.magento.com/checkout) step. In the Magento application, checkout is implemented using UI components. You can customize each step by [changing the [JavaScript](https://glossary.magento.com/javascript) implementation or template](#change-component) for a component, [adding](#add), [disabling](#disable), or [removing](#remove) a component.
This topic contains the basic information about how to customize the view of an existing [checkout](https://glossary.magento.com/checkout) step. In the Magento application, checkout is implemented using UI components. You can customize each step by [changing the JavaScript implementation or template](#change-component) for a component, [adding](#add), [disabling](#disable), or [removing](#remove) a component.

## Change the component's .js implementation and template {#change-component}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ The Magento collapsible widget converts a header/content pair into an accordion,

Unlike the accordion widget which is initialized for a set of title/contents pairs, the collapsible widget is initialized for one title/content pair.

To "bind" several instances of collapsible widget, the [`collateral`] option is used.
To "bind" several instances of a collapsible widget, the [`collateral`] option is used.

Once it is expanded, the content can be updated using Ajax. The collapsed/expanded state can be saved into local storage, or cookies if the browser does not support local storage.

Expand Down
2 changes: 1 addition & 1 deletion guides/v2.3/extension-dev-guide/prepare/lifecycle.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ If the `schema_version` for your module is found in the `setup_module` table, Ma
**Example:** InstallSchema.php

```php
class \VendorName\ModuleName\Setup\InstallSchema implements \Magento\Framework\Setup\InstallSchemaInterface
class VendorName\ModuleName\Setup\InstallSchema implements \Magento\Framework\Setup\InstallSchemaInterface
{
/**
* {@inheritdoc}
Expand Down
2 changes: 1 addition & 1 deletion guides/v2.3/frontend-dev-guide/themes/theme-create.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ The folder name conventionally matches naming used in the theme's code: any alph

## Declare your theme {#fedg_create_theme_how-to_declare}

After you create a directory for your theme, you must create `theme.xml` containing at least the theme name. Optionally, you can specifiy the parent theme name (if the theme [inherits]({{page.baseurl}}/frontend-dev-guide/themes/theme-inherit.html) from one) and, if necessary, where the theme preview image is stored.
After you create a directory for your theme, you must create `theme.xml` containing at least the theme name. Optionally, you can specify the parent theme name (if the theme [inherits]({{page.baseurl}}/frontend-dev-guide/themes/theme-inherit.html) from one) and, if necessary, where the theme preview image is stored.

1. Add or copy from an existing `theme.xml` file to your theme directory `app/design/frontend/<Vendor>/<theme>`.

Expand Down
12 changes: 12 additions & 0 deletions guides/v2.3/graphql/mutations/delete-customer-address.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,18 @@ Attribute | Data Type | Description

The `deleteCustomerAddress` mutation returns a Boolean value that indicates whether the operation was successful.

## Errors

Error | Description
--- | ---
`Address "id" value should be specified` | The `id` attribute is zero.
`Could not find a address with ID "XXX"` | The customer address specified in the `id` attribute does not exist.
`Customer Address XXX is set as default billing address and cannot be deleted` | You cannot delete a default billing address.
`Customer Address XXX is set as default shipping address and cannot be deleted` | You cannot delete a default shipping address.
`Field "deleteCustomerAddress" argument "id" requires type Int!, found "XXX".` | The specified `id` attribute value has the wrong type.
`Syntax Error: Expected Name, found )` | The `id` attribute was omitted or does not have a value.
`The current customer isn't authorized.` | The current customer is not currently logged in, or the customer's token does not exist in the `oauth_token` table.

## Related topics

* [customer query]({{page.baseurl}}/graphql/queries/customer.html)
Expand Down
13 changes: 13 additions & 0 deletions guides/v2.3/graphql/mutations/update-customer-address.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,19 @@ The `updateCustomerAddress` mutation returns the `CustomerAddress` object.

{% include graphql/customer-address-output.md %}

## Errors

Error | Description
--- | ---
`Address "id" value should be specified` | The `id` attribute is zero.
`Could not find a address with ID "XXX"` | The customer address specified in the `id` attribute does not exist.
`Current customer does not have permission to address with ID "XXX"` | The customer tries to update the address of another customer.
`Field "updateCustomerAddress" argument "id" of type "Int!" is required but not provided.` | The `id` attribute was omitted.
`Field "updateCustomerAddress" argument "id" requires type Int!, found "XXX".` | The specified `id` attribute value has the wrong type.
`"input" value must be specified` | The `input` attribute was omitted or was specified but is empty.
`Syntax Error: Expected Name, found )` | The `id` and `input` attributes are omitted.
`The current customer isn't authorized.` | The current customer is not currently logged in, or the customer's token does not exist in the `oauth_token` table.

## Related topics

* [customer query]({{page.baseurl}}/graphql/queries/customer.html)
Expand Down