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

Commit 7130c03

Browse files
authored
Merge branch 'master' into hard-tabs-guides-cloud
2 parents 6a9dbaa + f157459 commit 7130c03

File tree

190 files changed

+3724
-1855
lines changed

Some content is hidden

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

190 files changed

+3724
-1855
lines changed

_data/toc/javascript-developer-guide.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,9 @@ pages:
106106
- label: RedirectUrl widget
107107
url: /javascript-dev-guide/widgets/widget_redirectUrl.html
108108

109+
- label: RemainingCharacters widget
110+
url: /javascript-dev-guide/widgets/widget-remaining-characters.html
111+
109112
- label: RowBuilder widget
110113
url: /javascript-dev-guide/widgets/widget-row-builder.html
111114

_data/whats-new.yml

Lines changed: 57 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,64 @@ 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 Sep 9 16:43:06 2019
7+
updated: Tue Sep 24 09:26:19 2019
88
entries:
9+
- description: Added example [introspection queries](https://devdocs.magento.com/guides/v2.3/graphql/queries.html)
10+
to the _GraphQL Developer Guide_.
11+
versions: 2.3.x
12+
type: Major update
13+
date: September 20, 2019
14+
link: https://github.com/magento/devdocs/pull/5438
15+
- description: Added options and methods to the [Multiselect Widget](https://devdocs.magento.com/guides/v2.3/javascript-dev-guide/widgets/widget-multiselect.html)
16+
topic in the _JavaScript Developer Guide_.
17+
versions: 2.2.x, 2.3.x
18+
type: Major update
19+
date: September 19, 2019
20+
link: https://github.com/magento/devdocs/pull/5354
21+
- description: Updated the [Add site map and search engine robots](https://devdocs.magento.com/guides/v2.3/cloud/trouble/robots-sitemap.html)
22+
topic in the _Cloud Guide_ with a VCL snippet example to create a typical domain redirect for `robots.txt`
23+
and `sitemap.xml` files.
24+
versions: 2.2.x, 2.3.x
25+
type: Major update
26+
date: September 19, 2019
27+
link: https://github.com/magento/devdocs/pull/5330
28+
- description: Added the [Sortable Widget](https://devdocs.magento.com/guides/v2.3/javascript-dev-guide/widgets/widget-sortable.html)
29+
topic to the _JavaScript Developer Guide_.
30+
versions: 2.2.x, 2.3.x
31+
type: New topic
32+
date: September 18, 2019
33+
link: https://github.com/magento/devdocs/pull/5358
34+
- description: Added a [Symbolic links](https://github.com/magento/devdocs/blob/master/.github/CONTRIBUTING.md#symbolic-links) section to the _Contribution Guide_.
35+
versions: ''
36+
type: Major update
37+
date: September 18, 2019
38+
link: https://github.com/magento/devdocs/pull/5357
39+
- description: Added the [Sticky widget](http://devdocs.magento.com/guides/v2.3/javascript-dev-guide/widgets/widget_sticky.html)
40+
topic to the _Javascript Developer Guide_.
41+
versions: 2.2.x, 2.3.x
42+
type: New topic
43+
date: September 17, 2019
44+
link: https://github.com/magento/devdocs/pull/5371
45+
- description: Added the [Media Uploader widget](https://devdocs.magento.com/guides/v2.3/javascript-dev-guide/widgets/widget-media-uploader.html)
46+
topic to the _JavaScript Developer Guide_.
47+
versions: 2.2.x, 2.3.x
48+
type: New topic
49+
date: September 17, 2019
50+
link: https://github.com/magento/devdocs/pull/5360
51+
- description: Added the [Log locations topic](https://devdocs.magento.com/guides/v2.3/cloud/project/log-locations.html)
52+
to the _Cloud Guide_.
53+
versions: 2.x
54+
type: New topic
55+
date: September 13, 2019
56+
link: https://github.com/magento/devdocs/pull/5351
57+
- description: Updated information about using LESS with Grunt in the [Compile LESS using
58+
Grunt](https://devdocs.magento.com/guides/v2.3/frontend-dev-guide/css-topics/css_debug.html)
59+
and [Using Grunt for Magento tasks](https://devdocs.magento.com/guides/v2.3/frontend-dev-guide/tools/using_grunt.html)
60+
topics.
61+
versions: 2.2.x, 2.3.x
62+
type: Major update
63+
date: September 10, 2019
64+
link: https://github.com/magento/devdocs/pull/5343
965
- description: Added an example of the `escapeCss` function to the [Templates XSS
1066
security](https://devdocs.magento.com/guides/v2.2/frontend-dev-guide/templates/template-security.html)
1167
topic.

_includes/cloud/backup-db.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
We recommend creating a backup of your project before an upgrade. Use the following steps to back up your Integration, Staging, and Production environments.
22

3-
#### To back up your Integration environment database and code:
3+
{:.procedure}
4+
To back up your Integration environment database and code:
45

56
1. Create a local backup of the remote database.
67

@@ -16,7 +17,8 @@ We recommend creating a backup of your project before an upgrade. Use the follow
1617

1718
Optionally, you can omit `[--media]` if you have a large number of static files that are already in source control.
1819

19-
#### To back up your Staging or Production environment database before deploying:
20+
{:.procedure}
21+
To back up your Staging or Production environment database before deploying:
2022

2123
1. Use SSH to log in to the remote server.
2224

_includes/cloud/composer-name.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
This section discusses how to get a module's Composer name and its version from Magento Marketplace. Alternatively, you can find the name and version of *any* module (whether or not you purchased it on Marketplace) in the module's `composer.json` file. Open `composer.json` in a text editor and write down the values of `"name"` and `"version"`.
22

3-
#### To get the module's Composer name from Magento Marketplace:
3+
{:.procedure}
4+
To get the module's Composer name from Magento Marketplace:
45

56
1. Log in to [Magento Marketplace](https://marketplace.magento.com) with the username and password you used to purchase the component.
67
2. In the upper right corner, click **<your username>** > **My Account** as the following figure shows.

_includes/cloud/enable-ssh.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ If you already have SSH keys, continue to:
3636

3737
Use the `ssh-keygen` command to create an SSH key pair. `ssh-keygen` is typically installed on Linux systems.
3838

39-
#### To create an SSH key pair:
39+
{:.procedure}
40+
To create an SSH key pair:
4041

4142
1. The command syntax follows, entering the email used for your GitHub account:
4243

_includes/cloud/sens-data-create-config-local.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#### To create and transfer `config.local.php`:
1+
{:.procedure}
2+
To create and transfer `config.local.php`:
23

34
1. On your local workstation, find the integration server SSH URL.
45

_includes/config/install-java.md

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
To determine if Java is already installed, enter the following command:
44

5-
java -version
5+
```bash
6+
java -version
7+
```
68

79
If the message `java: command not found` displays, you must install the Java SDK as discussed in the next section.
810

@@ -17,7 +19,9 @@ See [this article on digitalocean](https://www.digitalocean.com/community/tutori
1719

1820
Be sure to install the JDK and *not* the JRE.
1921

20-
yum -y install java-1.7.0-openjdk
22+
```bash
23+
yum -y install java-1.7.0-openjdk
24+
```
2125

2226
{:.bs-callout .bs-callout-info}
2327
Java version 7 might not be available for all operating systems. For example, you can [search the list of available packages for Ubuntu](http://packages.ubuntu.com/).
@@ -26,8 +30,16 @@ Java version 7 might not be available for all operating systems. For example, yo
2630

2731
To install JDK 1.8 on Ubuntu, enter the following commands as a user with `root` privileges:
2832

29-
add-apt-repository -y ppa:webupd8team/java
30-
apt-get -y update
31-
apt-get install -y oracle-java8-installer
33+
```bash
34+
add-apt-repository -y ppa:webupd8team/java
35+
```
36+
37+
```bash
38+
apt-get -y update
39+
```
40+
41+
```bash
42+
apt-get install -y oracle-java8-installer
43+
```
3244

3345
For other options, see [Oracle documentation](https://docs.oracle.com/javase/8/docs/technotes/guides/install/install_overview.html).

_includes/config/install-java8.md

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
To determine if Java is already installed, enter the following command:
44

5-
java -version
5+
```bash
6+
java -version
7+
```
68

79
If the message `java: command not found` displays, you must install the Java SDK as discussed in the next section.
810

@@ -17,7 +19,9 @@ See [this article on digitalocean](https://www.digitalocean.com/community/tutori
1719

1820
Be sure to install the JDK and *not* the JRE.
1921

20-
yum -y install java-1.8.0-openjdk
22+
```bash
23+
yum -y install java-1.8.0-openjdk
24+
```
2125

2226
{:.bs-callout .bs-callout-info}
2327
Java version 8 might not be available for all operating systems. For example, you can [search the list of available packages for Ubuntu](http://packages.ubuntu.com/).
@@ -26,8 +30,16 @@ Java version 8 might not be available for all operating systems. For example, yo
2630

2731
To install JDK 1.8 on Ubuntu, enter the following commands as a user with `root` privileges:
2832

29-
add-apt-repository -y ppa:webupd8team/java
30-
apt-get -y update
31-
apt-get install -y oracle-java8-installer
33+
```bash
34+
add-apt-repository -y ppa:webupd8team/java
35+
```
36+
37+
```bash
38+
apt-get -y update
39+
```
40+
41+
```bash
42+
apt-get install -y oracle-java8-installer
43+
```
3244

3345
For other options, see [Oracle documentation](https://docs.oracle.com/javase/8/docs/technotes/guides/install/install_overview.html).

_includes/config/redis-verify.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ To verify that Redis and Magento are working together, use the following command
44

55
In a command prompt on the server on which Redis is running, enter:
66

7-
redis-cli monitor
7+
```bash
8+
redis-cli monitor
9+
```
810

911
Refresh your storefront page and you'll see output similar to the following.
1012

@@ -52,7 +54,9 @@ If you use Redis for page caching, you'll see output similar to the following:
5254

5355
Enter the following command:
5456

55-
redis-cli ping
57+
```bash
58+
redis-cli ping
59+
```
5660

5761
`PONG` should be the response.
5862

_includes/config/secure-ws-apache_step1.md

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,12 @@ First, see if you have the Apache `htpasswd` utility is installed as follows:
66

77
1. Enter the following command to determine if `htpasswd` is already installed:
88

9-
which htpasswd
9+
```bash
10+
which htpasswd
11+
```
12+
13+
If a path displays, it is installed; if the command returns no output, `htpasswd` is not installed.
1014

11-
If a path displays, it is installed; if the command returns no output, `htpasswd` is not installed.
1215
2. If necessary, install `htpasswd`:
1316

1417
* Ubuntu: `apt-get -y install apache2-utils`
@@ -18,8 +21,13 @@ First, see if you have the Apache `htpasswd` utility is installed as follows:
1821

1922
Enter the following commands as a user with `root` privileges:
2023

21-
mkdir -p /usr/local/apache/password
22-
htpasswd -c /usr/local/apache/password/.<password file name> <username>
24+
```bash
25+
mkdir -p /usr/local/apache/password
26+
```
27+
28+
```bash
29+
htpasswd -c /usr/local/apache/password/.<password file name> <username>
30+
```
2331

2432
where
2533

@@ -39,17 +47,29 @@ Follow the prompts on your screen to create a password for the user.
3947
**Example 1: cron**
4048
You must set up authentication for only one user for cron; in this example, we use the web server user. To create a password file for the web server user, enter the following commands:
4149

42-
mkdir -p /usr/local/apache/password
43-
htpasswd -c /usr/local/apache/password/.htpasswd apache
50+
```bash
51+
mkdir -p /usr/local/apache/password
52+
```
53+
54+
```bash
55+
htpasswd -c /usr/local/apache/password/.htpasswd apache
56+
```
4457

4558
**Example 2: Elasticsearch**
4659
You must set up authentication for two users: one with access to nginx and one with access to Elasticsearch. To create password files for these users, enter the following commands:
4760

48-
mkdir -p /usr/local/apache/password
49-
htpasswd -c /usr/local/apache/password/.htpasswd_elasticsearch magento_elasticsearch
61+
```bash
62+
mkdir -p /usr/local/apache/password
63+
```
64+
65+
```bash
66+
htpasswd -c /usr/local/apache/password/.htpasswd_elasticsearch magento_elasticsearch
67+
```
5068

5169
#### Add additional users
5270

5371
To add another user to your password file, enter the following command as a user with `root` privileges:
5472

55-
htpasswd /usr/local/apache/password/.htpasswd <username>
73+
```bash
74+
htpasswd /usr/local/apache/password/.htpasswd <username>
75+
```

0 commit comments

Comments
 (0)