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

Commit dbe2017

Browse files
authored
Merge branch 'master' into update-multiselect-widget-documentation
2 parents 263186b + 59571c1 commit dbe2017

File tree

177 files changed

+3344
-463
lines changed

Some content is hidden

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

177 files changed

+3344
-463
lines changed

.github/CONTRIBUTING.md

Lines changed: 41 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -66,19 +66,8 @@ The following guidelines may answer most of your questions and help you get star
6666
- 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.
6767

6868
- If you need to update the site navigation, ask for help in Slack ([#devdocs](https://magentocommeng.slack.com/messages/CAN932A3H)).
69-
- We use symbolic links for topics that are the same across versions of Magento. Remove the symbolic link and add a new file if your changes are unique to a specific version. Copy and paste a previous version of the topic to get started.
7069

71-
For example:
72-
73-
```bash
74-
git rm guides/v2.3/install-gde/composer.md
75-
```
76-
77-
```bash
78-
cp guides/v2.2/install-gde/composer.md guides/v2.3/install-gde/composer.md
79-
```
80-
81-
- Make sure 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.
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.
8271
- Review your work for basic typos, formatting errors, or ambiguous sentences before opening a pull request.
8372
- 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.
8473
- 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.
@@ -116,6 +105,7 @@ We provide templates to help you get started writing new content and understandi
116105
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).
117106

118107
```yaml
108+
119109
---
120110
group: install2
121111
title: Continue with your installation
@@ -129,6 +119,45 @@ title: Continue with your installation
129119
| `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. |
130120
| `title` | Sets the title of the page in the HTML metadata and the main title on the page. |
131121

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+
132161
## Report an issue
133162

134163
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.

.github/ISSUE_TEMPLATE/COMMUNITY_ISSUE_TEMPLATE.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ about: Create an issue related to a community engineering effort
88
<!-- (REQUIRED) Provide information for the doc request including any Community code issues or PRs, Magento versions, or devdoc pages. -->
99

1010
Type of Doc:
11+
1112
- [ ] New topic
1213
- [ ] Topic Update, Devdoc link:
1314
- [ ] Other
@@ -17,13 +18,15 @@ Magento 2 GitHub Issue: https://github.com/magento/devdocs/issues/link
1718
Magento 2 GitHub PR: https://github.com/magento/devdocs/pull/link
1819

1920
Magento 2 version:
21+
2022
- [ ] 2.1.X
2123
- [ ] 2.2.X
2224
- [ ] 2.3.X
2325
- [ ] back port
2426
- [ ] forward port
2527

2628
Notifications of Changes:
29+
2730
- [ ] Changes to Admin interface?
2831
- [ ] New software requirements?
2932
- [ ] New REST endpoints or updated GraphQL query syntax?

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@ If rake fails on your environment, generate the preview [using jekyll](#using-je
111111
### To minimize build time locally:
112112

113113
1. Create a `_config.local.yml` file at the root of the project directory and exclude all versions except the one that you want to preview.
114-
The following example will generate Magento 2.2 documentation only.
114+
115+
The following example will generate Magento 2.2 documentation only.
115116

116117
```yaml
117118
exclude:
@@ -138,7 +139,9 @@ The following example will generate Magento 2.2 documentation only.
138139
```
139140
$ rake preview
140141
```
142+
141143
This command:
144+
142145
* Checks your environment according to the dependencies in `Gemfile.lock`.
143146
* Removes the `_site/` directory, which contains previously generated preview files.
144147
* Generates a new preview and opens the landing page in a web browser.

_data/toc/javascript-developer-guide.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,9 @@ pages:
109109
- label: RowBuilder widget
110110
url: /javascript-dev-guide/widgets/widget-row-builder.html
111111

112+
- label: Sortable widget
113+
url: /javascript-dev-guide/widgets/widget-sortable.html
114+
112115
- label: Sticky widget
113116
url: /javascript-dev-guide/widgets/widget_sticky.html
114117

_includes/cache/page-cache-overview.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,3 @@ Reverse proxies serve "public" or shared content to more than one user. However,
3535
- **[Public]({{ page.baseurl }}/extension-dev-guide/cache/page-caching/public-content.html)** - Public content is stored server side in your reverse proxy cache storage (e.g., file system, database, Redis, or Varnish) and is available to multiple customers. Examples of public content include header, footer, and category listing.
3636

3737
- **[Private]({{ page.baseurl }}/extension-dev-guide/cache/page-caching/private-content.html)** - Private content is stored client side (e.g., browser) and is specific to an individual customer. Examples of private content include wishlist, shopping cart, customer name, and address. You should limit stored private content to a small portion of the page's total content.
38-
</div>

_includes/cloud/enable-ssh.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ If you have SSH keys, a directory listing is displayed similar to the following:
2828
If you do not have SSH keys, you need to generate the keys for adding to your Magento ECE account and GitHub account. See [Create a new SSH key pair](#ssh-create-new-key-pair).
2929

3030
If you already have SSH keys, continue to:
31+
3132
* [Add a public SSH key to your Magento account](#ssh-add-to-account) section
3233
* [Add your SSH key to your GitHub account](https://help.github.com/articles/adding-a-new-ssh-key-to-your-github-account/)
3334

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
{: .bs-callout-info}
2-
The following route configuration examples use route templates with placeholders. The `{default}` placeholder represents the default domain configured for your site. If your project has multiple domains, use the `{all}` placeholder instead to configure routing for the default domain and all aliases. See [Configure routes]({{ page.baseurl }}/cloud/project/project-conf-files_routes.html).
1+
{:.bs-callout-info}
2+
The following route configuration examples use route templates with placeholders. The `{default}` placeholder represents the default domain configured for your site. If your project has multiple domains, use the `{all}` placeholder to configure routing for the default domain and all aliases. See [Configure routes]({{ page.baseurl }}/cloud/project/project-conf-files_routes.html).

_includes/config/es-elasticsearch-magento.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ Unless you changed Elasticsearch server settings, the defaults should work. Skip
3030
|**Enable Elasticsearch HTTP Auth**|Click **Yes** only if you enabled authentication for your Elasticsearch server. If so, provide a username and password in the provided fields.|
3131

3232
{:start="4"}
33+
3334
1. Click **Test Connection**.
3435

3536
You will see either:
@@ -49,11 +50,11 @@ If so, try the following:
4950

5051
* Make sure the Elasticsearch server is running.
5152
* If the Elasticsearch server is on a different host from Magento, log in to the Magento server and ping the Elasticsearch host. Resolve network connectivity issues and test the connection again.
52-
* Examine the command window in which you started Elasticsearch for stack traces and exceptions. You must resolve those before you continue.
53-
In particular, make sure you started Elasticsearch as a user with `root` privileges.
53+
* Examine the command window in which you started Elasticsearch for stack traces and exceptions. You must resolve those before you continue. In particular, make sure you started Elasticsearch as a user with `root` privileges.
5454
* Make sure that [UNIX firewall and SELinux]({{ page.baseurl }}/config-guide/elasticsearch/es-overview.html#firewall-selinux) are both disabled, or set up rules to enable Elasticsearch and Magento to communicate with each other.
5555
* Verify the value of the **Elasticsearch Server Hostname** field. Make sure the server is available. You can try the server's IP address instead.
5656
* Use the command `netstat -an | grep **listen-port**` command to verify that the port specified in the **Elasticsearch Server Port** field is not being used by another process.
57+
5758
For example, to see if Elasticsearch is running on its default port, use the following command:
5859

5960
```bash

_includes/config/multi-site_verify.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Unless you have DNS set up for your stores' URLs, you must add a static route to
1414
You're done!
1515

1616
{:.bs-callout .bs-callout-info}
17+
1718
* Additional tasks might be required to deploy multiple websites in a hosted environment; check with your hosting provider for more information.
1819
* Additional tasks are required to set up {{site.data.var.ece}}; for more information, see [Set up multiple Cloud websites or stores]({{ page.baseurl }}/cloud/project/project-multi-sites.html)
1920

_includes/config/setup-cron.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@ Magento uses cron for two sets of tasks, and for each, cron can run with a diffe
55
* PHP command-line configuration: The general cron job that reindexes indexers, generates e-mails, generates the sitemap, and so on.
66

77
You can find the command-line configuration using the command `php --ini`.
8+
89
* Web server PHP plug-in configuration: Two other cron jobs are used by the [Component Manager and System Upgrade utilities]({{ page.baseurl }}/comp-mgr/bk-compman-upgrade-guide.html).
910

1011
You can find the web server plug-in configuration using [`phpinfo.php`]({{ page.baseurl }}/install-gde/prereq/optional.html#install-optional-phpinfo).
1112

1213
{:.bs-callout .bs-callout-warning}
14+
1315
* To avoid issues during installation and upgrade, we strongly recommend you apply the same PHP settings to both the PHP command-line configuration and to the PHP web server plug-in's configuration. For more information, see [Required PHP settings]({{ page.baseurl }}/install-gde/prereq/php-settings.html).
1416
* In a multi-node system, crontab can run on only one node. This applies to you only if you set up more than one webnode for reasons related to performance or scalability.
1517

0 commit comments

Comments
 (0)