Loading docs/faq/general.txt +2 −3 Original line number Diff line number Diff line Loading @@ -66,9 +66,8 @@ Who's behind this? ------------------ Django was originally developed at World Online, the Web department of a newspaper in Lawrence, Kansas, USA. Django's now run by an international team of volunteers; you can read all about them over at the :doc:`list of committers </internals/committers>`. newspaper in Lawrence, Kansas, USA. Django's now run by an international :doc:`team of volunteers </internals/team>`. Which sites use Django? ----------------------- Loading docs/index.txt +1 −1 Original line number Diff line number Diff line Loading @@ -310,7 +310,7 @@ you can contribute: * **Community:** :doc:`How to get involved <internals/contributing/index>` | :doc:`The release process <internals/release-process>` | :doc:`Team of committers <internals/committers>` | :doc:`Meet the team <internals/team>` | :doc:`The Django source code repository <internals/git>` | :doc:`Security policies <internals/security>` | :doc:`Mailing lists <internals/mailing-lists>` Loading docs/internals/contributing/bugs-and-features.txt +3 −3 Original line number Diff line number Diff line Loading @@ -152,7 +152,7 @@ However, consensus is not always possible. If consensus cannot be reached, or if the discussion towards a consensus fizzles out without a concrete decision, we use a more formal process. Any :doc:`core committer</internals/committers>` may call for a formal vote Any :doc:`core committer</internals/team>` may call for a formal vote using the same voting mechanism above. A proposition will be considered carried by the core team if: Loading @@ -170,8 +170,8 @@ take to convert that "-1" into at least a "+0". Whenever possible, these formal votes should be announced and held in public on the |django-developers| mailing list. However, overly sensitive or contentious issues -- including, most notably, votes on new core committers -- may be held in private. or contentious issues -- including, most notably, votes on new team members -- may be held in private. .. _searching: https://code.djangoproject.com/search Loading docs/internals/contributing/committing-code.txt +1 −1 Original line number Diff line number Diff line Loading @@ -2,7 +2,7 @@ Committing code =============== This section is addressed to the :doc:`/internals/committers` and to anyone This section is addressed to the :doc:`/internals/team` and to anyone interested in knowing how code gets committed into Django core. If you're a community member who wants to contribute code to Django, have a look at :doc:`writing-code/working-with-git` instead. Loading docs/internals/contributing/triaging-tickets.txt +5 −6 Original line number Diff line number Diff line Loading @@ -57,10 +57,9 @@ Since a picture is worth a thousand words, let's start there: We've got two roles in this diagram: * :doc:`Committers</internals/committers>` (also called core developers): people with commit access who are responsible for making the big decisions, writing large portions of the code and integrating the contributions of the community. * Committers (also called core developers): people with commit access who are responsible for making decisions and integrating the contributions of the community. * Ticket triagers: anyone in the Django community who chooses to become involved in Django's development process. Our Trac installation Loading Loading @@ -314,7 +313,7 @@ A ticket can be resolved in a number of ways: discussion in the |django-developers| mailing list. Feel free to start or join in discussions of "wontfix" tickets on the |django-developers| mailing list, but please do not reopen tickets closed as "wontfix" by a :doc:`core developer</internals/committers>`. closed as "wontfix" by a :doc:`core developer</internals/team>`. * duplicate Used when another ticket covers the same issue. By closing duplicate Loading Loading @@ -407,7 +406,7 @@ the ticket database: review a patch that you submit. * Please **don't** reverse a decision that has been made by a :doc:`core developer</internals/committers>`. If you disagree with a decision that developer</internals/team>`. If you disagree with a decision that has been made, please post a message to |django-developers|. * If you're unsure if you should be making a change, don't make the Loading Loading
docs/faq/general.txt +2 −3 Original line number Diff line number Diff line Loading @@ -66,9 +66,8 @@ Who's behind this? ------------------ Django was originally developed at World Online, the Web department of a newspaper in Lawrence, Kansas, USA. Django's now run by an international team of volunteers; you can read all about them over at the :doc:`list of committers </internals/committers>`. newspaper in Lawrence, Kansas, USA. Django's now run by an international :doc:`team of volunteers </internals/team>`. Which sites use Django? ----------------------- Loading
docs/index.txt +1 −1 Original line number Diff line number Diff line Loading @@ -310,7 +310,7 @@ you can contribute: * **Community:** :doc:`How to get involved <internals/contributing/index>` | :doc:`The release process <internals/release-process>` | :doc:`Team of committers <internals/committers>` | :doc:`Meet the team <internals/team>` | :doc:`The Django source code repository <internals/git>` | :doc:`Security policies <internals/security>` | :doc:`Mailing lists <internals/mailing-lists>` Loading
docs/internals/contributing/bugs-and-features.txt +3 −3 Original line number Diff line number Diff line Loading @@ -152,7 +152,7 @@ However, consensus is not always possible. If consensus cannot be reached, or if the discussion towards a consensus fizzles out without a concrete decision, we use a more formal process. Any :doc:`core committer</internals/committers>` may call for a formal vote Any :doc:`core committer</internals/team>` may call for a formal vote using the same voting mechanism above. A proposition will be considered carried by the core team if: Loading @@ -170,8 +170,8 @@ take to convert that "-1" into at least a "+0". Whenever possible, these formal votes should be announced and held in public on the |django-developers| mailing list. However, overly sensitive or contentious issues -- including, most notably, votes on new core committers -- may be held in private. or contentious issues -- including, most notably, votes on new team members -- may be held in private. .. _searching: https://code.djangoproject.com/search Loading
docs/internals/contributing/committing-code.txt +1 −1 Original line number Diff line number Diff line Loading @@ -2,7 +2,7 @@ Committing code =============== This section is addressed to the :doc:`/internals/committers` and to anyone This section is addressed to the :doc:`/internals/team` and to anyone interested in knowing how code gets committed into Django core. If you're a community member who wants to contribute code to Django, have a look at :doc:`writing-code/working-with-git` instead. Loading
docs/internals/contributing/triaging-tickets.txt +5 −6 Original line number Diff line number Diff line Loading @@ -57,10 +57,9 @@ Since a picture is worth a thousand words, let's start there: We've got two roles in this diagram: * :doc:`Committers</internals/committers>` (also called core developers): people with commit access who are responsible for making the big decisions, writing large portions of the code and integrating the contributions of the community. * Committers (also called core developers): people with commit access who are responsible for making decisions and integrating the contributions of the community. * Ticket triagers: anyone in the Django community who chooses to become involved in Django's development process. Our Trac installation Loading Loading @@ -314,7 +313,7 @@ A ticket can be resolved in a number of ways: discussion in the |django-developers| mailing list. Feel free to start or join in discussions of "wontfix" tickets on the |django-developers| mailing list, but please do not reopen tickets closed as "wontfix" by a :doc:`core developer</internals/committers>`. closed as "wontfix" by a :doc:`core developer</internals/team>`. * duplicate Used when another ticket covers the same issue. By closing duplicate Loading Loading @@ -407,7 +406,7 @@ the ticket database: review a patch that you submit. * Please **don't** reverse a decision that has been made by a :doc:`core developer</internals/committers>`. If you disagree with a decision that developer</internals/team>`. If you disagree with a decision that has been made, please post a message to |django-developers|. * If you're unsure if you should be making a change, don't make the Loading
