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

Commit b3f4fdf

Browse files
Merge pull request #3 from magento/master
Update Devdoc
2 parents f80e422 + 5261639 commit b3f4fdf

File tree

4,039 files changed

+81890
-310850
lines changed

Some content is hidden

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

4,039 files changed

+81890
-310850
lines changed

.github/CONTRIBUTING.md

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,16 @@ If you write and contribute a full topic, we will add your name (or your company
3030
1. Create a new branch on your fork. Use a name that best describes the work, or references a GitHub issue number.
3131
1. Edit or create markdown (`.md`) files in your branch.
3232
1. When ready, push your branch to your fork.
33-
1. Create a PR to the [magento/devdocs repo](https://github.com/magento/devdocs). Fill out as much info as possible and link any GitHub issues.
3433

35-
In general, you should use `master` as the base branch when creating a PR. If your contribution is related to a release that is in progress, use a version-specific integration branch, like `2.3.1-integration`.
34+
### Create a pull request
35+
36+
Create a PR to the [magento/devdocs repository](https://github.com/magento/devdocs). Fill out as much information as possible and link any GitHub issues.
37+
38+
In general, you should use `master` as the base branch when creating a PR. If your contribution is related to a release that is in progress, use a version-specific integration branch, such as `develop`.
39+
40+
Provide links to devdocs for the files you are changing. This is not required if the list is long.
41+
42+
If you are updating an example from source code, include a link to the file in the repository.
3643

3744
The DevDocs team and Maintainers will review the PR and help with formatting and navigation.
3845

@@ -42,34 +49,34 @@ The DevDocs team and Maintainers will review the PR and help with formatting and
4249

4350
## Contribution guidelines
4451

45-
Write content using [Kramdown](https://kramdown.gettalong.org/), which is a simple markup language. We use Kramdown, Liquid, and [Jekyll](https://jekyllrb.com/) to generate a static site hosted through [GH Pages](https://help.github.com/articles/what-is-github-pages/). Check [Templates](#templates) for examples of styles and markdown.
52+
Write content using [kramdown](https://kramdown.gettalong.org/), which is a simple markup language. We use kramdown, Liquid, and [Jekyll](https://jekyllrb.com/) to generate a static site hosted through [GH Pages](https://help.github.com/articles/what-is-github-pages/). Check [Templates](#templates) for examples of styles and markdown.
4653

4754
You can update existing or add new topics in their respective Magento 2 versioned directories (2.1, 2.2, 2.3, and onward). If you need help finding a directory for your content, we can help in your PR.
4855

4956
The following guidelines may answer most of your questions and help you get started:
5057

51-
1. Check [existing pull requests](https://github.com/magento/devdocs/pulls) and make sure you are not duplicating work!
52-
1. For large contributions or changes that include multiple files, [open an issue](#report-an-issue) and discuss it with us first. This may further prevent duplicate or unnecessary effort.
53-
1. [Chunk many small/medium changes](#tips-for-writing-content) into one or two PRs. This helps us to efficiently and effectively facilitate your contribution.
54-
1. Familiarize yourself with the existing documentation. Look through and search the guides to decide where to add your topics.
58+
1. Check [existing pull requests](https://github.com/magento/devdocs/pulls) and make sure you are not duplicating work!
59+
1. For large contributions or changes that include multiple files, [open an issue](#report-an-issue) and discuss it with us first. This may further prevent duplicate or unnecessary effort.
60+
1. [Chunk many small/medium changes](#tips-for-writing-content) into one or two PRs. This helps us to efficiently and effectively facilitate your contribution.
61+
1. Familiarize yourself with the existing documentation. Look through and search the guides to decide where to add your topics.
5562

56-
- The DevDocs team can find the best home for your new topics and add it to the navigation.
57-
- If a topic has a symlink, you can remove it with Git commands and add a new file. Copy and paste a previous version of the topic to get started.
63+
- The DevDocs team can find the best home for your new topics and add it to the navigation.
64+
- If a topic has a symlink, you can remove it with Git commands and add a new file. Copy and paste a previous version of the topic to get started.
5865

5966
## Tips for writing content
6067

6168
Focus on the content with useful information, code samples, and important notes for your fellow Magento developers and community members. Don't forget to review your work for typos, formatting errors, or sentences that need clarifying before opening a pull request.
6269

6370
Use the following guidelines to help you with the writing process:
6471

65-
- Define the goal of your topic. What exactly do you want to teach the reader?
66-
- Make the title of your topic reflect the content.
67-
- Keep your sentences concise and try to separate conceptual information from procedural steps.
68-
- Batch several small changes into a single pull request (instead of separate ones) to ensure your contributions get approved and merged quickly. Have several typo fixes across several areas of documentation? Batch them into on PR.
69-
- Remember to use active voice (not passive), write in the present tense, and use a friendly tone in second person. For example, _"The log captures commands, output..."_.
70-
- Use notes to alert readers about important details.
71-
- Use cross-references to other topics if appropriate. We can help you with the syntax if it is not clear. The template provides an example you can use.
72-
- Need help with markdown? See our [templates](#templates).
72+
- Define the goal of your topic. What exactly do you want to teach the reader?
73+
- Make the title of your topic reflect the content.
74+
- Keep your sentences concise. Separate conceptual information from procedural steps.
75+
- Batch several small changes into a single pull request (instead of separate ones) to ensure your contributions get approved and merged quickly. Have several typo fixes across several areas of documentation? Batch them into one PR.
76+
- Remember to use active voice (not passive), write in the present tense, and use a friendly tone in second person. For example, _"The log captures commands, output..."_.
77+
- Use notes to alert readers about important details.
78+
- Use cross-references to other topics if appropriate. We can help you with the syntax if it is not clear. The template provides an example you can use.
79+
- Need help with markdown? See our [templates](#templates).
7380

7481
### Preview your work on local
7582

@@ -111,6 +118,7 @@ Enter as much information as you can including content corrections, steps to rep
111118
**Note:** Check the [existing issues](https://github.com/magento/devdocs/issues) on GitHub to see if someone has already reported the issue.
112119

113120
You have a couple of options to enter an issue:
121+
114122
- Have general feedback? Create an issue on [GitHub DevDocs](https://github.com/magento/devdocs/issues/new/choose).
115123
- Have feedback on a specific DevDocs page? Click the **Give us feedback** link at the top right of the page to report on the currently open topic.
116124

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,26 @@
1-
## This PR is a:
1+
## Purpose of this PR
22

3-
- [ ] New topic
4-
- [ ] Content update
5-
- [ ] Content fix or rewrite
6-
- [ ] Bug fix or improvement
3+
<!-- REQUIRED Describe the goal and the type of changes this PR covers. -->
74

8-
## Summary
5+
This PR ...
96

10-
When this pull request is merged, it will...
7+
## Affected URLs
118

12-
<!-- (REQUIRED) What does this PR change? -->
13-
14-
## Additional information
15-
16-
List all affected URLs
9+
<!-- REQUIRED List the URLs you are changing. Not needed for large numbers of files. -->
1710

1811
- ...
1912
- ...
2013

21-
<!-- (REQUIRED) The Url that this PR will modify -->
22-
23-
<!-- (OPTIONAL) What other information can you provide about this PR? -->
14+
## Links to source code
2415

25-
<!--
26-
Thank you for your contribution!
16+
<!-- REMOVE THIS SECTION IF NOT USED. If this PR references a file in a Magento codebase repository, add it here. -->
2717

28-
Before submitting this pull request, please make sure you have read our Contribution Guidelines and your PR meets our contribution standards:
29-
https://github.com/magento/devdocs/blob/master/.github/CONTRIBUTING.md
30-
31-
Please fill out as much information as you can about your PR to help speed up the review process.
32-
If your PR addresses an existing GitHub Issue, please refer to it in the title or Additional Information section to make the connection.
18+
- ...
19+
- ...
3320

34-
We may ask you for changes in your PR in order to meet the standards set in our Contribution Guidelines. PR's that do not comply with our guidelines may be closed at the maintainers' discretion.
21+
<!--
22+
If you are fixing a Github issue, note it in the following format and the issue will automatically close when this PR is merged:
23+
Fixes #<IssueNumber>
3524
36-
Feel free to remove this section before creating this PR.
25+
`master` is the default branch. PRs to this branch should be for current devdocs content. Merged PRs to master go live on the site automatically. Work for future releases generally goes in the `develop` branch. Work with the devdocs team if you are unsure where to submit your PR.
3726
-->

.gitignore

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,22 @@
1919
!/_config.stage.yml
2020

2121
*.bat
22-
*.sh
2322
/tmp/
24-
!/**/samples/*.sh
2523
/vendor/
2624
/node_modules/
2725

2826
_algolia_api_key
27+
28+
# Docs from different repositories #
29+
###################################
30+
31+
/mbi/
32+
/page-builder/
33+
/page-builder-migration/
34+
/guides/m1x/
35+
/mftf/
36+
37+
# Docs from different branches #
38+
###################################
39+
40+
/guides/v2.0/

Gemfile.lock

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
GIT
22
remote: https://github.com/magento-devdocs/devdocs-theme.git
3-
revision: 1ce56765123d6c552ae1c251a0df924971269f89
3+
revision: 7a7f3798c51e6d9ea0fe2d419a13d945ed1406d8
44
specs:
55
devdocs (0.0.1)
66
jekyll (~> 3.3)
77

88
GEM
99
remote: https://rubygems.org/
1010
specs:
11-
activesupport (5.2.2)
11+
activesupport (5.2.3)
1212
concurrent-ruby (~> 1.0, >= 1.0.2)
1313
i18n (>= 0.7, < 2)
1414
minitest (~> 5.1)
@@ -23,7 +23,7 @@ GEM
2323
json (>= 1.5.1)
2424
colorator (1.1.0)
2525
colorize (0.8.1)
26-
concurrent-ruby (1.1.4)
26+
concurrent-ruby (1.1.5)
2727
em-websocket (0.5.1)
2828
eventmachine (>= 0.12.9)
2929
http_parser.rb (~> 0.6.0)
@@ -70,23 +70,23 @@ GEM
7070
verbal_expressions (~> 0.1.5)
7171
jekyll-optional-front-matter (0.3.0)
7272
jekyll (~> 3.0)
73-
jekyll-redirect-from (0.14.0)
74-
jekyll (~> 3.3)
73+
jekyll-redirect-from (0.15.0)
74+
jekyll (>= 3.3, < 5.0)
7575
jekyll-relative-links (0.6.0)
7676
jekyll (~> 3.3)
7777
jekyll-sass-converter (1.5.2)
7878
sass (~> 3.4)
79-
jekyll-sitemap (1.2.0)
80-
jekyll (~> 3.3)
79+
jekyll-sitemap (1.3.1)
80+
jekyll (>= 3.7, < 5.0)
8181
jekyll-titles-from-headings (0.5.1)
8282
jekyll (~> 3.3)
83-
jekyll-watch (2.1.2)
83+
jekyll-watch (2.2.1)
8484
listen (~> 3.0)
85-
json (2.1.0)
85+
json (2.2.0)
8686
kramdown (1.17.0)
8787
launchy (2.4.3)
8888
addressable (~> 2.3)
89-
liquid (4.0.1)
89+
liquid (4.0.3)
9090
listen (3.1.5)
9191
rb-fsevent (~> 0.9, >= 0.9.4)
9292
rb-inotify (~> 0.9, >= 0.9.7)
@@ -96,7 +96,7 @@ GEM
9696
minitest (5.11.3)
9797
nokogiri (1.8.5)
9898
mini_portile2 (~> 2.3.0)
99-
parallel (1.13.0)
99+
parallel (1.17.0)
100100
pathutil (0.16.2)
101101
forwardable-extended (~> 2.6)
102102
progressbar (1.10.0)
@@ -106,7 +106,7 @@ GEM
106106
ffi (~> 1.0)
107107
rouge (3.3.0)
108108
ruby_dep (1.5.0)
109-
safe_yaml (1.0.4)
109+
safe_yaml (1.0.5)
110110
sass (3.7.3)
111111
sass-listen (~> 4.0.0)
112112
sass-listen (4.0.0)
@@ -118,7 +118,7 @@ GEM
118118
tzinfo (1.2.5)
119119
thread_safe (~> 0.1)
120120
verbal_expressions (0.1.5)
121-
yell (2.0.7)
121+
yell (2.1.0)
122122

123123
PLATFORMS
124124
ruby
@@ -136,4 +136,4 @@ DEPENDENCIES
136136
launchy
137137

138138
BUNDLED WITH
139-
1.17.3
139+
1.17.2

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ $ ruby -v
3838
$ brew install ruby
3939
```
4040

41-
**Unix, Windows and other OS users**
41+
**Unix, Windows, and other OS users**
4242

4343
See the [Ruby site](https://www.ruby-lang.org/en/documentation/installation) for instructions.
4444

@@ -142,7 +142,7 @@ The following example will generate Magento 2.2 documentation only.
142142
This command:
143143
* Checks your environment according to the dependencies in `Gemfile.lock`.
144144
* Removes the `_site/` directory, which contains previously generated preview files.
145-
* Generates a new preview and opens the landing page in a web browsers.
145+
* Generates a new preview and opens the landing page in a web browser.
146146

147147
If you don't have the `_config.local.yml` file at the root of your `devdocs/` directory, the rake will generate all versions of the documentation.
148148

@@ -154,11 +154,11 @@ You can deploy the devdocs site locally using [this Vagrant project](https://git
154154

155155
If you have questions, open an issue and ask us. We're looking forward to hearing from you!
156156

157-
* <a href="https://twitter.com/MagentoDevDocs" class="twitter-follow-button" data-show-count="false">Follow @MagentoDevDocs</a>
157+
* <a href="https://twitter.com/MagentoDevDocs" class="twitter-follow-button" data-show-count="false">Follow @MagentoDevDocs</a>
158158

159-
* <a href="mailto:[email protected]">E-mail us</a>
159+
* <a href="mailto:[email protected]">E-mail us</a>
160160

161-
* <a href="https://devdocs.magento.com">Visit our documentation site</a>, built using [GitHub pages](https://pages.github.com/).
161+
* <a href="https://devdocs.magento.com">Visit our documentation site</a>, built using [GitHub pages](https://pages.github.com/).
162162

163163
## Build DevDocs in Windows
164164

Rakefile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ require 'launchy'
1212
require 'colorator'
1313

1414
# Load ruby files with helper methods from the 'rakelib/' directory
15-
require_relative 'rakelib/link-checker.rb'
16-
require_relative 'rakelib/converter.rb'
17-
require_relative 'rakelib/double-slash-check.rb'
15+
require_relative 'rakelib/lib/link-checker.rb'
16+
require_relative 'rakelib/lib/converter.rb'
17+
require_relative 'rakelib/lib/double-slash-check.rb'
1818

1919
desc "Same as 'rake', 'rake preview'"
2020
task default: %w[preview]
@@ -56,3 +56,6 @@ task build: %w[clean] do
5656
sh 'bundle exec jekyll build --verbose --trace'
5757
puts 'Built!'.green
5858
end
59+
60+
desc 'Pull docs from external repositories'
61+
task init: %w[multirepo:init]

_checks/html-check-hook.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#
77
require 'html-proofer'
88
require 'yaml'
9-
require_relative '../rakelib/double-slash-check.rb'
9+
require_relative '../rakelib/lib/double-slash-check.rb'
1010

1111
Jekyll::Hooks.register :site, :post_write do |site|
1212
# Do nothing unless 'site.check_links' is set

_config.yml

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,29 +64,29 @@ defaults:
6464
values:
6565
layout: video
6666

67-
-
67+
-
6868
scope:
69-
path: mftf/2.2
69+
path: mbi
7070
values:
71-
group: magento-functional-testing-framework-guide
72-
functional_areas:
73-
- Test
71+
group: mbi
72+
github_files: https://github.com/magento/devdocs-mbi/blob/master/
73+
github_repo: https://github.com/magento/devdocs-mbi/
7474

7575
-
7676
scope:
77-
path: mftf/2.3
77+
path: mftf/docs
7878
values:
79-
group: magento-functional-testing-framework-guide-2_3
79+
group: mftf
80+
github_files: https://github.com/magento/magento2-functional-testing-framework/blob/develop/
81+
github_repo: https://github.com/magento/magento2-functional-testing-framework/
8082
functional_areas:
8183
- Test
8284

8385
-
8486
scope:
8587
path: page-builder
8688
values:
87-
layout: default
8889
group: page-builder
89-
strip_title: true
9090
github_link: false
9191
feedback_link: false
9292

@@ -140,9 +140,10 @@ relative_links:
140140
- _videos
141141
- codelinks
142142
- community
143+
- extensions
143144
- guides
144-
- mftf
145145
- redoc
146+
- release
146147
- tmp
147148
- 404.md
148149
- availability.md
@@ -178,6 +179,10 @@ algolia:
178179
- guides/m1x/**/*.md
179180
- swagger
180181
- redoc
182+
# Index HTML elements, especially code samples.
183+
nodes_to_index: 'p,li,td,code'
184+
# Override 10KB default and use our allowed max of 20KB
185+
max_record_size: 20000
181186

182187
google:
183188
analytics: UA-66243208-1

0 commit comments

Comments
 (0)