Skip to content

Commit a7a3295

Browse files
author
Rouzbeh Sarrafieh
committed
Merge branch 'master' of https://github.com/webpack/webpack.js.org into lower-case
2 parents 1a286a6 + 2774c98 commit a7a3295

18 files changed

+1154
-24
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Issue the PR to the [master](https://github.com/webpack/webpack.js.org/tree/mast
4040
4141
## Contribution Recognition
4242

43-
Any document that you edit, you can choose to add your GitHub username at the top of the document for recognition:
43+
You can choose to add your GitHub username for recognition at the top of any markdown document you edit:
4444

4545
**example.md**
4646

@@ -59,7 +59,7 @@ contributors:
5959

6060
```
6161

62-
This will add your name and GitHub profile photo to the document in production. This is a great way to own the awesome work that you do and encourage that you remember to do this in your PR's.
62+
This will add your name and GitHub profile photo to the document in production. It's a great way to own the awesome work that you do and we encourage you to do this in your PRs.
6363

6464

6565
## Thank you

antwar.config.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,17 @@ module.exports = {
7171
}
7272
),
7373

74+
development: section(
75+
'Development',
76+
function() {
77+
return require.context(
78+
'json-loader!yaml-frontmatter-loader!./content/development',
79+
true,
80+
/^\.\/.*\.md$/
81+
);
82+
}
83+
),
84+
7485
configuration: section(
7586
'Configuration',
7687
function() {

components/navigation/navigation.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ let Sections = [
2020
{ title: 'API', url: 'api' },
2121
{ title: 'Configuration', url: 'configuration' },
2222
{ title: 'Loaders', url: 'loaders' },
23-
{ title: 'Plugins', url: 'plugins' }
23+
{ title: 'Plugins', url: 'plugins' },
24+
{ title: 'Development', url: 'development' }
2425
]
2526
},
2627
{

0 commit comments

Comments
 (0)