Commit Graph

5885 Commits

Author SHA1 Message Date
Rocky Meza ac2ef4af7c [1.6.x] Fixed the base class note in the Date Views docs.
Backport of 42197e31aa from master
2013-11-19 10:25:48 -05:00
Tim Graham 44469af34b [1.6.x] Fixed typo in topics/http/sessions.txt.
Backport of 9348fc5628 from master
2013-11-18 19:11:33 -05:00
Claude Paroz 833f7d11e8 [1.6.x] Fixed #21457 -- Allowed fixture file name to contain dots
Thanks Keryn Knight for the report.
Backport of 97ac22ebfc from master.
2013-11-18 20:34:39 +01:00
Baptiste Mispelon 4c9362d81f [1.6.x] Added more internal links in the management command documentation.
Backport of bc0413cbc6 from master.
2013-11-18 19:28:29 +01:00
Claude Paroz 9f59149cfe [1.6.x] Added release note for TypedChoiceField coerce limitation
Thanks Elec for the report and Simon Charette for the review.
Refs #21397.
Backport of 4a00f132e0 from master.
2013-11-18 18:09:54 +01:00
Dominic Rodger a9c50fccf2 [1.6.x] Fixed #20852 - Fixed incorrectly generated left quotes in docs.
Sphinx generates left single quotes for apostrophes after
code markup, when right single quotes are required. The
easiest way to fix this is just by inserting the unicode
character for a right single quote.

Instances of the problem were found by looking for
">‘" in the generated HTML.

Backport of c33d1ca1d9 from master.
2013-11-18 16:03:00 +01:00
Tim Graham 2b03d53438 [1.6.x] Fixed #21240 -- Added 1.5 release note for OneToOneField/select_related change.
Thanks marcin at sokrates.pl.

Backport of ba63b9895b from master
2013-11-18 09:33:53 -05:00
Tim Graham a776e3f420 [1.6.x] Fixed #21404 -- Added session.set_expiry() note to 1.6 release notes.
Thanks pwr for the suggestion.

Backport of ffdae5b66d from master
2013-11-18 08:00:16 -05:00
Claude Paroz e85baa813f Updated humanize translations and added release note.
Refs #21415.
2013-11-17 21:20:44 +01:00
Anssi Kääriäinen 1fd762c106 [1.6.x] Fixed #21428 -- editable GenericRelation regression
The GenericRelation refactoring removed GenericRelations from
model._meta.many_to_many. This had the side effect of disallowing
editable GenericRelations in ModelForms. Editable GenericRelations
aren't officially supported, but if we don't fix this we don't offer any
upgrade path for those who used the ability to set editable=True
in GenericRelation subclass.

Thanks to Trac alias joshcartme for the report and stephencmd and Loic
for working on this issue.

Backpatch of 0e079e4331 from master.
2013-11-16 20:15:46 +02:00
Tim Graham e8dea1f35c [1.6.x] Fixed #21440 -- Typo #2 in topics/http/shortcuts.txt
Thanks alasdair.

Backport of d011714002 from master
2013-11-15 10:22:51 -05:00
Tim Graham f2b5e9d5bb [1.6.x] Fixed #21440 -- Typo in topics/http/shortcuts.txt
Thanks olof.bjarnason at gmail.com for the report.

Backport of 6e9e6ca071 from master
2013-11-15 07:10:47 -05:00
Baptiste Mispelon bdde6f6a03 [1.6.x] Added backported fixes to 1.6.1 release notes.
Backport of 8e6d1b9792 from master.
2013-11-14 23:14:37 +01:00
Anssi Kääriäinen c37b2e46b9 [1.6.x] Release notes for ORM changes in 1.6
Backport of 4301d6fa36 from master
2013-11-14 18:04:55 +02:00
Tim Graham 5b8c8c462d [1.6.x] Added release note for #21410; thanks Loic.
Backport of 94d567ba30 from master
2013-11-13 12:25:31 -05:00
Baptiste Mispelon b6acc4f749 [1.6.x] Removed a mention of `Form._errors` from the documentation.
Also removed a sentence that was incorrect: raising a
`ValidationError` inside `Form.clean` doesn't clear the
`cleaned_data` attribute.

Thanks to loic84 and timograham for the review.

Backport of 9aa6d4bdb6 and
0048ed77c7 from master.
2013-11-12 20:54:37 +01:00
Bernardo Pires 4aed1ee339 [1.6.x] Fixed #21372 -- Corrected docs regarding translating LANGUAGES.
Corrected LANGUAGES documentation on how to translate language
names. Now using django.utils.translation.ugettext_lazy instead
of a dummy gettext() function.

Thanks to Salvatore for the report.

Backport of 8bc350b385 from master.
2013-11-10 00:02:13 +01:00
Tim Graham 4b9e932fd4 [1.6.x] Fixed #21398 -- Fixed BCryptSHA256PasswordHasher with py-bcrypt and Python 3.
Thanks arjan at anymore.nl for the report.

Backport of d15985d81f from master
2013-11-09 10:21:19 -05:00
Tim Graham c9076a408c [1.6.x] Fixed spelling of compatibility. 2013-11-09 10:18:55 -05:00
Baptiste Mispelon 86e72f5ba9 [1.6.x] Fixed versionadded misuse in the admin documentation.
Backport of c82e850eed from master.
2013-11-09 15:10:14 +01:00
Cody Scott 82e756da83 [1.6.x] Noted that .clear() will delete intermediary models
Backport of a8e84521c4 from master
2013-11-08 19:25:21 -05:00
Tom Scholl c9917f4c83 [1.6.x] Fixed docs for EmailMessage extra_headers attribute
The EmailMessage documentation describes the initialization parameters
and states they 'can be set at any time prior to calling the send()
method.'. However, the 'headers' parameter's corresponding attribute is
called 'extra_headers'.

Backport of cab72a439b from master
2013-11-08 18:39:53 -05:00
glts d4b1724b36 [1.6.x] Added missing parameter in npgettext_lazy docs
Backport of 413307fe35 from master
2013-11-08 18:35:43 -05:00
Claude Paroz 3c8879f092 [1.6.x] Removed obsolete locale restriction admonition
Refs #14461. Thanks Ramiro Morales for pointing this.
Backport of b780d03d62 from master.
2013-11-08 16:53:12 +01:00
Baptiste Mispelon 6c34e18bd4 [1.6.x] Fixed #21396: Document backwards-incompatible change in RedirectView.get_redirect_url.
Thanks to Tim for the review.

Backport of f2e0266be7 from master.
2013-11-08 10:55:11 +01:00
Tim Graham 6026a5091b [1.6.x] Added 1.4.10 release notes.
Backport of c29dd76f40 from master
2013-11-07 09:42:47 -05:00
Sylvain Bellemare b3da4cc092 [1.6.x] Removed no longer relevant word
Backport of 3935b0f263 from master
2013-11-07 09:32:26 -05:00
James Bennett a71ff76235 [1.6.x] Bump version numbers for 1.6 release. 2013-11-06 07:54:49 -06:00
Claude Paroz 66bf6b3f85 [1.6.x] Fixed #21373 -- Typo fixed in i18n docs
Thanks rpq at winscores.com for the report.
Backport of 88b9d4ff3a from master.
2013-11-02 19:15:20 +01:00
Tim Graham 33503c57ef [1.6.x] Fixed spelling ("dependant" -> "dependent")
Dependent means reliant on.
A dependant is a person like a child or spouse.

Thanks Andrew Wilcox for the report.

Backport of 090315f5df from master
2013-11-01 21:32:05 -04:00
Sylvain Bellemare 35fd14cf42 [1.6.x] Fixed typo -- "a" user, not "an" user
Backport of c7dabe49dd from master
2013-11-01 19:28:19 -04:00
Claude Paroz 3f1b20841a [1.6.x] Fixed #21364 -- Specified InnoDB full-text support from MySQL 5.6.4 on
Thanks thevlad at gmail.com for the report.
Backport of 89116cf24a from master.
2013-11-01 11:02:11 +01:00
Claude Paroz f03c699159 [1.6.x] Fixed #21359 -- Corrected MySQL collation name in databases docs
Thanks k_sze for the report.
Backport of 67c6c1a7c from master.
2013-11-01 10:46:39 +01:00
Claude Paroz 8f104bb8d5 [1.6.x] Fixed #21339 -- Documented removal of some form field error messages 2013-10-31 17:53:05 +01:00
Tim Graham d774cb219c [1.6.x] Fixed #21306 -- Documented lower-casing behavior of title filter.
Backport of eafe279120 from master
2013-10-30 09:35:05 -04:00
Tim Graham 1cdf7f83ff [1.6.x] Fixed #21294 -- Clarified the logout next_page argument.
Thanks wim at go2people.nl for the report.

Backport of 51e6575472 from master
2013-10-30 09:26:35 -04:00
Antoine Catton 142757c61e [1.6.x] Documented the limitation on sep argument to Signer
Co-Authored-By: Gavin Wahl <gwahl@fusionbox.com>

Backport of e9a356a695 from master
2013-10-30 08:27:19 -04:00
Tim Graham da0c7723fa [1.6.x] Fixed #21316 -- Documented that modifying safe strings makes them unsafe.
Thanks dev@simon.net.nz for the suggestion and vijay_shanker for the patch.

Backport of 1edef50880 from master
2013-10-30 08:12:09 -04:00
Tim Graham aa645d20df [1.6.x] Fixed #21337 -- Documented removal of django.core.servers.basehttp.WSGIServerException
refs 2ca00faa91

Backport of b47a052eb5 from master
2013-10-30 07:47:32 -04:00
Tim Graham 747f77552a [1.6.x] Fixed #21325 -- Added missing argument to permission_required decorator.
Backport of cc2049cdd7 from master
2013-10-25 17:37:39 -04:00
Paolo Melchiorre 26e4576681 [1.6.x] Fixed typo in docs/releases/1.4.9.txt.
Backport of 3b0293370a from master
2013-10-25 07:55:41 -04:00
Tim Graham bc62a20a3e [1.6.x] Bumped release date for 1.5.5 & 1.4.9.
Backport of 4ce5c119b5 from master
2013-10-23 18:29:09 -04:00
Shai Berger 27f3f34136 Fixed #13245: Explained Oracle's behavior w.r.t db_table
and how to prevent table-name truncation

Thanks russellm & timo for discussion, and timo for review.

Backported from master 317040a73b
2013-10-23 15:01:05 +03:00
Tim Graham 2e74d6cb53 [1.6.x] Added 1.5.5 and 1.4.9 release notes
Backport of 2eb8f15516 from master
2013-10-22 20:24:26 -04:00
Tim Graham 4499dc81e2 [1.6.x] Fixed #21304 -- Typo in docs/topics/testing/advanced.txt
Thanks joao at silvaneves.org for the report.

Backport of 9704c49d59 from master
2013-10-22 12:06:16 -04:00
Tim Graham 86373dc63e [1.6.x] Added docs for the hasher's iteration count changes.
Backport of 28b70425af from master.
2013-10-21 20:33:27 +02:00
Riccardo Magliocchetti 15a6667a70 [1.6.x] Fixed #21296 -- Added docs for PostgreSQL and unix domains sockets.
Backport of 1e39982b6e from master
2013-10-21 13:10:41 -04:00
Juergen Schackmann f198abc7e4 [1.6.x] Fixed #21212 -- Documented the reverse name for OneToOneField.
Thanks bjb at credil.org for the report.

Backport of f8632572ad from master
2013-10-18 16:22:41 -04:00
Tim Graham 5bb975a139 [1.6.x] Added a warning regarding session security and subdomains.
Backport of a3372f67cb from master
2013-10-18 09:44:29 -04:00
Tim Graham fa90b855b2 [1.6.x] Fixed ReST error in 1.6. release notes.
Backport of 651bb73ab3 from master
2013-10-18 08:47:59 -04:00
Tim Graham 37afcbeb92 [1.6.x] Removed 1.6 release note text regarding password limit length.
This changed was reverted in 5d74853e15.

Backport of d97bec5ee3 from master
2013-10-17 19:00:08 -04:00
Tianyi Wang 1241a2cc10 [1.6.x] Improvement on InlineFormSet doc, refs #21006
Backport of 944a2bb7c1 from master
2013-10-15 09:58:51 -04:00
Tianyi Wang ecfd958c84 [1.6.x] Fixed #21006 -- Added example code for overriding methods on an InlineFormSet.
Thanks treysta at gmail.com for the suggestion.

Backport of 9bfe66164e from master
2013-10-15 07:36:37 -04:00
Sorcha Bowler 07ebd23254 [1.6.x] Fixed #21223 -- Added form.id_for_label to topic guide.
Thanks ebertti at yahoo.com.br for the suggestion.

Backport of 018e2c055a from master
2013-10-14 18:43:29 -04:00
Bouke Haarsma 7f566fdb4c [1.6.x] Fixed #20962 -- Documented that template tag render() may raise exceptions.
Thanks Keryn Knight for the report.

Backport of e077224f4a from master
2013-10-14 11:55:12 -04:00
Loic Bistuer 8222a48253 [1.6.x] Clarfied the ModelForm docs with respect to generated vs. declared fields.
The ModelForm docs suggested that fields defined declaratively override
default fields generated from the form Meta.

This is conceptually wrong, especially with inheritance in mind. Meta is
usually defined on the topmost ModelForm subclass, while fields can come
from anywhere in the MRO, especially base classes; therefore we suggested
that something defined in a base class override something from a subclass.

This patch rephrases the docs around the idea that Meta is used to generate
*missing* fields.

Refs #8620, #19617.

Thanks @mjtamlyn and @timgraham for the review.

Backport of 54cd930baf from master
2013-10-14 10:55:41 -04:00
Bouke Haarsma da181056a9 [1.6.x] Fixed #21210 -- Documented when runserver doesn't auto-restart.
Thanks gergely at polonkai.eu for the suggestion.

Backport of 9b7d38ed5a from master
2013-10-14 10:38:30 -04:00
Bouke Haarsma e3c8db61f3 [1.6.x] Fixed #21264 -- Incorrect RST usage in docs
Backport of 8fc63087f6 from master
2013-10-14 08:15:50 -04:00
Max Vizard 8f5ea9d19b [1.6.x] Fixed #21027 -- Updated tutorial 5 docs to link to management shell command page.
Backport of 13ddf0e002 from master
2013-10-14 08:10:51 -04:00
Aymeric Augustin ddff6522fa [1.6.x] Fixed #19560 -- Identified field in warning for naive datetime.
Thanks gcc for the report and vajrasky for the patch.

Backport of 570d9c2678 from master.
2013-10-13 11:58:12 +02:00
Ramiro Morales 503092b09a [1.6.x] Forms docs: More emphasis in 'id' value customizability.
18ea1c473b form master.
2013-10-12 13:30:58 -03:00
Tim Graham 8f5d3d16cb [1.6.x] Fixed #15582 -- Documented how TransactionTestCase.multi_db affects fixtures.
Thanks slinkp for the suggestion.

Backport of dd839a2dfd from master
2013-10-11 20:12:52 -04:00
Cody Scott f787869d8c [1.6.x] Minor edits to docs/topics/db/queries.txt.
Backport of 8bfc7cc64c from master
2013-10-11 15:35:48 -04:00
Cody Scott 2069dfeaef [1.6.x] Small improvements to docs/topics/db/models.txt
Backport of 695bc0d191 from master
2013-10-10 20:57:16 -04:00
Claude Paroz 7a58fde7a6 [1.6.x] Fixed grammar/typos in auth customization docs
Backport of 1b9c72fc4f from master.
2013-10-09 16:22:36 +02:00
Dan Loewenherz af46932b57 [1.6.x] Fix grammatical errors in email documentation
Backport of 43f213e475 from master
2013-10-08 20:30:43 -04:00
Russell Keith-Magee 1ab84b6c65 [1.6.x] Fixed #21164 -- Added documentation for issue with test users.
The package renaming restores the older package names (which were also the
documented package names). This doesn't affect test discovery because the
module in question doesn't contain any tests.

Thanks to Carl for the design discussion.

Backport of ddb5385 from master.
2013-10-08 10:37:48 +08:00
Ramiro Morales 563b5c2000 [1.6.x] Re-added link to SQLite notes from DB section of install doc.
67f5dffbec from master.
2013-10-07 07:42:28 -03:00
Tim Graham e2e7571035 [1.6.x] Fixed #21218 -- Typo on docs/howto/upgrade-version.txt
Thanks ryan at ryangallen.com for the report.

Backport of 36e220f923 from master
2013-10-03 20:14:00 -04:00
Tim Graham 06b149e220 [1.6.x] Fixed #10913 -- Documented how related_name affects QuerySet filtering
Thanks neithere for the suggestion.

Backport of 75bb6ba966 from master
2013-10-02 12:13:44 -04:00
Tim Graham 9b89fcc0b0 [1.6.x] Clarified session replay attack differences with cookie backend.
Backport of 00a0d3de02 from master
2013-10-02 10:15:36 -04:00
Curtis Maloney 98773c4bb5 [1.6.x] Fixed #21154 -- Updated TemplateResponse docs to better explain context.
Thanks mrmachine for the report.

Backport of c39c9f2ad8 from master
2013-09-30 10:21:34 -04:00
Aymeric Augustin 0d74bdaf0c Fixed #21134 -- Prevented queries in broken transactions.
Backport of 728548e4 from master.

Squashed commit of the following:

commit 63ddb271a44df389b2c302e421fc17b7f0529755
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date:   Sun Sep 29 22:51:00 2013 +0200

    Clarified interactions between atomic and exceptions.

commit 2899ec299228217c876ba3aa4024e523a41c8504
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date:   Sun Sep 22 22:45:32 2013 +0200

    Fixed TransactionManagementError in tests.

    Previous commit introduced an additional check to prevent running
    queries in transactions that will be rolled back, which triggered a few
    failures in the tests. In practice using transaction.atomic instead of
    the low-level savepoint APIs was enough to fix the problems.

commit 4a639b059ea80aeb78f7f160a7d4b9f609b9c238
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date:   Tue Sep 24 22:24:17 2013 +0200

    Allowed nesting constraint_checks_disabled inside atomic.

    Since MySQL handles transactions loosely, this isn't a problem.

commit 2a4ab1cb6e83391ff7e25d08479e230ca564bfef
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date:   Sat Sep 21 18:43:12 2013 +0200

    Prevented running queries in transactions that will be rolled back.

    This avoids a counter-intuitive behavior in an edge case on databases
    with non-atomic transaction semantics.

    It prevents using savepoint_rollback() inside an atomic block without
    calling set_rollback(False) first, which is backwards-incompatible in
    tests.

    Refs #21134.

commit 8e3db393853c7ac64a445b66e57f3620a3fde7b0
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date:   Sun Sep 22 22:14:17 2013 +0200

    Replaced manual savepoints by atomic blocks.

    This ensures the rollback flag is handled consistently in internal APIs.
2013-09-30 10:14:22 +02:00
Ramiro Morales 5303afcd97 [1.6.x] Note about static files dirs paths on Windows.
Added it to the settings reference. We used to have it in comment form
in our old, bigger default project template settings.py file.

5866a49369 from master.
2013-09-28 20:35:47 -03:00
Tim Graham d1047c8b4c [1.6.x] Fixed #21116 -- Made usage of manage.py in docs more consistent.
Thanks daniel.quattro at gmail.com for the report.

d1c9802811 from master.
2013-09-25 21:11:17 -03:00
Baptiste Mispelon 5207928151 [1.6.X] Fixed wording in unit tests documentation.
Backport of 42b9feb2e7 from master.
2013-09-25 18:31:03 +02:00
Tim Graham d30d66b907 [1.6.x] Fixed #21137 -- Corrected ULRconf include example.
Thanks marfire for the report.

Backport of 77f6b468e5 from master
2013-09-24 09:41:39 -04:00
Brett Koonce db98c48884 [1.6.x] Removed extra p (topppings->toppings)
Backport of 946a2226ea from master
2013-09-23 19:25:07 -04:00
Tim Graham 34f4053409 [1.6.x] Removed implication that six is part of Python stdlib.
Backport of 45969bdeb5 from master
2013-09-23 18:30:18 -04:00
Louis Fill a6a5c8b06d [1.6.x] Fixed #21070 -- Added a more complex database configuration example.
Thanks joejasinski for the suggestion.

Backport of e15f7f31d0 from master
2013-09-23 12:18:47 -04:00
Daley Chetwynd 5e549e7efe [1.6.x] Fixed #20830 -- Clarified that Django uses a customized version of six.
Thanks glarrain for the suggestion.

Backport of a53caf28bf from master
2013-09-23 11:07:36 -04:00
Ben Huckvale cdb56725d4 [1.6.x] Fixed #21120 -- Added more explicit text on using validators and link to writing validators.
Thanks nicolas at niconomicon.net for the suggestion.

Backport of 98e0453f00 from master
2013-09-23 10:39:10 -04:00
Tim Garner 6e6d1b1ba8 [1.6.x] Fixed #21702 -- Added different bullet styles for nested lists.
Thanks moc at mocpa.com for the suggestion.

Backport of c81b6f7b83 from master
2013-09-23 07:40:01 -04:00
Ramiro Morales b2876c0c91 [1.6.x] A few doc additions for changes from d228c1192e.
ce0c5c38ea from master.
2013-09-22 13:54:54 -03:00
Ramiro Morales aef809f90c [1.6.x] Reference Meta.index_together in DB performance guide.
9dc45efeba from master.
2013-09-22 13:54:02 -03:00
mlissner 14f76b15c4 [1.6.x] Correct very minor typo
Just changed as to has.

Backport of d8f2d940cc from master
2013-09-21 18:18:42 -04:00
Michael DiBernardo bb8a087949 [1.6.x] Fixed #21137 -- Documented best practice for URLconfs with repeated pattern prefixes.
Backport of 222460a994 from master
2013-09-21 18:18:16 -04:00
Curtis Maloney e94efee946 [1.6.x] Fixed #21133 -- Clarifed documentation about strftime formatting.
Backport of 43a2ec7999 from master
2013-09-21 06:56:00 -04:00
Aymeric Augustin 0ad178c43d [1.6.x] Clarified why one must not catch database errors inside atomic.
Backport of 4db2752 from master.
2013-09-20 21:57:39 +02:00
Paul McMillan 85ba68cc14 [1.6.x] Increased default PBKDF2 iterations
Increases the default PBKDF2 iterations, since computers have gotten
faster since 2011. In the future, we plan to increment by 10% per
major version.

Backport of a075e2ad0d from master
2013-09-19 15:34:59 -04:00
Markus Amalthea Magnuson 9888bb28ee [1.6.x] Added missing "in" in sentence.
Backport of 2c5c422d34 from master
2013-09-19 13:29:48 -04:00
Russell Keith-Magee 886e876c72 [1.6.x] Fixed #21121: Added archive of security issues.
Backport of 9d3e60aa3e, 8e134c27c9, 8b3bae9466, c65ae7c969, bbabc5325c,
and a2e25e8a83 from master.
2013-09-19 15:02:52 +08:00
Ramiro Morales c0625a74ce [1.6.x] Reworded a paragraph in the logging docs.
9d12f68a53 from master.
2013-09-16 17:52:13 -03:00
Tim Graham e96bcdd64f [1.6.x] Cleaned up 1.5.4/1.4.8 release notes
Backport of 8d29005524 from master
2013-09-15 14:22:24 -04:00
James Bennett 623c4916df [1.6.x] Add release notes and bump version number for security release. 2013-09-15 00:36:03 -06:00
Russell Keith-Magee 5ecc0f828e [1.6.x] Ensure that passwords are never long enough for a DoS.
* Limit the password length to 4096 bytes
  * Password hashers will raise a ValueError
  * django.contrib.auth forms will fail validation
 * Document in release notes that this is a backwards incompatible change

Thanks to Josh Wright for the report, and Donald Stufft for the patch.

This is a security fix; disclosure to follow shortly.

Backport of aae5a96d57 from master.
2013-09-15 13:46:16 +08:00
Goetz 097fb98f81 [1.6.x] Fixed #21101 -- Updated urlize documentation to mention email addresses
Backport of 39b49fd339 from master
2013-09-13 12:42:40 -04:00
Tim Graham 7a2adec4d0 [1.6.x] Fixed #21100 -- Noted that Create/UpdateViews.fields is new in 1.6
Thanks AndrewIngram for the suggestion.

Backport of ec89e1725a from master
2013-09-13 09:35:22 -04:00
Tim Graham 6e17534c89 [1.6.x] Fixed #21094 -- Updated reuseable apps tutorial to use pip for installation.
Thanks ylb415 at gmail.com for the suggestion.

Backport of e4aab1bb8d from master
2013-09-13 09:30:12 -04:00
Kevin Christopher Henry c91ffd5f23 [1.6.x] Documentation -- added instructions on working with pull requests
Since non-core contributors are asked to review patches, instructions
on working with pull requests were added to the Working with Git and
GitHub page (based on the existing instructions in the core
committers page).

Backport of 990ce9aab9 from master
2013-09-13 08:27:23 -04:00