From 5ad48a9ef2f83d06e94e7ca0988c4b7218aae0fb Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Sun, 13 Jul 2014 09:58:53 +0200 Subject: Renamed "committers" to "team". --- docs/faq/general.txt | 5 +- docs/index.txt | 2 +- docs/internals/committers.txt | 568 --------------------- docs/internals/contributing/bugs-and-features.txt | 6 +- docs/internals/contributing/committing-code.txt | 2 +- docs/internals/contributing/triaging-tickets.txt | 11 +- .../contributing/writing-code/working-with-git.txt | 2 +- docs/internals/index.txt | 2 +- docs/internals/team.txt | 565 ++++++++++++++++++++ 9 files changed, 579 insertions(+), 584 deletions(-) delete mode 100644 docs/internals/committers.txt create mode 100644 docs/internals/team.txt diff --git a/docs/faq/general.txt b/docs/faq/general.txt index 6bee5a1fdd..610236fde9 100644 --- a/docs/faq/general.txt +++ b/docs/faq/general.txt @@ -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 -`. +newspaper in Lawrence, Kansas, USA. Django's now run by an international +:doc:`team of volunteers `. Which sites use Django? ----------------------- diff --git a/docs/index.txt b/docs/index.txt index 78f07bd4df..c5addd5078 100644 --- a/docs/index.txt +++ b/docs/index.txt @@ -310,7 +310,7 @@ you can contribute: * **Community:** :doc:`How to get involved ` | :doc:`The release process ` | - :doc:`Team of committers ` | + :doc:`Meet the team ` | :doc:`The Django source code repository ` | :doc:`Security policies ` | :doc:`Mailing lists ` diff --git a/docs/internals/committers.txt b/docs/internals/committers.txt deleted file mode 100644 index aebc6a2fdf..0000000000 --- a/docs/internals/committers.txt +++ /dev/null @@ -1,568 +0,0 @@ -================= -Django committers -================= - -The original team -================= - -Django originally started at World Online, the Web department of the `Lawrence -Journal-World`_ of Lawrence, Kansas, USA. - -`Adrian Holovaty`_ - Adrian is a Web developer with a background in journalism. He's known in - journalism circles as one of the pioneers of "journalism via computer - programming", and in technical circles as "the guy who invented Django." - - He was lead developer at World Online for 2.5 years, during which time - Django was developed and implemented on World Online's sites. He was the - leader and founder of EveryBlock_, a "news feed for your block." He now - develops Soundslice_. - - Adrian lives in Chicago, USA. - -`Simon Willison`_ - Simon is a well-respected Web developer from England. He had a one-year - internship at World Online, during which time he and Adrian developed Django - from scratch. The most enthusiastic Brit you'll ever meet, he's passionate - about best practices in Web development and maintains a well-read - `web-development blog`_. - - Simon lives in Brighton, England. - -`Jacob Kaplan-Moss`_ - Jacob is Director of Platform Security at Heroku_. He worked at World - Online for four years, where he helped open source Django and found - the Django Software Foundation. Jacob lives on a hobby farm outside of - Lawrence where he spends his weekends playing with dirt and power tools. - -`Wilson Miner`_ - Wilson's design-fu is what makes Django look so nice. He designed the - Web site you're looking at right now, as well as Django's acclaimed admin - interface. Wilson was the designer for EveryBlock and Rdio_. He now - designs for Facebook. - - Wilson lives in San Francisco, USA. - -.. _lawrence journal-world: http://ljworld.com/ -.. _adrian holovaty: http://holovaty.com/ -.. _everyblock: http://everyblock.com/ -.. _soundslice: http://www.soundslice.com/ -.. _simon willison: http://simonwillison.net/ -.. _web-development blog: `simon willison`_ -.. _jacob kaplan-moss: http://jacobian.org/ -.. _revolution systems: http://revsys.com/ -.. _wilson miner: http://wilsonminer.com/ -.. _heroku: http://heroku.com/ -.. _Rdio: http://rdio.com - -Current developers -================== - -Currently, Django is led by a team of volunteers from around the globe. - -Core developers ---------------- - -These are the folks who have a long history of contributions, a solid track -record of being helpful on the mailing lists, and a proven desire to dedicate -serious time to Django. In return, they've been granted the coveted commit bit, -and have free rein to hack on all parts of Django. - -Malcolm Tredinnick - Malcolm originally wanted to be a mathematician, somehow ended up a software - developer. He's contributed to many Open Source projects, has served on the - board of the GNOME foundation, and will kick your ass at chess. - - When he's not busy being an International Man of Mystery, Malcolm lives in - Sydney, Australia. - - *Malcolm passed away on March 17, 2013.* - -`Luke Plant`_ - At University Luke studied physics and Materials Science and also - met `Michael Meeks`_ who introduced him to Linux and Open Source, - re-igniting an interest in programming. Since then he has - contributed to a number of Open Source projects and worked - professionally as a developer. - - Luke has contributed many excellent improvements to Django, - including database-level improvements, the CSRF middleware and - many unit tests. - - Luke currently works for a church in Bradford, UK, and part-time - as a freelance developer. - - .. _luke plant: http://lukeplant.me.uk/ - .. _michael meeks: http://en.wikipedia.org/wiki/Michael_Meeks_(software) - -`Russell Keith-Magee`_ - Russell studied physics as an undergraduate, and studied neural networks for - his PhD. His first job was with a startup in the defense industry developing - simulation frameworks. Over time, mostly through work with Django, he's - become more involved in Web development. - - Russell has helped with several major aspects of Django, including a - couple major internal refactorings, creation of the test system, and more. - - Russell lives in the most isolated capital city in the world — Perth, - Australia. - - .. _russell keith-magee: http://cecinestpasun.com/ - -`James Bennett`_ - James is Django's release manager, and also contributes to the - documentation and provide the occasional bugfix. - - James came to Web development from philosophy when he discovered - that programmers get to argue just as much while collecting much - better pay. He lives in Lawrence, Kansas and previously worked at - World Online; currently, he's part of the Web development team at - Mozilla. - - He `keeps a blog`_, and enjoys fine port and talking to his car. - - .. _james bennett: http://b-list.org/ - .. _keeps a blog: `james bennett`_ - -`Gary Wilson`_ - Gary starting contributing patches to Django in 2006 while developing Web - applications for `The University of Texas`_ (UT). Since, he has made - contributions to the email and forms systems, as well as many other - improvements and code cleanups throughout the code base. - - Gary is currently a developer and software engineering graduate student at - UT, where his dedication to spreading the ways of Python and Django never - ceases. - - Gary lives in Austin, Texas, USA. - - .. _Gary Wilson: http://thegarywilson.com/ - .. _The University of Texas: http://www.utexas.edu/ - -Matt Boersma - Matt is responsible for Django's Oracle support. - -Ian Kelly - Ian is also responsible for Django's support for Oracle. - -Joseph Kocherhans - Joseph was the director of lead development at EveryBlock and previously - developed at the Lawrence Journal-World. He is treasurer of the `Django - Software Foundation`_. He often disappears for several days into the woods, - attempts to teach himself computational linguistics, and annoys his - neighbors with his Charango_ playing. - - Joseph's first contribution to Django was a series of improvements to the - authorization system leading up to support for pluggable authorization. - Since then, he's worked on the new forms system, its use in the admin, and - many other smaller improvements. - - Joseph lives in Chicago, USA. - - .. _django software foundation: https://www.djangoproject.com/foundation/ - .. _charango: http://en.wikipedia.org/wiki/Charango - -`Brian Rosner`_ - Brian is the Chief Architect at Eldarion_ managing and developing - Django / Pinax_ based Web sites. He enjoys learning more about programming - languages and system architectures and contributing to open source - projects. - - Brian helped immensely in getting Django's "newforms-admin" branch finished - in time for Django 1.0; he's now a full committer, continuing to improve on - the admin and forms system. - - Brian lives in Denver, Colorado, USA. - - .. _brian rosner: http://brosner.com/ - .. _eldarion: http://eldarion.com/ - .. _pinax: http://pinaxproject.com/ - -Justin Bronn - Justin Bronn is a computer scientist and attorney specializing - in legal topics related to intellectual property and spatial law. - - In 2007, Justin began developing ``django.contrib.gis`` in a branch, - a.k.a. GeoDjango_, which was merged in time for Django 1.0. While - implementing GeoDjango, Justin obtained a deep knowledge of Django's - internals including the ORM, the admin, and Oracle support. - - Justin lives in San Francisco, CA. - - .. _GeoDjango: http://geodjango.org/ - -Karen Tracey - Karen has a background in distributed operating systems (graduate school), - communications software (industry) and crossword puzzle construction - (freelance). The last of these brought her to Django, in late 2006, when - she set out to put a Web front-end on her crossword puzzle database. - That done, she stuck around in the community answering questions, debugging - problems, etc. -- because coding puzzles are as much fun as word puzzles. - - Karen lives in Apex, NC, USA. - -`Jannis Leidel`_ - Jannis graduated in media design from `Bauhaus-University Weimar`_, - is the author of a number of pluggable Django apps and likes to - contribute to Open Source projects like virtualenv_ and pip_. - - He has worked on Django's auth, admin and staticfiles apps as well as - the form, core, internationalization and test systems. He currently works - at Mozilla_. - - Jannis lives in Berlin, Germany. - - .. _Jannis Leidel: https://jezdez.com/ - .. _Bauhaus-University Weimar: http://www.uni-weimar.de/ - .. _virtualenv: http://www.virtualenv.org/ - .. _pip: http://www.pip-installer.org/ - .. _Mozilla: http://www.mozilla.org/ - -`James Tauber`_ - James is the lead developer of Pinax_ and the CEO and founder of - Eldarion_. He has been doing open source software since 1993, Python - since 1998 and Django since 2006. He serves on the board of the Python - Software Foundation and is currently on a leave of absence from a PhD in - linguistics. - - James currently lives in Boston, MA, USA but originally hails from - Perth, Western Australia where he attended the same high school as - Russell Keith-Magee. - - .. _James Tauber: http://jtauber.com/ - -`Alex Gaynor`_ - Alex is a software engineer working at Rackspace_. He found Django in 2007 and - has been addicted ever since he found out you don't need to write out your - forms by hand. He has a small obsession with compilers. He's contributed - to the ORM, forms, admin, and other components of Django. - - Alex lives in San Francisco, CA, USA. - - .. _Alex Gaynor: http://alexgaynor.net - .. _Rackspace: http://www.rackspace.com - -`Simon Meers`_ - Simon discovered Django 0.96 during his Computer Science PhD research and - has been developing with it full-time ever since. His core code - contributions are mostly in Django's admin application. - - Simon works as a freelance developer based in Wollongong, Australia. - - .. _Simon Meers: http://simonmeers.com/ - -`Andrew Godwin`_ - Andrew is a freelance Python developer and tinkerer, and has been - developing against Django since 2007. He graduated from Oxford University - with a degree in Computer Science, and has become most well known - in the Django community for his work on South, the schema migrations - library. - - Andrew lives in London, UK. - - .. _Andrew Godwin: http://www.aeracode.org/ - -`Carl Meyer`_ - Carl has been working with Django since 2007 (long enough to remember - queryset-refactor, but not magic-removal), and works as a freelance - developer with OddBird_. He became a Django contributor by accident, - because fixing bugs is more interesting than working around them. - - Carl lives in Rapid City, SD, USA. - - .. _Carl Meyer: http://www.oddbird.net/ - .. _OddBird: http://www.oddbird.net/ - -Ramiro Morales - Ramiro has been reading Django source code and submitting patches since - mid-2006 after researching for a Python Web tool with matching awesomeness - and being pointed to it by an old ninja. - - A software developer in the electronic transactions industry, he is a - living proof of the fact that anyone with enough enthusiasm can contribute - to Django, learning a lot and having fun in the process. - - Ramiro lives in Córdoba, Argentina. - -`Gabriel Hurley`_ - Gabriel has been working with Django since 2008, shortly after the 1.0 - release. Convinced by his business partner that Python and Django were the - right direction for the company, he couldn't have been more happy with the - decision. His contributions range across many areas in Django, but years of - copy-editing and an eye for detail lead him to be particularly at home - while working on Django's documentation. - - Gabriel works as a web developer in Berkeley, CA, USA. - - .. _gabriel hurley: http://strikeawe.com/ - -`Chris Beaven`_ - Chris has been submitting patches and suggesting crazy ideas for Django - since early 2006. An advocate for community involvement and a long-term - triager, he is still often found answering questions in the #django IRC - channel. - - Chris lives in Napier, New Zealand (adding to the pool of Oceanic core - developers). He works remotely as a developer for `Lincoln Loop`_. - - .. _Chris Beaven: http://smileychris.com/ - .. _Lincoln Loop: http://lincolnloop.com/ - -Honza Král - Honza first discovered Django in 2006 and started using it right away, - first for school and personal projects and later in his full-time job. He - contributed various patches and fixes mostly to the newforms library, - newforms admin and, through participation in the Google Summer of Code - project, assisted in creating the :ref:`model validation - ` functionality. - - He is currently working for `Whiskey Media`_ in San Francisco developing - awesome sites running on pure Django. - - .. _Whiskey Media: http://www.whiskeymedia.com/ - -Tim Graham - When exploring Web frameworks for an independent study project in the fall - of 2008, Tim discovered Django and was lured to it by the documentation. - He enjoys contributing to the docs because they're awesome. - - Tim works as a software engineer and lives in Philadelphia, PA, USA. - -`Idan Gazit`_ - As a self-professed design geek, Idan was initially attracted to Django - sometime between magic-removal and queryset-refactor. Formally trained - as a software engineer, Idan straddles the worlds of design and code, - jack of two trades and master of none. He is passionate about usability - and finding novel ways to extract meaning from data, and is a longtime - photographer_. - - Idan previously accepted freelance work under the Pixane_ imprint, but - now splits his days between his startup, Skills_, and beautifying all - things Django and Python. - - .. _Idan Gazit: http://idan.gazit.me - .. _photographer: http://flickr.com/photos/idangazit - .. _Pixane: http://pixane.com - .. _Skills: http://skillsapp.com - -`Paul McMillan`_ - Paul found Django in 2008 while looking for a more - structured approach to web programming. He stuck around after - figuring out that the developers of Django had already invented - many of the wheels he needed. His passion for breaking (and then - fixing) things led to his current role working to maintain and - improve the security of Django. - - Paul works in Berkeley, California as a `web developer`_ and `security - consultant`_. - - .. _Paul McMillan: http://subversivecode.com - .. _web developer: http://zerocoordinate.com - .. _security consultant: http://subversivecode.com/about - -`Julien Phalip`_ - Julien has a background in software engineering and human-computer - interaction. As a Web developer, he enjoys tinkering with the backend as - much as designing and coding user interfaces. Julien discovered Django in - 2007 while doing his PhD in Computing Sciences. Since then he has - contributed patches to various components of the framework, in particular - the admin. Julien was a co-founder of the `Interaction Consortium`_. He - now works at Odopod_, a digital agency based in San Francisco, CA, USA. - - .. _Julien Phalip: http://julienphalip.com - .. _Interaction Consortium: http://interaction.net.au - .. _Odopod: http://odopod.com - -`Aymeric Augustin`_ - Aymeric is an engineer with a background in mathematics and computer - science. He chose Django because he believes that software should be simple, - explicit and tested. His perfectionist tendencies quickly led him to triage - tickets and contribute patches. - - Aymeric has a pragmatic approach to software engineering, can't live without - a continuous integration server, and likes proving that Django is a good - choice for enterprise software. - - He's the CTO of Oscaro_, an e-commerce company based in Paris, France. - - .. _Aymeric Augustin: https://myks.org/ - .. _Oscaro: http://www.oscaro.com/ - -`Claude Paroz`_ - Claude is a former teacher who fell in love with free software at the - beginning of the 21st century. He's now working as freelancer in Web - development in his native Switzerland. He has found in Django a perfect - match for his needs of a stable, clean, documented and well-maintained Web - framework. - - He's also helping the GNOME Translation Project as maintainer of the - Django-based `l10n.gnome.org`_. - - .. _Claude Paroz: http://www.2xlibre.net - .. _l10n.gnome.org: https://l10n.gnome.org - -Anssi Kääriäinen - Anssi works as a developer at Finnish National Institute for Health and - Welfare. He is also a computer science student at Aalto University. In his - work he uses Django for developing internal business applications and sees - Django as a great match for that use case. - - Anssi is interested in developing the object relational mapper (ORM) and - all related features. He's also a fan of benchmarking and he tries keep - Django as fast as possible. - -Florian Apolloner - Florian is currently studying Physics at the `Graz University of Technology`_. - Soon after he started using Django he joined the `Ubuntuusers webteam`_ to - work on *Inyoka*, the software powering the whole Ubuntuusers site. - - For the time being he lives in Graz, Austria (not Australia ;)). - - .. _Graz University of Technology: http://tugraz.at/ - .. _Ubuntuusers webteam: http://wiki.ubuntuusers.de/ubuntuusers/Webteam - -Jeremy Dunck - Jeremy was rescued from corporate IT drudgery by Free Software and, in part, - Django. Many of Jeremy's interests center around access to information. - - Jeremy was the lead developer of Pegasus News, one of the first uses of - Django outside World Online, and has since joined Votizen, a startup intent - on reducing the influence of money in politics. - - He serves as DSF Secretary, organizes and helps organize sprints, cares - about the health and equity of the Django community. He has gone an - embarrassingly long time without a working blog. - - Jeremy lives in Mountain View, CA, USA. - -`Bryan Veloso`_ - Bryan found Django 0.96 through a fellow designer who was evangelizing - its use. It was his first foray outside of the land that was PHP-based - templating. Although he has only ever used Django for personal projects, - it is the very reason he considers himself a designer/developer - hybrid and is working to further design within the Django community. - - Bryan works as a designer at GitHub by day, and masquerades as a `vlogger`_ - and `shoutcaster`_ in the after-hours. Bryan lives in Los Angeles, CA, USA. - - .. _bryan veloso: http://avalonstar.com/ - .. _vlogger: http://youtube.com/bryanveloso/ - .. _shoutcaster: http://twitch.tv/vlogalonstar/ - -`Preston Holmes`_ - Preston is a recovering neuroscientist who originally discovered Django as - part of a sweeping move to Python from a grab bag of half a dozen - languages. He was drawn to Django's balance of practical batteries included - philosophy, care and thought in code design, and strong open source - community. Currently working for Amazon Web Services, he is always looking - for opportunities to volunteer for community oriented education projects, - such as for kids and scientists (e.g. Software Carpentry). - - Preston lives with his family and animal menagerie in Santa Barbara, CA, USA. - - .. _Preston Holmes: http://www.ptone.com/ - -`Simon Charette`_ - Simon is a mathematics student who discovered Django while searching for a - replacement framework to an in-house PHP entity. Since that faithful day - Django has been a big part of his life. So far, he's been involved in some - ORM and forms API fixes. - - Apart from contributing to multiple open source projects he spends most of - his spare-time playing `Ultimate Frisbee`_ and working part-time - at this awesome place called `Reptiletech`_. - - Simon lives in Montréal, Québec, Canada. - - .. _Simon Charette: https://github.com/charettes - .. _Ultimate Frisbee: http://www.montrealultimate.ca - .. _Reptiletech: http://www.reptiletech.com - -Donald Stufft - Donald found Python and Django in 2007 while trying to find a language, - and web framework that he really enjoyed using after many years of PHP. He - fell in love with the beauty of Python and the way Django made tasks simple - and easy. His contributions to Django focus primarily on ensuring that it - is and remains a secure web framework. - - Donald currently works at `Nebula Inc`_ as a Software Engineer for their - security team and lives in the Greater Philadelphia Area. - - .. _Nebula Inc: https://www.nebula.com/ - -Marc Tamlyn - Marc started life on the web using Django 1.2 back in 2010, and has never - looked back. He was involved with rewriting the class based view - documentation at DjangoCon EU 2012, and also helped to develop `CCBV`_, an - additional class based view reference tool. - - Marc is currently a full-time parent, part-time developer, and lives in - Oxford, UK. - - .. _CCBV: http://ccbv.co.uk/ - -Shai Berger - Shai started working with Python back in 1998, and with Django just - before 1.0. He is a Free Software enthusiast, but life happens, and - he was driven by consulting gigs to contribute to the Oracle and - SQL Server backends of South, and then the Oracle backend of Django - itself. Finally, he joined core to help maintain the Oracle backend. - - Shai works for `Platonix`_, a small consulting company he started - with a few friends in 1996, and lives near Tel Aviv, Israel. - - .. _Platonix: http://tech.platonix.com - -Baptiste Mispelon - Baptiste discovered Django around the 1.2 version and promptly switched away - from his homegrown PHP framework. He started getting more involved in the - project after attending DjangoCon EU 2012, mostly by triaging tickets and - submitting small patches. - - Baptiste currently lives in Budapest, Hungary and works for `M2BPO`_, - a small French company providing services to architects. - - .. _M2BPO: http://www.m2bpo.fr - -`Daniele Procida`_ - Daniele works at Cardiff University `School of Medicine`_. He unexpectedly - became a Django developer on 29th April 2009. Since then he has relied - daily on Django's documentation, which has been a constant companion to - him. More recently he has been able to contribute back to the project by - helping improve the documentation itself. - - He is the author of `Arkestra`_ and `Don't be afraid to commit`_. - - .. _Daniele Procida: http://medicine.cf.ac.uk/person/mr-daniele-marco-procida/ - .. _School of Medicine: http://medicine.cf.ac.uk/ - .. _Arkestra: http://arkestra-project.org/ - .. _Don\'t be afraid to commit: https://dont-be-afraid-to-commit.readthedocs.org - -`Erik Romijn`_ - Erik started using Django in the days of 1.2. His largest contribution to Django was - ``GenericIPAddressField``, and he has worked on all sorts of patches since. - While developing with Django, he always keeps a little list of even the slightest - Django frustrations, to tackle them at a later time and prevent other developers - from having to deal with the same issues. - - Erik is an independent app maker, mostly developing web and mobile apps, as - `Solid Links`_. He also enjoys helping ordinary developers to build safer web apps, - for which Django is already a great start, and developed `Erik's Pony Checkup`_ with - that goal in mind. Erik lives in Amsterdam, The Netherlands. - - .. _Erik Romijn: http://erik.io/ - .. _Solid Links: http://solidlinks.nl/ - .. _Erik's Pony Checkup: http://ponycheckup.com/ - -Developers Emeritus -=================== - -Georg "Hugo" Bauer - Georg created Django's internationalization system, managed i18n - contributions and made a ton of excellent tweaks, feature additions and bug - fixes. - -Robert Wittams - Robert was responsible for the *first* refactoring of Django's admin - application to allow for easier reuse and has made a ton of - excellent tweaks, feature additions and bug fixes. diff --git a/docs/internals/contributing/bugs-and-features.txt b/docs/internals/contributing/bugs-and-features.txt index 636bd27e57..842c4236b4 100644 --- a/docs/internals/contributing/bugs-and-features.txt +++ b/docs/internals/contributing/bugs-and-features.txt @@ -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` may call for a formal vote +Any :doc:`core committer` may call for a formal vote using the same voting mechanism above. A proposition will be considered carried by the core team if: @@ -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 diff --git a/docs/internals/contributing/committing-code.txt b/docs/internals/contributing/committing-code.txt index 5de2ef0378..ff5cce00ea 100644 --- a/docs/internals/contributing/committing-code.txt +++ b/docs/internals/contributing/committing-code.txt @@ -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. diff --git a/docs/internals/contributing/triaging-tickets.txt b/docs/internals/contributing/triaging-tickets.txt index 76aee6646e..f274c2ab68 100644 --- a/docs/internals/contributing/triaging-tickets.txt +++ b/docs/internals/contributing/triaging-tickets.txt @@ -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` (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 @@ -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`. + closed as "wontfix" by a :doc:`core developer`. * duplicate Used when another ticket covers the same issue. By closing duplicate @@ -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`. If you disagree with a decision that + developer`. 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 diff --git a/docs/internals/contributing/writing-code/working-with-git.txt b/docs/internals/contributing/writing-code/working-with-git.txt index 9d48835cf1..81c8b8a682 100644 --- a/docs/internals/contributing/writing-code/working-with-git.txt +++ b/docs/internals/contributing/writing-code/working-with-git.txt @@ -7,7 +7,7 @@ requests. If you're interested in how core developers handle them, see Below, we are going to show how to create a GitHub pull request containing the changes for Trac ticket #xxxxx. By creating a fully-ready pull request you -will make the committers' job easier, meaning that your work is more likely to +will make the reviewer's job easier, meaning that your work is more likely to be merged into Django. You could also upload a traditional patch to Trac, but it's less practical for diff --git a/docs/internals/index.txt b/docs/internals/index.txt index cd38c28723..02c1c5bb1b 100644 --- a/docs/internals/index.txt +++ b/docs/internals/index.txt @@ -18,7 +18,7 @@ the hood". contributing/index mailing-lists - committers + team security release-process deprecation diff --git a/docs/internals/team.txt b/docs/internals/team.txt new file mode 100644 index 0000000000..cb20fa68a9 --- /dev/null +++ b/docs/internals/team.txt @@ -0,0 +1,565 @@ +=========== +Django team +=========== + +The original team +================= + +Django originally started at World Online, the Web department of the `Lawrence +Journal-World`_ of Lawrence, Kansas, USA. + +`Adrian Holovaty`_ + Adrian is a Web developer with a background in journalism. He's known in + journalism circles as one of the pioneers of "journalism via computer + programming", and in technical circles as "the guy who invented Django." + + He was lead developer at World Online for 2.5 years, during which time + Django was developed and implemented on World Online's sites. He was the + leader and founder of EveryBlock_, a "news feed for your block." He now + develops Soundslice_. + + Adrian lives in Chicago, USA. + +`Simon Willison`_ + Simon is a well-respected Web developer from England. He had a one-year + internship at World Online, during which time he and Adrian developed Django + from scratch. The most enthusiastic Brit you'll ever meet, he's passionate + about best practices in Web development and maintains a well-read + `web-development blog`_. + + Simon lives in Brighton, England. + +`Jacob Kaplan-Moss`_ + Jacob is Director of Platform Security at Heroku_. He worked at World + Online for four years, where he helped open source Django and found + the Django Software Foundation. Jacob lives on a hobby farm outside of + Lawrence where he spends his weekends playing with dirt and power tools. + +`Wilson Miner`_ + Wilson's design-fu is what makes Django look so nice. He designed the + Web site you're looking at right now, as well as Django's acclaimed admin + interface. Wilson was the designer for EveryBlock and Rdio_. He now + designs for Facebook. + + Wilson lives in San Francisco, USA. + +.. _lawrence journal-world: http://ljworld.com/ +.. _adrian holovaty: http://holovaty.com/ +.. _everyblock: http://everyblock.com/ +.. _soundslice: http://www.soundslice.com/ +.. _simon willison: http://simonwillison.net/ +.. _web-development blog: `simon willison`_ +.. _jacob kaplan-moss: http://jacobian.org/ +.. _revolution systems: http://revsys.com/ +.. _wilson miner: http://wilsonminer.com/ +.. _heroku: http://heroku.com/ +.. _Rdio: http://rdio.com + +The current team +================ + +Currently, Django is led by a team of volunteers from around the globe. + +These are the folks who have a long history of contributions, a solid track +record of being helpful on the mailing lists, and a proven desire to dedicate +serious time to Django. In return, they've been granted the coveted commit bit, +and have free rein to hack on all parts of Django. + +Malcolm Tredinnick + Malcolm originally wanted to be a mathematician, somehow ended up a software + developer. He's contributed to many Open Source projects, has served on the + board of the GNOME foundation, and will kick your ass at chess. + + When he's not busy being an International Man of Mystery, Malcolm lives in + Sydney, Australia. + + *Malcolm passed away on March 17, 2013.* + +`Luke Plant`_ + At University Luke studied physics and Materials Science and also + met `Michael Meeks`_ who introduced him to Linux and Open Source, + re-igniting an interest in programming. Since then he has + contributed to a number of Open Source projects and worked + professionally as a developer. + + Luke has contributed many excellent improvements to Django, + including database-level improvements, the CSRF middleware and + many unit tests. + + Luke currently works for a church in Bradford, UK, and part-time + as a freelance developer. + + .. _luke plant: http://lukeplant.me.uk/ + .. _michael meeks: http://en.wikipedia.org/wiki/Michael_Meeks_(software) + +`Russell Keith-Magee`_ + Russell studied physics as an undergraduate, and studied neural networks for + his PhD. His first job was with a startup in the defense industry developing + simulation frameworks. Over time, mostly through work with Django, he's + become more involved in Web development. + + Russell has helped with several major aspects of Django, including a + couple major internal refactorings, creation of the test system, and more. + + Russell lives in the most isolated capital city in the world — Perth, + Australia. + + .. _russell keith-magee: http://cecinestpasun.com/ + +`James Bennett`_ + James is Django's release manager, and also contributes to the + documentation and provide the occasional bugfix. + + James came to Web development from philosophy when he discovered + that programmers get to argue just as much while collecting much + better pay. He lives in Lawrence, Kansas and previously worked at + World Online; currently, he's part of the Web development team at + Mozilla. + + He `keeps a blog`_, and enjoys fine port and talking to his car. + + .. _james bennett: http://b-list.org/ + .. _keeps a blog: `james bennett`_ + +`Gary Wilson`_ + Gary starting contributing patches to Django in 2006 while developing Web + applications for `The University of Texas`_ (UT). Since, he has made + contributions to the email and forms systems, as well as many other + improvements and code cleanups throughout the code base. + + Gary is currently a developer and software engineering graduate student at + UT, where his dedication to spreading the ways of Python and Django never + ceases. + + Gary lives in Austin, Texas, USA. + + .. _Gary Wilson: http://thegarywilson.com/ + .. _The University of Texas: http://www.utexas.edu/ + +Matt Boersma + Matt is responsible for Django's Oracle support. + +Ian Kelly + Ian is also responsible for Django's support for Oracle. + +Joseph Kocherhans + Joseph was the director of lead development at EveryBlock and previously + developed at the Lawrence Journal-World. He is treasurer of the `Django + Software Foundation`_. He often disappears for several days into the woods, + attempts to teach himself computational linguistics, and annoys his + neighbors with his Charango_ playing. + + Joseph's first contribution to Django was a series of improvements to the + authorization system leading up to support for pluggable authorization. + Since then, he's worked on the new forms system, its use in the admin, and + many other smaller improvements. + + Joseph lives in Chicago, USA. + + .. _django software foundation: https://www.djangoproject.com/foundation/ + .. _charango: http://en.wikipedia.org/wiki/Charango + +`Brian Rosner`_ + Brian is the Chief Architect at Eldarion_ managing and developing + Django / Pinax_ based Web sites. He enjoys learning more about programming + languages and system architectures and contributing to open source + projects. + + Brian helped immensely in getting Django's "newforms-admin" branch finished + in time for Django 1.0; he's now a full committer, continuing to improve on + the admin and forms system. + + Brian lives in Denver, Colorado, USA. + + .. _brian rosner: http://brosner.com/ + .. _eldarion: http://eldarion.com/ + .. _pinax: http://pinaxproject.com/ + +Justin Bronn + Justin Bronn is a computer scientist and attorney specializing + in legal topics related to intellectual property and spatial law. + + In 2007, Justin began developing ``django.contrib.gis`` in a branch, + a.k.a. GeoDjango_, which was merged in time for Django 1.0. While + implementing GeoDjango, Justin obtained a deep knowledge of Django's + internals including the ORM, the admin, and Oracle support. + + Justin lives in San Francisco, CA. + + .. _GeoDjango: http://geodjango.org/ + +Karen Tracey + Karen has a background in distributed operating systems (graduate school), + communications software (industry) and crossword puzzle construction + (freelance). The last of these brought her to Django, in late 2006, when + she set out to put a Web front-end on her crossword puzzle database. + That done, she stuck around in the community answering questions, debugging + problems, etc. -- because coding puzzles are as much fun as word puzzles. + + Karen lives in Apex, NC, USA. + +`Jannis Leidel`_ + Jannis graduated in media design from `Bauhaus-University Weimar`_, + is the author of a number of pluggable Django apps and likes to + contribute to Open Source projects like virtualenv_ and pip_. + + He has worked on Django's auth, admin and staticfiles apps as well as + the form, core, internationalization and test systems. He currently works + at Mozilla_. + + Jannis lives in Berlin, Germany. + + .. _Jannis Leidel: https://jezdez.com/ + .. _Bauhaus-University Weimar: http://www.uni-weimar.de/ + .. _virtualenv: http://www.virtualenv.org/ + .. _pip: http://www.pip-installer.org/ + .. _Mozilla: http://www.mozilla.org/ + +`James Tauber`_ + James is the lead developer of Pinax_ and the CEO and founder of + Eldarion_. He has been doing open source software since 1993, Python + since 1998 and Django since 2006. He serves on the board of the Python + Software Foundation and is currently on a leave of absence from a PhD in + linguistics. + + James currently lives in Boston, MA, USA but originally hails from + Perth, Western Australia where he attended the same high school as + Russell Keith-Magee. + + .. _James Tauber: http://jtauber.com/ + +`Alex Gaynor`_ + Alex is a software engineer working at Rackspace_. He found Django in 2007 and + has been addicted ever since he found out you don't need to write out your + forms by hand. He has a small obsession with compilers. He's contributed + to the ORM, forms, admin, and other components of Django. + + Alex lives in San Francisco, CA, USA. + + .. _Alex Gaynor: http://alexgaynor.net + .. _Rackspace: http://www.rackspace.com + +`Simon Meers`_ + Simon discovered Django 0.96 during his Computer Science PhD research and + has been developing with it full-time ever since. His core code + contributions are mostly in Django's admin application. + + Simon works as a freelance developer based in Wollongong, Australia. + + .. _Simon Meers: http://simonmeers.com/ + +`Andrew Godwin`_ + Andrew is a freelance Python developer and tinkerer, and has been + developing against Django since 2007. He graduated from Oxford University + with a degree in Computer Science, and has become most well known + in the Django community for his work on South, the schema migrations + library. + + Andrew lives in London, UK. + + .. _Andrew Godwin: http://www.aeracode.org/ + +`Carl Meyer`_ + Carl has been working with Django since 2007 (long enough to remember + queryset-refactor, but not magic-removal), and works as a freelance + developer with OddBird_. He became a Django contributor by accident, + because fixing bugs is more interesting than working around them. + + Carl lives in Rapid City, SD, USA. + + .. _Carl Meyer: http://www.oddbird.net/ + .. _OddBird: http://www.oddbird.net/ + +Ramiro Morales + Ramiro has been reading Django source code and submitting patches since + mid-2006 after researching for a Python Web tool with matching awesomeness + and being pointed to it by an old ninja. + + A software developer in the electronic transactions industry, he is a + living proof of the fact that anyone with enough enthusiasm can contribute + to Django, learning a lot and having fun in the process. + + Ramiro lives in Córdoba, Argentina. + +`Gabriel Hurley`_ + Gabriel has been working with Django since 2008, shortly after the 1.0 + release. Convinced by his business partner that Python and Django were the + right direction for the company, he couldn't have been more happy with the + decision. His contributions range across many areas in Django, but years of + copy-editing and an eye for detail lead him to be particularly at home + while working on Django's documentation. + + Gabriel works as a web developer in Berkeley, CA, USA. + + .. _gabriel hurley: http://strikeawe.com/ + +`Chris Beaven`_ + Chris has been submitting patches and suggesting crazy ideas for Django + since early 2006. An advocate for community involvement and a long-term + triager, he is still often found answering questions in the #django IRC + channel. + + Chris lives in Napier, New Zealand (adding to the pool of Oceanic core + developers). He works remotely as a developer for `Lincoln Loop`_. + + .. _Chris Beaven: http://smileychris.com/ + .. _Lincoln Loop: http://lincolnloop.com/ + +Honza Král + Honza first discovered Django in 2006 and started using it right away, + first for school and personal projects and later in his full-time job. He + contributed various patches and fixes mostly to the newforms library, + newforms admin and, through participation in the Google Summer of Code + project, assisted in creating the :ref:`model validation + ` functionality. + + He is currently working for `Whiskey Media`_ in San Francisco developing + awesome sites running on pure Django. + + .. _Whiskey Media: http://www.whiskeymedia.com/ + +Tim Graham + When exploring Web frameworks for an independent study project in the fall + of 2008, Tim discovered Django and was lured to it by the documentation. + He enjoys contributing to the docs because they're awesome. + + Tim works as a software engineer and lives in Philadelphia, PA, USA. + +`Idan Gazit`_ + As a self-professed design geek, Idan was initially attracted to Django + sometime between magic-removal and queryset-refactor. Formally trained + as a software engineer, Idan straddles the worlds of design and code, + jack of two trades and master of none. He is passionate about usability + and finding novel ways to extract meaning from data, and is a longtime + photographer_. + + Idan previously accepted freelance work under the Pixane_ imprint, but + now splits his days between his startup, Skills_, and beautifying all + things Django and Python. + + .. _Idan Gazit: http://idan.gazit.me + .. _photographer: http://flickr.com/photos/idangazit + .. _Pixane: http://pixane.com + .. _Skills: http://skillsapp.com + +`Paul McMillan`_ + Paul found Django in 2008 while looking for a more + structured approach to web programming. He stuck around after + figuring out that the developers of Django had already invented + many of the wheels he needed. His passion for breaking (and then + fixing) things led to his current role working to maintain and + improve the security of Django. + + Paul works in Berkeley, California as a `web developer`_ and `security + consultant`_. + + .. _Paul McMillan: http://subversivecode.com + .. _web developer: http://zerocoordinate.com + .. _security consultant: http://subversivecode.com/about + +`Julien Phalip`_ + Julien has a background in software engineering and human-computer + interaction. As a Web developer, he enjoys tinkering with the backend as + much as designing and coding user interfaces. Julien discovered Django in + 2007 while doing his PhD in Computing Sciences. Since then he has + contributed patches to various components of the framework, in particular + the admin. Julien was a co-founder of the `Interaction Consortium`_. He + now works at Odopod_, a digital agency based in San Francisco, CA, USA. + + .. _Julien Phalip: http://julienphalip.com + .. _Interaction Consortium: http://interaction.net.au + .. _Odopod: http://odopod.com + +`Aymeric Augustin`_ + Aymeric is an engineer with a background in mathematics and computer + science. He chose Django because he believes that software should be simple, + explicit and tested. His perfectionist tendencies quickly led him to triage + tickets and contribute patches. + + Aymeric has a pragmatic approach to software engineering, can't live without + a continuous integration server, and likes proving that Django is a good + choice for enterprise software. + + He's the CTO of Oscaro_, an e-commerce company based in Paris, France. + + .. _Aymeric Augustin: https://myks.org/ + .. _Oscaro: http://www.oscaro.com/ + +`Claude Paroz`_ + Claude is a former teacher who fell in love with free software at the + beginning of the 21st century. He's now working as freelancer in Web + development in his native Switzerland. He has found in Django a perfect + match for his needs of a stable, clean, documented and well-maintained Web + framework. + + He's also helping the GNOME Translation Project as maintainer of the + Django-based `l10n.gnome.org`_. + + .. _Claude Paroz: http://www.2xlibre.net + .. _l10n.gnome.org: https://l10n.gnome.org + +Anssi Kääriäinen + Anssi works as a developer at Finnish National Institute for Health and + Welfare. He is also a computer science student at Aalto University. In his + work he uses Django for developing internal business applications and sees + Django as a great match for that use case. + + Anssi is interested in developing the object relational mapper (ORM) and + all related features. He's also a fan of benchmarking and he tries keep + Django as fast as possible. + +Florian Apolloner + Florian is currently studying Physics at the `Graz University of Technology`_. + Soon after he started using Django he joined the `Ubuntuusers webteam`_ to + work on *Inyoka*, the software powering the whole Ubuntuusers site. + + For the time being he lives in Graz, Austria (not Australia ;)). + + .. _Graz University of Technology: http://tugraz.at/ + .. _Ubuntuusers webteam: http://wiki.ubuntuusers.de/ubuntuusers/Webteam + +Jeremy Dunck + Jeremy was rescued from corporate IT drudgery by Free Software and, in part, + Django. Many of Jeremy's interests center around access to information. + + Jeremy was the lead developer of Pegasus News, one of the first uses of + Django outside World Online, and has since joined Votizen, a startup intent + on reducing the influence of money in politics. + + He serves as DSF Secretary, organizes and helps organize sprints, cares + about the health and equity of the Django community. He has gone an + embarrassingly long time without a working blog. + + Jeremy lives in Mountain View, CA, USA. + +`Bryan Veloso`_ + Bryan found Django 0.96 through a fellow designer who was evangelizing + its use. It was his first foray outside of the land that was PHP-based + templating. Although he has only ever used Django for personal projects, + it is the very reason he considers himself a designer/developer + hybrid and is working to further design within the Django community. + + Bryan works as a designer at GitHub by day, and masquerades as a `vlogger`_ + and `shoutcaster`_ in the after-hours. Bryan lives in Los Angeles, CA, USA. + + .. _bryan veloso: http://avalonstar.com/ + .. _vlogger: http://youtube.com/bryanveloso/ + .. _shoutcaster: http://twitch.tv/vlogalonstar/ + +`Preston Holmes`_ + Preston is a recovering neuroscientist who originally discovered Django as + part of a sweeping move to Python from a grab bag of half a dozen + languages. He was drawn to Django's balance of practical batteries included + philosophy, care and thought in code design, and strong open source + community. Currently working for Amazon Web Services, he is always looking + for opportunities to volunteer for community oriented education projects, + such as for kids and scientists (e.g. Software Carpentry). + + Preston lives with his family and animal menagerie in Santa Barbara, CA, USA. + + .. _Preston Holmes: http://www.ptone.com/ + +`Simon Charette`_ + Simon is a mathematics student who discovered Django while searching for a + replacement framework to an in-house PHP entity. Since that faithful day + Django has been a big part of his life. So far, he's been involved in some + ORM and forms API fixes. + + Apart from contributing to multiple open source projects he spends most of + his spare-time playing `Ultimate Frisbee`_ and working part-time + at this awesome place called `Reptiletech`_. + + Simon lives in Montréal, Québec, Canada. + + .. _Simon Charette: https://github.com/charettes + .. _Ultimate Frisbee: http://www.montrealultimate.ca + .. _Reptiletech: http://www.reptiletech.com + +Donald Stufft + Donald found Python and Django in 2007 while trying to find a language, + and web framework that he really enjoyed using after many years of PHP. He + fell in love with the beauty of Python and the way Django made tasks simple + and easy. His contributions to Django focus primarily on ensuring that it + is and remains a secure web framework. + + Donald currently works at `Nebula Inc`_ as a Software Engineer for their + security team and lives in the Greater Philadelphia Area. + + .. _Nebula Inc: https://www.nebula.com/ + +Marc Tamlyn + Marc started life on the web using Django 1.2 back in 2010, and has never + looked back. He was involved with rewriting the class based view + documentation at DjangoCon EU 2012, and also helped to develop `CCBV`_, an + additional class based view reference tool. + + Marc is currently a full-time parent, part-time developer, and lives in + Oxford, UK. + + .. _CCBV: http://ccbv.co.uk/ + +Shai Berger + Shai started working with Python back in 1998, and with Django just + before 1.0. He is a Free Software enthusiast, but life happens, and + he was driven by consulting gigs to contribute to the Oracle and + SQL Server backends of South, and then the Oracle backend of Django + itself. Finally, he joined core to help maintain the Oracle backend. + + Shai works for `Platonix`_, a small consulting company he started + with a few friends in 1996, and lives near Tel Aviv, Israel. + + .. _Platonix: http://tech.platonix.com + +Baptiste Mispelon + Baptiste discovered Django around the 1.2 version and promptly switched away + from his homegrown PHP framework. He started getting more involved in the + project after attending DjangoCon EU 2012, mostly by triaging tickets and + submitting small patches. + + Baptiste currently lives in Budapest, Hungary and works for `M2BPO`_, + a small French company providing services to architects. + + .. _M2BPO: http://www.m2bpo.fr + +`Daniele Procida`_ + Daniele works at Cardiff University `School of Medicine`_. He unexpectedly + became a Django developer on 29th April 2009. Since then he has relied + daily on Django's documentation, which has been a constant companion to + him. More recently he has been able to contribute back to the project by + helping improve the documentation itself. + + He is the author of `Arkestra`_ and `Don't be afraid to commit`_. + + .. _Daniele Procida: http://medicine.cf.ac.uk/person/mr-daniele-marco-procida/ + .. _School of Medicine: http://medicine.cf.ac.uk/ + .. _Arkestra: http://arkestra-project.org/ + .. _Don\'t be afraid to commit: https://dont-be-afraid-to-commit.readthedocs.org + +`Erik Romijn`_ + Erik started using Django in the days of 1.2. His largest contribution to Django was + ``GenericIPAddressField``, and he has worked on all sorts of patches since. + While developing with Django, he always keeps a little list of even the slightest + Django frustrations, to tackle them at a later time and prevent other developers + from having to deal with the same issues. + + Erik is an independent app maker, mostly developing web and mobile apps, as + `Solid Links`_. He also enjoys helping ordinary developers to build safer web apps, + for which Django is already a great start, and developed `Erik's Pony Checkup`_ with + that goal in mind. Erik lives in Amsterdam, The Netherlands. + + .. _Erik Romijn: http://erik.io/ + .. _Solid Links: http://solidlinks.nl/ + .. _Erik's Pony Checkup: http://ponycheckup.com/ + +Retired team members +==================== + +Georg "Hugo" Bauer + Georg created Django's internationalization system, managed i18n + contributions and made a ton of excellent tweaks, feature additions and bug + fixes. + +Robert Wittams + Robert was responsible for the *first* refactoring of Django's admin + application to allow for easier reuse and has made a ton of + excellent tweaks, feature additions and bug fixes. -- cgit v1.3 From e9fde1c7ecc9c46ad2ae608a8718a1527b42a1ec Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Sun, 13 Jul 2014 09:59:17 +0200 Subject: Removed references to partial commit acces. --- docs/internals/contributing/committing-code.txt | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/docs/internals/contributing/committing-code.txt b/docs/internals/contributing/committing-code.txt index ff5cce00ea..2f8599de5b 100644 --- a/docs/internals/contributing/committing-code.txt +++ b/docs/internals/contributing/committing-code.txt @@ -10,24 +10,10 @@ community member who wants to contribute code to Django, have a look at Commit access ------------- -Django has two types of committers: - -Core committers - These are people who have a long history of contributions to Django's - codebase, a solid track record of being polite and helpful on the - mailing lists, and a proven desire to dedicate serious time to Django's - development. The bar is high for full commit access. - -Partial committers - These are people who are "domain experts." They have direct check-in - access to the subsystems that fall under their jurisdiction, and they're - given a formal vote in questions that involve their subsystems. This type - of access is likely to be given to someone who contributes a large - sub-framework to Django and wants to continue to maintain it. - - Partial commit access is granted by the same process as full - committers. However, the bar is set lower; proven expertise in the area - in question is likely to be sufficient. +Core developers are people who have a long history of contributions to +Django's codebase, a solid track record of being polite and helpful on the +mailing lists, and a proven desire to dedicate serious time to Django's +development. The bar is high for full commit access. Decisions on new committers will follow the process explained in :ref:`how-we-make-decisions`. To request commit access, please contact an -- cgit v1.3 From 4a475ce1c84cbec9417e3d0ded97dcff5f7a38a4 Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Sun, 13 Jul 2014 16:49:45 +0200 Subject: Introduced a technical board. Extended the scope of the core team a bit (depending on your current perspective on that scope). --- docs/index.txt | 2 + docs/internals/contributing/committing-code.txt | 13 -- docs/internals/index.txt | 2 + docs/internals/organization.txt | 193 ++++++++++++++++++++++++ docs/internals/roles.txt | 10 ++ docs/internals/team.txt | 8 +- 6 files changed, 213 insertions(+), 15 deletions(-) create mode 100644 docs/internals/organization.txt create mode 100644 docs/internals/roles.txt diff --git a/docs/index.txt b/docs/index.txt index c5addd5078..fb20bdf3a1 100644 --- a/docs/index.txt +++ b/docs/index.txt @@ -310,7 +310,9 @@ you can contribute: * **Community:** :doc:`How to get involved ` | :doc:`The release process ` | + :doc:`Team organization ` | :doc:`Meet the team ` | + :doc:`Current roles ` | :doc:`The Django source code repository ` | :doc:`Security policies ` | :doc:`Mailing lists ` diff --git a/docs/internals/contributing/committing-code.txt b/docs/internals/contributing/committing-code.txt index 2f8599de5b..d853d643fa 100644 --- a/docs/internals/contributing/committing-code.txt +++ b/docs/internals/contributing/committing-code.txt @@ -7,19 +7,6 @@ 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. -Commit access -------------- - -Core developers are people who have a long history of contributions to -Django's codebase, a solid track record of being polite and helpful on the -mailing lists, and a proven desire to dedicate serious time to Django's -development. The bar is high for full commit access. - -Decisions on new committers will follow the process explained in -:ref:`how-we-make-decisions`. To request commit access, please contact an -existing committer privately. Public requests for commit access are potential -flame-war starters, and will simply be ignored. - .. _handling-pull-requests: Handling pull requests diff --git a/docs/internals/index.txt b/docs/internals/index.txt index 02c1c5bb1b..807283f0d0 100644 --- a/docs/internals/index.txt +++ b/docs/internals/index.txt @@ -18,7 +18,9 @@ the hood". contributing/index mailing-lists + organization team + roles security release-process deprecation diff --git a/docs/internals/organization.txt b/docs/internals/organization.txt new file mode 100644 index 0000000000..3f2423114b --- /dev/null +++ b/docs/internals/organization.txt @@ -0,0 +1,193 @@ +================================== +Organization of the Django Project +================================== + +Principles +========== + +The Django Project is managed by a team of volunteers pursuing three goals: + +- Driving the development of the Django Web Framework, +- Fostering the ecosystem of Django-related software, +- Leading the Django community in accordance with the values described in the + `Django Code of Conduct`_. + +The Django Project isn't a legal entity. The `Django Software Foundation`_, a +non-profit organization, handles financial and legal matters related to the +Django Project. Other than that, the Django Software Foundation lets the +Django Project manage the development of the Django framework, its ecosystem +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/ + +Core team +========= + +Role +---- + +The core team is the group of trusted volunteers who manage the Django +Project. They assume many roles required to achieve the project's goals, +especially those that require a high level of trust. They make the decisions +that shape the future of the project. + +Core team members are expected to act as role models for the community and +custodians of the project, on behalf of the community and all those who rely +on Django. + +They will intervene, where necessary, in online discussions or at official +Django events on the rare occasions that a situation arises that requires +intervention. + +They have authority over the Django Project infrastructure, including the +Django Project website itself, the Django GitHub organization and +repositories, the Trac bug tracker, the mailing lists, IRC channels, etc. + +Prerogatives +------------ + +Core team members may participate in formal votes, typically to nominate new +team members and to elect the technical board. + +Some contributions don't require commit access. Depending on the reasons why a +contributor joins the team, they may or may not have commit permissions to the +Django code repository. + +However, should the need arise, any team member may ask for commit access by +writing to the core team's mailing list. Access will be granted unless the +person withdraws their request or the technical board vetoes the proposal. + +Core team members who have commit access are referred to as "committers" or +"core developers". + +Other permissions, such as access to the servers, are granted to those who +need them through the same process. + +Membership +---------- + +The core team finds its origins with the :ref:`four people +` who created Django. It has grown to :ref:`a few dozen +people ` by co-opting volunteers who demonstrate: + +- a good grasp of the philosophy of the Django Project +- a solid track record of being constructive and helpful +- significant contributions to the project's goals, in any form +- willingness to dedicate some time to improving Django + +As the project matures, contributions go way beyond code. Here's an incomplete +list of areas where contributions may be considered for joining the core team, +in no particular order: + +- Working on community management and outreach +- Providing support on the mailing-lists and on IRC +- Triaging tickets +- Writing patches (code, docs, or tests) +- Reviewing patches (code, docs, or tests) +- Participating in design decisions +- Providing expertise in a particular domain (security, i18n, etc.) +- Managing the continuous integration infrastructure +- Managing the servers (website, tracker, documentation, etc.) +- Maintaining related projects (djangoproject.com site, ex-contrib apps, etc.) +- Creating visual designs + +Very few areas are reserved to core team members: + +- Reviewing security reports +- Merging patches (code, docs, or tests) +- Packaging releases + +Core team membership acknowledges sustained and valuable efforts that align +well with the philosophy and the goals of the Django Project. + +It is granted by a four fifths majority of votes cast in a core team vote and +no veto by the technical board. + +Core team members are always looking for promising contributors, teaching them +how the project is managed, and submitting their names to the core team's vote +when they're ready. If you would like to join the core team, you can contact a +core team member privately or ask for guidance on the :ref:`Django Core +Mentorship mailing-list `. + +There's no time limit on core team membership. However, in order to provide +the general public with a reasonable idea of how many people maintain Django, +core team members who have stopped contributing are encouraged to declare +themselves as "past team members". Those who haven't made any non-trivial +contribution in two years may be asked to move themselves to this category, +and moved there if they don't respond. Past team members lose their privileges +such as voting rights and commit access. + +Technical board +=============== + +Role +---- + +The technical board is a group of experienced and active committers who steer +technical choices. Their main concern is to maintain the quality and stability +of the Django Web Framework. + +Prerogatives +------------ + +The technical board holds two prerogatives: + +- Making major technical decisions when no consensus is found otherwise. This + happens on the |django-developers| mailing-list. +- Veto a grant of commit access or remove commit access. This happens on the + django-core mailing-list. + +In both cases, the technical board is a last resort. In these matters, it +fulfills a similar function to the former Benevolent Dictators For Life. + +When the board wants to exercise one of these prerogatives, it must hold a +private, simple majority vote on the resolution. The quorum is the full +committee — each member must cast a vote or abstain explicitly. Then the board +communicates the result, and if possible the reasons, on the appropriate +mailing-list. There's no appeal for such decisions. + +In addition, at its discretion, the technical board may act in an advisory +capacity on non-technical decisions. + +Membership +---------- + +The technical board is an elected group of five committers. They're expected +to be experienced but there's no formal seniority requirement. Its current +composition is published :ref:`here `. + +A new board is elected after each major release of Django. The election +process is managed by the outgoing technical board. The first election is +bootstrapped by the retiring BDFLs. The election process works as follows: + +1. Candidates advertise their application for the technical board to the team. + + They must be committers already. There's no term limit for technical board + members. + +2. Each team member can vote for zero to five people among the candidates. + Candidates are ranked by the total number of votes they received. + + In case of a tie, the person who joined the core team earlier wins. + +Both the application and the voting period last between one and two weeks, at +the outgoing board's discretion. + +Changing the organization +========================= + +Changes to this document require a four fifths majority of votes cast in a +core team vote and no veto by the technical board. diff --git a/docs/internals/roles.txt b/docs/internals/roles.txt new file mode 100644 index 0000000000..80ba1e7c2d --- /dev/null +++ b/docs/internals/roles.txt @@ -0,0 +1,10 @@ +===== +Roles +===== + +.. _technical-board-list: + +Technical board +=============== + +The first technical board hasn't been elected yet. diff --git a/docs/internals/team.txt b/docs/internals/team.txt index cb20fa68a9..f3fdc5c88d 100644 --- a/docs/internals/team.txt +++ b/docs/internals/team.txt @@ -2,6 +2,8 @@ Django team =========== +.. _original-team-list: + The original team ================= @@ -55,6 +57,8 @@ Journal-World`_ of Lawrence, Kansas, USA. .. _heroku: http://heroku.com/ .. _Rdio: http://rdio.com +.. _core-team-list: + The current team ================ @@ -551,8 +555,8 @@ Baptiste Mispelon .. _Solid Links: http://solidlinks.nl/ .. _Erik's Pony Checkup: http://ponycheckup.com/ -Retired team members -==================== +Past team members +================= Georg "Hugo" Bauer Georg created Django's internationalization system, managed i18n -- cgit v1.3 From 73b3318b1da9a0fc852b884fac236ecb3a7f998d Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Sun, 13 Jul 2014 17:19:13 +0200 Subject: Documented current roles. --- docs/internals/roles.txt | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/docs/internals/roles.txt b/docs/internals/roles.txt index 80ba1e7c2d..9bfd5f4c00 100644 --- a/docs/internals/roles.txt +++ b/docs/internals/roles.txt @@ -8,3 +8,40 @@ Technical board =============== The first technical board hasn't been elected yet. + +Committers +========== + +Most :ref:`core team ` members have commit access. They're called +"committers" or "core developers". + +Being part of the core team is a pre-requisite for having commit access. + +Security team +============= + +The security team is responsible for :doc:`Django's security policies +`. It handles private reports of security issues. + +The current security team members are: + +- Florian Apolloner +- James Bennett +- Jeremy Dunck +- Adrian Holovaty +- Jacob Kaplan-Moss +- Russell Keith-Magee +- Paul McMillan +- Carl Meyer +- Donald Stufft + +Releasers +========= + +Releasers take care of :doc:`building Django releases +`. + +The current releasers are: + +- James Bennett +- Jacob Kaplan-Moss -- cgit v1.3 From dd9c8f9382d626b432902de6178fb70a7a04a8b0 Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Sun, 13 Jul 2014 19:38:28 +0200 Subject: Left formal decisions up to the technical board. As the core team grows towards 50 people, it isn't reasonable to give everyone veto rights anymore. --- docs/internals/contributing/bugs-and-features.txt | 29 ++++++++++------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/docs/internals/contributing/bugs-and-features.txt b/docs/internals/contributing/bugs-and-features.txt index 842c4236b4..c6b3d494ff 100644 --- a/docs/internals/contributing/bugs-and-features.txt +++ b/docs/internals/contributing/bugs-and-features.txt @@ -150,29 +150,24 @@ follow the votes. 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 :ref:`core team member ` may defer the decision to the +:ref:`technical board `. -Any :doc:`core committer` may call for a formal vote -using the same voting mechanism above. A proposition will be considered carried -by the core team if: +Internally, the technical board will use the same voting mechanism. A +proposition will be considered carried if: -* There are three "+1" votes from members of the core team. +* There are at least three "+1" votes from members of the technical board. -* There is no "-1" vote from any member of the core team. +* There is no "-1" vote from any member of the technical board. -When calling for a vote, the caller should specify a deadline by which -votes must be received. One week is generally suggested as the minimum -amount of time. +Votes should be submitted within a week. -Since this process allows any core committer to veto a proposal, any "-1" -votes should be accompanied by an explanation that explains what it would -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 team -members -- may be held in private. +Since this process allows any technical board member to veto a proposal, a +"-1" vote should be accompanied by an explanation of what it would take to +convert that "-1" into at least a "+0". +Votes on technical matters should be announced and held in public on the +|django-developers| mailing list. .. _searching: https://code.djangoproject.com/search .. _custom queries: https://code.djangoproject.com/query -- cgit v1.3 From a4ead67ee9000a41f7bdca2978c5b2e309066220 Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Sun, 13 Jul 2014 19:42:06 +0200 Subject: Adjusted 'internals' docs to the new organization. Most of these changes are about using the correct vocabulary -- "core team member" vs "core developer/committer" and adding internal links. --- docs/internals/contributing/committing-code.txt | 11 ++++----- docs/internals/contributing/new-contributors.txt | 12 +++++----- docs/internals/contributing/triaging-tickets.txt | 4 ++-- docs/internals/git.txt | 3 ++- docs/internals/index.txt | 11 +-------- docs/internals/mailing-lists.txt | 6 ++--- docs/internals/organization.txt | 4 ++++ docs/internals/release-process.txt | 10 ++++---- docs/internals/roles.txt | 6 +++++ docs/internals/security.txt | 29 ++++++++++++------------ docs/internals/team.txt | 6 ++--- 11 files changed, 50 insertions(+), 52 deletions(-) diff --git a/docs/internals/contributing/committing-code.txt b/docs/internals/contributing/committing-code.txt index d853d643fa..136ef25728 100644 --- a/docs/internals/contributing/committing-code.txt +++ b/docs/internals/contributing/committing-code.txt @@ -2,9 +2,9 @@ Committing code =============== -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 +This section is addressed to the :ref:`committers` 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. .. _handling-pull-requests: @@ -109,7 +109,7 @@ Django's Git repository: If you bring something up on |django-developers| and nobody responds, please don't take that to mean your idea is great and should be - implemented immediately because nobody contested it. Django's lead + implemented immediately because nobody contested it. Django's core developers don't have a lot of time to read mailing-list discussions immediately, so you may have to wait a couple of days before getting a response. @@ -142,7 +142,7 @@ Django's Git repository: use frequent small commits rather than infrequent large commits. For example, if implementing feature X requires a small change to library Y, first commit the change to library Y, then commit feature X in a - separate commit. This goes a *long way* in helping all core Django + separate commit. This goes a *long way* in helping all Django core developers follow your changes. * Separate bug fixes from feature changes. Bugfixes may need to be backported @@ -169,7 +169,6 @@ Django's Git repository: commit message, GitHub will close the pull request, but the Trac plugin will also close the same numbered ticket in Trac. - .. _Trac plugin: https://github.com/aaugustin/trac-github * If your commit references a ticket in the Django `ticket tracker`_ but diff --git a/docs/internals/contributing/new-contributors.txt b/docs/internals/contributing/new-contributors.txt index 80a87f1e8f..2e55114a66 100644 --- a/docs/internals/contributing/new-contributors.txt +++ b/docs/internals/contributing/new-contributors.txt @@ -102,8 +102,8 @@ some advice to make your work on Django more useful and rewarding. Sometimes it can be scary to put your opinion out to the world and say "this ticket is correct" or "this patch needs work", but it's the only way the project moves forward. The contributions of the broad Django community - ultimately have a much greater impact than that of the core developers. We - can't do it without YOU! + ultimately have a much greater impact than that of the core team. We can't + do it without **you**! * **Err on the side of caution when marking things Ready For Check-in** @@ -138,10 +138,10 @@ FAQ I do to get it committed?** First off, it's not personal. Django is entirely developed by volunteers - (even the core developers), and sometimes folks just don't have time. The - best thing to do is to send a gentle reminder to the |django-developers| - mailing list asking for review on the ticket, or to bring it up in the - #django-dev IRC channel. + (even the core team), and sometimes folks just don't have time. The best + thing to do is to send a gentle reminder to the |django-developers| mailing + list asking for review on the ticket, or to bring it up in the #django-dev + IRC channel. 2. **I'm sure my ticket is absolutely 100% perfect, can I mark it as RFC myself?** diff --git a/docs/internals/contributing/triaging-tickets.txt b/docs/internals/contributing/triaging-tickets.txt index f274c2ab68..8c5aed5e3e 100644 --- a/docs/internals/contributing/triaging-tickets.txt +++ b/docs/internals/contributing/triaging-tickets.txt @@ -29,7 +29,7 @@ possible, and raise issues for discussion on our mailing lists when there is confusion or disagreement. Django is a community project, and every contribution helps. We can't do this -without YOU! +without **you**! Triage workflow --------------- @@ -146,7 +146,7 @@ Ready For Checkin The ticket was reviewed by any member of the community other than the person who supplied the patch and found to meet all the requirements for a -commit-ready patch. A core committer now needs to give the patch a final +commit-ready patch. A committer now needs to give the patch a final review prior to being committed. See the :ref:`New contributors' FAQ` for "My ticket has been in RFC forever! What should I do?" diff --git a/docs/internals/git.txt b/docs/internals/git.txt index 07837bac47..45d137b1ce 100644 --- a/docs/internals/git.txt +++ b/docs/internals/git.txt @@ -243,7 +243,8 @@ branches, used for Google Summer of Code projects. Tags ==== -Each Django release is tagged and signed by Django's release manager. +Each Django release is tagged and signed by a :ref:`releaser +`. The tags can be found on GitHub's `tags`_ page. diff --git a/docs/internals/index.txt b/docs/internals/index.txt index 807283f0d0..415e6bfeb5 100644 --- a/docs/internals/index.txt +++ b/docs/internals/index.txt @@ -2,16 +2,7 @@ Django internals ================ Documentation for people hacking on Django itself. This is the place to go if -you'd like to help improve Django, learn or learn about how Django works "under -the hood". - -.. warning:: - - Elsewhere in the Django documentation, coverage of a feature is a sort of a - contract: once an API is in the official documentation, we consider it - "stable" and don't change it without a good reason. APIs covered here, - however, are considered "internal-only": we reserve the right to change - these internals if we must. +you'd like to help improve Django or learn about how Django is managed. .. toctree:: :maxdepth: 2 diff --git a/docs/internals/mailing-lists.txt b/docs/internals/mailing-lists.txt index 4f31cb6466..fc2fa320f0 100644 --- a/docs/internals/mailing-lists.txt +++ b/docs/internals/mailing-lists.txt @@ -40,9 +40,9 @@ installation, usage, or debugging of Django. ``django-core-mentorship`` -------------------------- -The Django Core Development Mentorship list is intended to provide a welcoming -introductory environment for developers interested in contributing to core -Django development. +The Django Core Mentorship list is intended to provide a welcoming +introductory environment for community members interested in contributing to +the Django Project. * `django-core-mentorship mailing archive`_ * `django-core-mentorship subscription email address`_ diff --git a/docs/internals/organization.txt b/docs/internals/organization.txt index 3f2423114b..17caf54583 100644 --- a/docs/internals/organization.txt +++ b/docs/internals/organization.txt @@ -33,6 +33,8 @@ Until 2014, the Django Project was a benevolent_ dictatorship_. .. _benevolent: http://www.holovaty.com/writing/bdfls-retiring/ .. _dictatorship: http://jacobian.org/writing/retiring-as-bdfls/ +.. _core-team: + Core team ========= @@ -130,6 +132,8 @@ contribution in two years may be asked to move themselves to this category, and moved there if they don't respond. Past team members lose their privileges such as voting rights and commit access. +.. _technical-board: + Technical board =============== diff --git a/docs/internals/release-process.txt b/docs/internals/release-process.txt index 26343a1bbd..c470273391 100644 --- a/docs/internals/release-process.txt +++ b/docs/internals/release-process.txt @@ -144,11 +144,11 @@ Release process Django uses a time-based release schedule, with major (i.e. 1.6, 1.7, etc.) releases every nine months, or more, depending on features. -After each release, and after a suitable cooling-off period of a few weeks, the -core development team will examine the landscape and announce a timeline for the -next release. Most releases will be scheduled in the 6-9 month range, but if we -have bigger features to development we might schedule a longer period to allow -for more ambitious work. +After each release, and after a suitable cooling-off period of a few weeks, +core developers will examine the landscape and announce a timeline for the +next release. Most releases will be scheduled in the 6-9 month range, but if +we have bigger features to development we might schedule a longer period to +allow for more ambitious work. Release cycle ------------- diff --git a/docs/internals/roles.txt b/docs/internals/roles.txt index 9bfd5f4c00..46ffdbb2ec 100644 --- a/docs/internals/roles.txt +++ b/docs/internals/roles.txt @@ -9,6 +9,8 @@ Technical board The first technical board hasn't been elected yet. +.. _committers: + Committers ========== @@ -17,6 +19,8 @@ Most :ref:`core team ` members have commit access. They're called Being part of the core team is a pre-requisite for having commit access. +.. _security-team-list: + Security team ============= @@ -35,6 +39,8 @@ The current security team members are: - Carl Meyer - Donald Stufft +.. _releasers-list: + Releasers ========= diff --git a/docs/internals/security.txt b/docs/internals/security.txt index 20ab81a8ab..4dc6994f36 100644 --- a/docs/internals/security.txt +++ b/docs/internals/security.txt @@ -19,21 +19,20 @@ Reporting security issues **Short version: please report security issues by emailing security@djangoproject.com**. -Most normal bugs in Django are reported to `our public Trac -instance`_, but due to the sensitive nature of security issues, we ask -that they **not** be publicly reported in this fashion. - -Instead, if you believe you've found something in Django which has -security implications, please send a description of the issue via -email to ``security@djangoproject.com``. Mail sent to that address -reaches a subset of the core development team, who can forward -security issues into the private committers' mailing list for broader -discussion if needed. - -Once you've submitted an issue via email, you should receive an -acknowledgment from a member of the Django development team within 48 -hours, and depending on the action to be taken, you may receive -further followup emails. +Most normal bugs in Django are reported to `our public Trac instance`_, but +due to the sensitive nature of security issues, we ask that they **not** be +publicly reported in this fashion. + +Instead, if you believe you've found something in Django which has security +implications, please send a description of the issue via email to +``security@djangoproject.com``. Mail sent to that address reaches a +:ref:`subset of the core team `, who can forward security +issues into the private committers' mailing list for broader discussion if +needed. + +Once you've submitted an issue via email, you should receive an acknowledgment +from a member of the security team within 48 hours, and depending on the +action to be taken, you may receive further followup emails. .. note:: diff --git a/docs/internals/team.txt b/docs/internals/team.txt index f3fdc5c88d..f18a4b8bcd 100644 --- a/docs/internals/team.txt +++ b/docs/internals/team.txt @@ -62,12 +62,10 @@ Journal-World`_ of Lawrence, Kansas, USA. The current team ================ -Currently, Django is led by a team of volunteers from around the globe. - These are the folks who have a long history of contributions, a solid track record of being helpful on the mailing lists, and a proven desire to dedicate -serious time to Django. In return, they've been granted the coveted commit bit, -and have free rein to hack on all parts of Django. +serious time to Django. In return, they've been invited to join the :ref:`core +team `. Malcolm Tredinnick Malcolm originally wanted to be a mathematician, somehow ended up a software -- cgit v1.3 From f8aeeff291f83b8b0cf767b41ca5bdc6192db296 Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Sun, 13 Jul 2014 22:24:21 +0200 Subject: Removed references to well-known political systems. Some cultures can't handle these words. --- docs/internals/organization.txt | 15 ++++----------- 1 file 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: -- cgit v1.3