Skip to content

Commit 59d5078

Browse files
Markus Amalthea Magnusonajpiano
authored andcommitted
Various small fixes on the Contributing page. Fixes jquery#341.
1 parent dd1937e commit 59d5078

File tree

1 file changed

+37
-110
lines changed

1 file changed

+37
-110
lines changed

CONTRIBUTING.md

Lines changed: 37 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -6,164 +6,91 @@ customFields:
66
value: 0
77
---
88

9-
Depending on your level of experience with some of the workflows common to many
10-
open source projects, e.g. git/GitHub, the command line, and setting up a
11-
local development environment, contributing to this site may be a breeze or
12-
come with a bit of a learning curve. If you fit into the former group, great!
13-
Jump ahead to learn how to get started.
14-
15-
But if you think you're part of the second group, and have had trouble
16-
participating in open source because of a lack of comfort with the tools,
17-
**you're still welcome**! Beyond providing a resource for learning jQuery, a
18-
major goal of this site is to provide an encouraging environment for you to
19-
develop these skills, while still making a contribution that matters. Many
20-
people think that the only way to get involved with a programming project like
21-
jQuery is to solve intricate bugs that require a nuanced understanding of the
22-
codebase, or to propose enhancements that may or may not be in scope with the
23-
development team's plans. The fact is that there's way more: improving
24-
documentation, working on web properties, and supporting other users are
25-
crucial aspects where more help is always needed. If you're willing to share
26-
your time and expertise to help other developers, we're willing to [help you
27-
get up to speed with the tools](#getting-help) you'll need.
9+
Depending on your level of experience with some of the workflows common to many open source projects, e.g. git/GitHub, the command line, and setting up a local development environment, contributing to this site may be a breeze or come with a bit of a learning curve. If you fit into the former group, great! Jump ahead to learn how to get started.
2810

11+
But if you think you're part of the second group, and have had trouble participating in open source because of a lack of comfort with the tools, **you're still welcome**! Beyond providing a resource for learning jQuery, a major goal of this site is to provide an encouraging environment for you to develop these skills, while still making a contribution that matters. Many people think that the only way to get involved with a programming project like jQuery is to solve intricate bugs that require a nuanced understanding of the codebase, or to propose enhancements that may or may not be in scope with the development team's plans. The fact is that there's way more: improving documentation, working on web properties, and supporting other users are crucial aspects where more help is always needed. If you're willing to share your time and expertise to help other developers, we're willing to [help you get up to speed with the tools](#getting-help) you'll need.
2912

3013
## Why Contribute?
3114

32-
If you've ever looked for help with jQuery -- or with web development in
33-
general -- you know the hunt can sometimes be challenging. It's can be a
34-
process of wading through a number of different posts until you find that
35-
article that's the right combination of trustworthy, timely, and helpful for
36-
your particular problem. And if you're one of those authors -- thanks! -- then
37-
you are probably familiar with the frustrating feeling of putting a useful tip
38-
out there, and then wondering if it's actually making its way to the people who
39-
need it, and what to do with that old post years and versions down the road.
40-
You're invited to share that energy to help us bring that ecosystem together
41-
and grow it further!
42-
43-
If you've ever helped anyone, colleague or stranger, with a particular problem,
44-
then you know the value of having a reference you can quickly link to that says
45-
"here's how you do it." This site is intended to be that compendium, but
46-
there's always more to refine and add, and we need your help too!
47-
48-
Of course, we'll also give you credit for your work! The **Contributors** section
49-
for each article is generated from the git commit logs on the file, so you'll
50-
be publicly acknowledged for your help.
15+
If you've ever looked for help with jQuery – or with web development in general – you know the hunt can sometimes be challenging. It can be a process of wading through a number of different posts until you find that article that's the right combination of trustworthy, timely, and helpful for your particular problem. And if you're one of those authors – thanks! – then you are probably familiar with the frustrating feeling of putting a useful tip out there, and then wondering if it's actually making its way to the people who need it, and what to do with that old post years and versions down the road. You're invited to share that energy to help us bring that ecosystem together and grow it further!
16+
17+
If you've ever helped anyone, colleague or stranger, with a particular problem, then you know the value of having a reference you can quickly link to that says "here's how you do it." This site is intended to be that compendium, but there's always more to refine and add, and we need your help too!
18+
19+
Of course, we'll also give you credit for your work! The **Contributors** section for each article is generated from the git commit logs on the file, so you'll be publicly acknowledged for your help.
5120

5221
## How Does It Work?
5322

5423
### Content
5524

56-
The content in this site is maintained in
57-
[this GitHub repository](http://github.com/jquery/learn.jquery.com) as a collection of
58-
[Markdown](http://daringfireball.net/projects/markdown/) files in the `page`
59-
directory. The order in which chapters and articles are presented is controlled
60-
by the [order.yml](https://github.com/jquery/learn.jquery.com/blob/master/order.yml)
61-
file.
25+
The content in this site is maintained in [this GitHub repository](https://github.com/jquery/learn.jquery.com) as a collection of [Markdown](http://daringfireball.net/projects/markdown/) files in the `page` directory. The order in which chapters and articles are presented is controlled by the [order.yml](https://github.com/jquery/learn.jquery.com/blob/master/order.yml) file.
6226

6327
### Design
6428

65-
The site's layout and design is controlled by our
66-
[`jquery-wp-content`](http://github.com/jquery/jquery-wp-content), a custom
67-
[WordPress](http://wordpress.org) configuration that runs (or will run in the
68-
near future) all of the sites run by the jQuery Foundation. The [master
69-
theme](https://github.com/jquery/jquery-wp-content/tree/master/themes/jquery)
70-
controls most of the layout for all of our sites, and there is a [child
71-
theme](https://github.com/jquery/jquery-wp-content/tree/master/themes/learn.jquery.com)
72-
that controls the templates and styles specific to the learn site.
29+
The site's layout and design is controlled by our [`jquery-wp-content`](https://github.com/jquery/jquery-wp-content), a custom [WordPress](http://wordpress.org) configuration that runs (or will run in the near future) all of the sites run by the jQuery Foundation. The [master theme](https://github.com/jquery/jquery-wp-content/tree/master/themes/jquery) controls most of the layout for all of our sites, and there is a [child theme](https://github.com/jquery/jquery-wp-content/tree/master/themes/learn.jquery.com) that controls the templates and styles specific to the learn site.
7330

74-
[`jquery-wp-content`](http://github.com/jquery/jquery-wp-content) powers our sites in
75-
production and staging environments, and can set up for local development relatively easily.
31+
[`jquery-wp-content`](https://github.com/jquery/jquery-wp-content) powers our sites in production and staging environments, and can be set up for local development relatively easily.
7632

7733
### Build
7834

79-
The static content in the `page` directory is deployed to a
80-
[`jquery-wp-content`](http://github.com/jquery/jquery-wp-content) instance
81-
using [grunt](http://gruntjs.com), specifically with two grunt plugins we've created:
82-
83-
* [grunt-jquery-content](http://github.com/jquery/grunt-jquery-content) - pre-processes content in a variety of formats (HTML, Markdown, XML) into HTML, applying syntax highlighting and some simple partial support, preparing it for processing by
84-
* [grunt-wordpress](http://github.com/scottgonzalez/grunt-wordpress) - syncs static content to WordPress using [XML-RPC](http://codex.wordpress.org/XML-RPC_Support)
35+
The static content in the `page` directory is deployed to a [`jquery-wp-content`](https://github.com/jquery/jquery-wp-content) instance using [grunt](http://gruntjs.com), specifically with two grunt plugins we've created:
8536

37+
* [grunt-jquery-content](https://github.com/jquery/grunt-jquery-content) – pre-processes content in a variety of formats (HTML, Markdown, XML) into HTML, applying syntax highlighting and some simple partial support, preparing it for processing by:
38+
* [grunt-wordpress](https://github.com/scottgonzalez/grunt-wordpress) – syncs static content to WordPress using [XML-RPC](http://codex.wordpress.org/XML-RPC_Support)
8639

8740
## How Can I Help?
8841

89-
The simplest and least complicated way to help is to [file
90-
issues](http://github.com/jquery/learn.jquery.com/issues) if you notice
91-
mistakes that should be fixed, improvements that can be made, or if you have
92-
ideas for new articles. We'll use the issues to continue discussion and track
93-
progress on anything you point out.
94-
95-
If you'd like to go a step further and contribute new articles, make edits to
96-
existing ones, or work on the site itself, the first thing you'll need is a
97-
[fork](https://help.github.com/articles/fork-a-repo). When you have changes
98-
you'd like to have reviewed for integration into the site, submit a [pull
99-
request](http://help.github.com/send-pull-requests/).
100-
101-
*(If you're unfamiliar with Git, you can still contribute by using features in
102-
GitHub's web UI. You can edit files directly via [GitHub's in-browser
103-
editor](https://github.com/blog/905-edit-like-an-ace). You can [create and
104-
delete branches directly from your
105-
fork](https://github.com/blog/1377-create-and-delete-branches), so you can also
106-
submit new articles as well. Either way, we still encourage you to [learn how
107-
to use Git and GitHub](http://help.github.com/) as soon as you can.)*
42+
The simplest and least complicated way to help is to [file issues](https://github.com/jquery/learn.jquery.com/issues) if you notice mistakes that should be fixed, improvements that can be made, or if you have ideas for new articles. We'll use the issues to continue discussion and track progress on anything you point out.
43+
44+
If you'd like to go a step further and contribute new articles, make edits to existing ones, or work on the site itself, the first thing you'll need is a [fork](https://help.github.com/articles/fork-a-repo). When you have changes you'd like to have reviewed for integration into the site, submit a [pull request](https://help.github.com/articles/using-pull-requests).
45+
46+
*(If you're unfamiliar with Git, you can still contribute by using features in GitHub's web interface. You can edit files directly via [GitHub's in-browser editor](https://github.com/blog/905-edit-like-an-ace). You can [create and delete branches directly from your fork](https://github.com/blog/1377-create-and-delete-branches), so you can also submit new articles as well. Either way, we still encourage you to [learn how to use Git and GitHub](https://help.github.com/) as soon as you can.)*
10847

10948
## Local Development
11049

111-
In order to preview your changes locally, work on design/layout issues, or work
112-
on other jQuery sites' content, and generally contribute most effectively, we
113-
recommend that you set up a local development environment. You can learn how to
114-
get set up from our [documentation on contributing to jQuery Foundation web
115-
sites](http://contribute.jquery.org/web-sites/#local-development).
50+
In order to preview your changes locally, work on design/layout issues, or work on other jQuery sites' content, and generally contribute most effectively, we recommend that you set up a local development environment. You can learn how to get set up from our [documentation on contributing to jQuery Foundation web sites](http://contribute.jquery.org/web-sites/#local-development).
11651

117-
* **Windows note:** Line endings need to be Unix-style (line-feed only). Make
118-
sure your text editor creates new files with Unix-style line endings. In
119-
addition, the following setting to your git config will keep the Unix-style
120-
line endings when pulling from the repository.*
52+
* **Windows note:** Line endings need to be Unix-style (line-feed only). Make sure your text editor creates new files with Unix-style line endings. In addition, the following setting to your git config will keep the Unix-style line endings when pulling from the repository:
12153

12254
```
12355
$ git config --global core.autocrlf true
12456
```
12557

126-
### Working With Content
58+
### Working with Content
12759

12860
Once you've gotten your environment working, here are the general steps you should follow to make your changes:
12961

130-
1. Create a new "feature" branch based on `master` -- `git branch <feature/issue name/number>`
131-
2. Move onto that branch -- `git checkout <feature/issue name/number>`
62+
1. Create a new "feature" branch based on `master`: `git branch <feature/issue name/number>`
63+
2. Move onto that branch: `git checkout <feature/issue name/number>`
13264
3. Work on your awesome contribution.
133-
4. As you work and want to preview your changes, use `grunt` to deploy them to the your site. You can also use `grunt watch` to have the site monitor the `page` directory for any changes and automatically have the changes deployed every time you save.
134-
5. When you're done, stage the new/modified preparation for commit -- `git add page/faq/how-do-i-add-a-new-article-to-the-learn-site.md`
135-
6. Commit the files to your local repo -- `git commit -m "add a relevant message describing the change"`
136-
7. Push the files to your GitHub remote -- `git push origin <feature/issue name/number>`
65+
4. As you work and want to preview your changes, use `grunt` to deploy them to your site. You can also use `grunt watch` to have the site monitor the `page` directory for any changes and automatically have the changes deployed every time you save.
66+
5. When you're done, stage the new/modified preparation for commit: `git add page/faq/how-do-i-add-a-new-article-to-the-learn-site.md`
67+
6. Commit the files to your local repo: `git commit -m "add a relevant message describing the change"`
68+
7. Push the files to your GitHub remote: `git push origin <feature/issue name/number>`
13769
8. Go to your fork on GitHub and submit a new [pull request](https://help.github.com/articles/using-pull-requests).
13870

139-
For more advice on managing your fork and submitting pull requests to jQuery
140-
Foundation, read our [Commits and Pull
141-
Requests](http://contribute.jquery.org/commits-and-pull-requests/) guide.
71+
For more advice on managing your fork and submitting pull requests to the jQuery Foundation, read our [Commits and Pull Requests](http://contribute.jquery.org/commits-and-pull-requests/) guide.
14272

143-
### Adding A New Article
73+
### Adding a New Article
14474

145-
1. Add the file to the right folder in the page folder.
146-
2. Add the slug name (the filename without the extension) to the desired location `order.yml`
75+
1. Add the file to the right folder in the `page` folder.
76+
2. Add the slug name (the filename without the extension) to the desired location in `order.yml`
14777
3. Run `grunt`
14878
4. You should now be able to navigate to the file.
14979

15080
### Formatting Articles
15181

152-
Yes! Take a look at our [style guide](http://learn.jquery.com/style-guide) for
153-
more information on authoring and formatting conventions.
82+
Yes! Take a look at our [style guide](http://learn.jquery.com/style-guide) for more information on authoring and formatting conventions.
15483

15584
## How Will My Contribution Be Acknowledged?
15685

157-
We will build the attribution of an article based on the git commit logs and present this information in the site.
86+
We will build the attribution of an article based on the git commit logs and present this information on the site.
15887

159-
## <a name="getting-help">Getting Help</a>
88+
<h2 id="getting-help">Getting Help</h2>
16089

16190
If you're struggling to get any part of the site working properly, or have any questions, we're here to help.
16291

163-
The best place to get help is on [IRC](http://en.wikipedia.org/wiki/Internet_Relay_Chat), in the #jquery-content
164-
channel on [Freenode](http://freenode.net). If you're unfamiliar with IRC, you can use the [webchat gateway](http://webchat.freenode.net/).
92+
The best place to get help is on [IRC](http://en.wikipedia.org/wiki/Internet_Relay_Chat), in the `#jquery-content` channel on [Freenode](http://freenode.net). If you're unfamiliar with IRC, you can use the [webchat gateway](http://webchat.freenode.net/).
16593

166-
In addition, the jQuery Content Team holds a [public, weekly
167-
meetings](http://jquery.org/meeting) on Freenode, at 1PM Eastern time in the #jquery-meeting channel.
94+
In addition, the jQuery Content Team holds a [public, weekly meetings](http://jquery.org/meeting) on Freenode, at 1PM Eastern time in the `#jquery-meeting` channel.
16895

169-
If IRC is not your thing, but you still want or need to get in touch, please use the site's GitHub repo or send us an e-mail to `content at jquery dot org`.
96+
If IRC is not your thing, but you still want or need to get in touch, please use the site's [GitHub repo](https://github.com/jquery/learn.jquery.com) or send us an e-mail to `content at jquery dot org`.

0 commit comments

Comments
 (0)