summaryrefslogtreecommitdiff
path: root/docs/internals
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2014-07-13 22:24:21 +0200
committerAymeric Augustin <aymeric.augustin@m4x.org>2014-08-01 14:41:25 +0200
commitf8aeeff291f83b8b0cf767b41ca5bdc6192db296 (patch)
treee9be4371661a484470fa88be057c16b335b3d5c6 /docs/internals
parenta4ead67ee9000a41f7bdca2978c5b2e309066220 (diff)
Removed references to well-known political systems.
Some cultures can't handle these words.
Diffstat (limited to 'docs/internals')
-rw-r--r--docs/internals/organization.txt15
1 files changed, 4 insertions, 11 deletions
diff --git a/docs/internals/organization.txt b/docs/internals/organization.txt
index 17caf54583..ce40b67e89 100644
--- a/docs/internals/organization.txt
+++ b/docs/internals/organization.txt
@@ -21,17 +21,10 @@ and its community.
.. _Django Code of Conduct: https://www.djangoproject.com/conduct/
.. _Django Software Foundation: https://www.djangoproject.com/foundation/
-Since 2014, the Django Project is an aristocracy_. The Django core team makes
-the decisions, elects its technical board, and nominates new team members.
-While it holds decision power in theory, it aims at using it as rarely as
-possible in practice. Rough consensus should be the norm and formal voting an
-exception.
-
-Until 2014, the Django Project was a benevolent_ dictatorship_.
-
-.. _aristocracy: http://en.wikipedia.org/wiki/Aristocracy
-.. _benevolent: http://www.holovaty.com/writing/bdfls-retiring/
-.. _dictatorship: http://jacobian.org/writing/retiring-as-bdfls/
+The Django core team makes the decisions, nominates its new members, and
+elects its technical board. While it holds decision power in theory, it aims
+at using it as rarely as possible in practice. Rough consensus should be the
+norm and formal voting an exception.
.. _core-team: