summaryrefslogtreecommitdiff
path: root/docs/internals/git.txt
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-07-13 13:37:56 -0400
committerTim Graham <timograham@gmail.com>2014-07-14 06:18:42 -0400
commitdcb1b971c254c4c23216b8335ec40abb7d30b288 (patch)
tree54008e162e9143bd751ad903f40ca275fe41a8a1 /docs/internals/git.txt
parentbe38c5bcc8b6d641d210cbcf0508605223366778 (diff)
[1.7.x] Fixed #23015 -- Fixed major/minor release terminology in docs.
Backport of dd6ef3197a from master
Diffstat (limited to 'docs/internals/git.txt')
-rw-r--r--docs/internals/git.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/docs/internals/git.txt b/docs/internals/git.txt
index e1d70be372..07837bac47 100644
--- a/docs/internals/git.txt
+++ b/docs/internals/git.txt
@@ -85,8 +85,7 @@ Other branches
==============
Django uses branches to prepare for releases of Django (whether they be
-:term:`major <Major release>`, :term:`minor <Minor release>`, or
-:term:`micro <Micro release>`).
+:term:`major <Major release>` or :term:`minor <Minor release>`).
In the past when Django was hosted on Subversion, branches were also used for
feature development. Now Django is hosted on Git and feature development is