Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit fcd4795

Browse files
author
Kevin Harper
committed
Merge branch 'develop' of https://github.com/magento/devdocs_internal into akril-performance
2 parents 474a33d + cb8fe39 commit fcd4795

File tree

1,163 files changed

+78406
-7846
lines changed

Some content is hidden

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

1,163 files changed

+78406
-7846
lines changed

Rakefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ task :check_links => :build do
4444
allow_hash_ref: true,
4545
alt_ignore: [/.*/],
4646
file_ignore: [/videos/, /swagger/, /guides\/m1x/, /search.html/, /404.html/, /codelinks/, /magento-third-party.html/, /magento-techbull.html/, /magento-release-notes.html/, /magento-release-information.html/, /index.html/, /template.html/, /magento-devdocs-whatsnew.html/],
47-
url_ignore: [/guides\/v2.3/],
47+
url_ignore: [/guides\/v2.0/],
4848
error_sort: :desc, # Sort by invalid link instead of affected file path (default). This makes it easier to see how many files the bad link affects.
49-
parallel: { :in_processes => 3 },
49+
parallel: { :in_processes => 6 },
5050
typhoeus: { :followlocation => true, :connecttimeout => 10, :timeout => 30 },
5151
hydra: { :max_concurrency => 50 },
5252
cache: { :timeframe => '30d' }

_config.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ algolia:
9696
api_key: 'd2d0f33ab73e291ef8d88d8b565e754c'
9797
lazy_update: false
9898
files_to_exclude:
99-
- guides/m1x
99+
- guides/m1x/**/*.html
100+
- guides/m1x/**/*.md
100101
- swagger
101102

102-
exclude: ['scss', 'bin', 'node_modules', 'vendor', '.git', '.idea', 'Rakefile' ]
103+
exclude: ['scss', 'bin', 'node_modules', 'vendor', '.git', '.idea', 'Rakefile' ]

_data/toc/cloud-guide.yml

Lines changed: 67 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ pages:
66
- label: Subscriptions and plans
77
url: cloud/basic-information/cloud-plans.html
88

9+
- label: Onboarding tasks
10+
url: cloud/onboarding/onboarding-tasks.html
11+
versions: ["2.1", "2.2", "2.3"]
12+
913
- label: Architecture
1014
url: cloud/architecture/cloud-architecture.html
1115
children:
@@ -27,12 +31,6 @@ pages:
2731
- label: Add Staging and Production to Pro projects UI
2832
url: cloud/trouble/pro-env-management.html
2933

30-
- label: Onboarding tasks
31-
url: cloud/onboarding/onboarding-tasks.html
32-
children:
33-
- label: Prepare project environments
34-
url: cloud/before/before-project-owner.html
35-
3634
- label: Technologies and requirements
3735
url: cloud/requirements/cloud-requirements.html
3836
children:
@@ -143,7 +141,7 @@ pages:
143141
- label: Custom extend Admin timeout VCL
144142
url: cloud/configure/fastly-vcl-extend-timeout.html
145143

146-
- label: Custom redirect to Wordpress VCL
144+
- label: Custom redirect to WordPress VCL
147145
url: cloud/configure/fastly-vcl-wordpress.html
148146

149147
- label: Custom block bad referer VCL
@@ -155,48 +153,78 @@ pages:
155153
- label: Configure environments
156154
url: cloud/env/environments.html
157155
children:
158-
- label: Configure .magento.app.yaml
156+
- label: Application
159157
url: cloud/project/project-conf-files_magento-app.html
160158

161-
- label: Manage build and deploy actions
159+
- label: Build and deploy
162160
url: cloud/project/magento-env-yaml.html
163161
versions: ["2.1","2.2","2.3"]
162+
children:
163+
- label: Set up notifications
164+
url: cloud/env/setup-notifications.html
165+
versions: ["2.1","2.2","2.3"]
164166

165-
- label: Configure services - services.yaml
166-
url: cloud/project/project-conf-files_services.html
167+
- label: Logging handlers
168+
url: cloud/env/log-handlers.html
169+
versions: ["2.1","2.2","2.3"]
167170

168-
- label: Set up MySQL service
169-
url: cloud/project/project-conf-files_services-mysql.html
171+
- label: Environment variables
172+
url: cloud/env/variables-intro.html
173+
children:
174+
- label: Application variables
175+
url: cloud/env/environment-vars_magento.html
170176

171-
- label: Set up Redis service
172-
url: cloud/project/project-conf-files_services-redis.html
177+
- label: Build variables
178+
url: cloud/env/variables-build.html
179+
versions: ["2.1","2.2","2.3"]
173180

174-
- label: Set up Solr service
175-
url: cloud/project/project-conf-files_services-solr.html
176-
versions: ["2.0"]
181+
- label: Cloud variables
182+
url: cloud/env/variables-cloud.html
183+
versions: ["2.1","2.2","2.3"]
177184

178-
- label: Set up Elasticsearch service
179-
url: cloud/project/project-conf-files_services-elastic.html
180-
versions: ["2.1","2.2","2.3"]
185+
- label: Deploy variables
186+
url: cloud/env/variables-deploy.html
187+
versions: ["2.1","2.2","2.3"]
181188

182-
- label: Set up RabbitMQ service
183-
url: cloud/project/project-conf-files_services-rabbit.html
189+
- label: Post-deploy variables
190+
url: cloud/env/variables-post-deploy.html
191+
versions: ["2.1","2.2","2.3"]
184192

185-
- label: Set up notifications
186-
url: cloud/env/setup-notifications.html
187-
versions: ["2.1","2.2","2.3"]
193+
- label: Working with variables
194+
url: cloud/env/working-with-variables.html
195+
versions: ["2.1","2.2","2.3"]
188196

189-
- label: Configure routes - routes.yaml
197+
- label: Routes
190198
url: cloud/project/project-conf-files_routes.html
199+
children:
200+
- label: Caching
201+
url: cloud/project/project-routes-more-cache.html
202+
203+
- label: Redirects
204+
url: cloud/project/project-routes-more-redir.html
205+
206+
- label: Server side includes
207+
url: cloud/project/project-routes-more-ssi.html
208+
209+
- label: Services
210+
url: cloud/project/project-conf-files_services.html
211+
children:
212+
- label: Set up MySQL service
213+
url: cloud/project/project-conf-files_services-mysql.html
214+
215+
- label: Set up Redis service
216+
url: cloud/project/project-conf-files_services-redis.html
191217

192-
- label: Caching
193-
url: cloud/project/project-routes-more-cache.html
218+
- label: Set up Solr service
219+
url: cloud/project/project-conf-files_services-solr.html
220+
versions: ["2.0"]
194221

195-
- label: Redirects
196-
url: cloud/project/project-routes-more-redir.html
222+
- label: Set up Elasticsearch service
223+
url: cloud/project/project-conf-files_services-elastic.html
224+
versions: ["2.1","2.2","2.3"]
197225

198-
- label: Server side includes
199-
url: cloud/project/project-routes-more-ssi.html
226+
- label: Set up RabbitMQ service
227+
url: cloud/project/project-conf-files_services-rabbit.html
200228

201229
- label: Configuration management for store settings
202230
url: cloud/live/sens-data-over.html
@@ -227,19 +255,6 @@ pages:
227255
- label: Snapshots and backup management
228256
url: cloud/project/project-webint-snap.html
229257

230-
- label: Manage variables
231-
url: cloud/env/environment-vars_over.html
232-
children:
233-
234-
- label: Magento application environment variables
235-
url: cloud/env/environment-vars_magento.html
236-
237-
- label: Magento Commerce (Cloud) environment variables
238-
url: cloud/env/environment-vars_cloud.html
239-
240-
- label: Working with variables
241-
url: cloud/env/working-with-variables.html
242-
243258
- label: Deploy your store
244259
url: cloud/live/stage-prod-live.html
245260
children:
@@ -327,23 +342,16 @@ pages:
327342
- label: Upgrades and Patches
328343
url: cloud/project/project-upgrade-parent.html
329344
children:
330-
- label: Upgrade Magento Commerce (Cloud)
331-
url: cloud/project/project-upgrade.html
345+
- label: Patch Cloud tools
346+
url: cloud/composer-packages/ece-tools.html
347+
versions: ["2.1","2.2","2.3"]
332348

333349
- label: Patch Magento Commerce (Cloud)
334350
url: cloud/project/project-patch.html
335351

352+
- label: Upgrade Magento Commerce (Cloud)
353+
url: cloud/project/project-upgrade.html
354+
336355
- label: Upgrade from 2.0.4 (Cloud)
337356
url: cloud/upgrade/upgrade-from-2-0-4.html
338357
versions: ["2.0"]
339-
340-
- label: Composer package updates
341-
url: cloud/composer-packages/patch-notes.html
342-
versions: ["2.1","2.2","2.3"]
343-
children:
344-
- label: vendor/magento/ece-patches
345-
url: cloud/composer-packages/ece-patches.html
346-
versions: ["2.2","2.3"]
347-
348-
- label: vendor/magento/ece-tools
349-
url: cloud/composer-packages/ece-tools.html

_data/toc/graphql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pages:
1515
- label: Development
1616
children:
1717
- label: Configure the GraphQL schema for a module
18-
url: graphql/develop/configure-graphql-xml.html
18+
url: graphql/develop/create-graphqls-file.html
1919

2020
- label: Resolvers
2121
url: graphql/develop/resolvers.html

_data/toc/installation-guide.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -299,11 +299,7 @@ pages:
299299
- label: Troubleshooting
300300
children:
301301

302-
- label: Troubleshooting suggestions
303-
url: install-gde/trouble/tshoot.html
304-
305302
- label: Access issues
306-
url: install-gde/trouble/php/tshoot_access-main.html
307303
children:
308304

309305
- label: Cannot access Magento software in a web browser
@@ -328,7 +324,6 @@ pages:
328324
url: install-gde/trouble/tshoot_admin.html
329325

330326
- label: Errors during installation
331-
url: install-gde/trouble/php/tshoot_install-main.html
332327
children:
333328

334329
- label: Installation stops at about 70%
@@ -362,7 +357,6 @@ pages:
362357
url: install-gde/trouble/php/tshoot_xdebug.html
363358

364359
- label: Readiness check issues
365-
url: install-gde/trouble/readiness/tshoot_rc_main.html
366360
children:
367361

368362
- label: Component dependency readiness issues
@@ -378,7 +372,6 @@ pages:
378372
url: install-gde/trouble/readiness/tshoot_rc_php.html
379373

380374
- label: GitHub errors
381-
url: install-gde/trouble/git/tshoot_git-main.html
382375
children:
383376

384377
- label: Cannot clone the Magento GitHub repository
@@ -388,7 +381,6 @@ pages:
388381
url: install-gde/trouble/git/tshoot_git-pull-origin.html
389382

390383
- label: PHP errors
391-
url: install-gde/trouble/php/tshoot_php-main.html
392384
children:
393385

394386
- label: Resolve an illegal offset error
@@ -404,7 +396,6 @@ pages:
404396
url: install-gde/trouble/php/tshoot_php-date.html
405397

406398
- label: Other issues
407-
url: install-gde/trouble/tshoot_other.html
408399
children:
409400

410401
- label: Known issues that affect installation
@@ -422,9 +413,6 @@ pages:
422413
- label: Cannot run 'composer install'
423414
url: install-gde/trouble/tshoot_composer-install.html
424415

425-
- label: Installation roadmap (reference)
426-
url: install-gde/install-roadmap_trouble.html
427-
428416
- label: How Tos
429417
children:
430418
- label: Modify docroot to improve security

_data/toc/magento-functional-testing-framework-guide.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ pages:
4141
- label: Data
4242
url: magento-functional-testing-framework/release-2/data.html
4343

44+
- label: Metadata
45+
url: magento-functional-testing-framework/release-2/metadata.html
46+
4447
- label: Merging
4548
url: magento-functional-testing-framework/release-2/merging.html
4649

_data/toc/migration-guide.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ pages:
3232
- label: Configure migration
3333
url: migration/migration-tool-configure.html
3434

35+
- label: Extend the tool
36+
url: migration/extend-the-tool.html
37+
3538
- label: Migrate using Data Migration Tool
3639
url: migration/migration-migrate.html
3740
children:

_data/toc/release-notes.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -309,14 +309,14 @@ pages:
309309
url: release-notes/ReleaseNotes2.1_RC1EE.html
310310

311311
- label: Backward incompatible changes
312-
url: release-notes/backward-incompatible-changes.html
312+
url: release-notes/backward-incompatible-changes/index.html
313313
children:
314314

315315
- label: Magento Open Source changes
316-
url: release-notes/changes/ce_changes.html
316+
url: release-notes/backward-incompatible-changes/open-source.html
317317

318318
- label: Magento Commerce changes
319-
url: release-notes/changes/ee_changes.html
319+
url: release-notes/backward-incompatible-changes/commerce.html
320320

321321
- label: Magento Commerce for B2B changes
322322
url: release-notes/changes/b2b_changes.html

0 commit comments

Comments
 (0)