[1.5.x] Fixed #20545 - Made class-based view MRO lists consistent.

Thanks wim@ for the suggestion.

Backport of c36b75c814 from master

4 files changed, 0 insertions, 13 deletions

diff --git a/docs/ref/class-based-views/base.txt b/docs/ref/class-based-views/base.txt
index bf1bf31165..ca60726937 100644
--- a/docs/ref/class-based-views/base.txt
+++ b/docs/ref/class-based-views/base.txt
@@ -113,7 +113,6 @@ TemplateView
 
     This view inherits methods and attributes from the following views:
 
-    * :class:`django.views.generic.base.TemplateView`
     * :class:`django.views.generic.base.TemplateResponseMixin`
     * :class:`django.views.generic.base.View`
 
diff --git a/docs/ref/class-based-views/generic-date-based.txt b/docs/ref/class-based-views/generic-date-based.txt
index 4144c382f8..6bff0456a3 100644
--- a/docs/ref/class-based-views/generic-date-based.txt
+++ b/docs/ref/class-based-views/generic-date-based.txt
@@ -33,7 +33,6 @@ ArchiveIndexView
 
     **Ancestors (MRO)**
 
-    * :class:`django.views.generic.dates.ArchiveIndexView`
     * :class:`django.views.generic.list.MultipleObjectTemplateResponseMixin`
     * :class:`django.views.generic.base.TemplateResponseMixin`
     * :class:`django.views.generic.dates.BaseArchiveIndexView`
@@ -100,7 +99,6 @@ YearArchiveView
 
     **Ancestors (MRO)**
 
-    * :class:`django.views.generic.dates.YearArchiveView`
     * :class:`django.views.generic.list.MultipleObjectTemplateResponseMixin`
     * :class:`django.views.generic.base.TemplateResponseMixin`
     * :class:`django.views.generic.dates.BaseYearArchiveView`
@@ -216,7 +214,6 @@ MonthArchiveView
 
     **Ancestors (MRO)**
 
-    * :class:`django.views.generic.dates.MonthArchiveView`
     * :class:`django.views.generic.list.MultipleObjectTemplateResponseMixin`
     * :class:`django.views.generic.base.TemplateResponseMixin`
     * :class:`django.views.generic.dates.BaseMonthArchiveView`
@@ -317,7 +314,6 @@ WeekArchiveView
 
     **Ancestors (MRO)**
 
-    * :class:`django.views.generic.dates.WeekArchiveView`
     * :class:`django.views.generic.list.MultipleObjectTemplateResponseMixin`
     * :class:`django.views.generic.base.TemplateResponseMixin`
     * :class:`django.views.generic.dates.BaseWeekArchiveView`
@@ -422,7 +418,6 @@ DayArchiveView
 
     **Ancestors (MRO)**
 
-    * :class:`django.views.generic.dates.DayArchiveView`
     * :class:`django.views.generic.list.MultipleObjectTemplateResponseMixin`
     * :class:`django.views.generic.base.TemplateResponseMixin`
     * :class:`django.views.generic.dates.BaseDayArchiveView`
@@ -526,7 +521,6 @@ TodayArchiveView
 
     **Ancestors (MRO)**
 
-    * :class:`django.views.generic.dates.TodayArchiveView`
     * :class:`django.views.generic.list.MultipleObjectTemplateResponseMixin`
     * :class:`django.views.generic.base.TemplateResponseMixin`
     * :class:`django.views.generic.dates.BaseTodayArchiveView`
@@ -585,7 +579,6 @@ DateDetailView
 
     **Ancestors (MRO)**
 
-    * :class:`django.views.generic.dates.DateDetailView`
     * :class:`django.views.generic.detail.SingleObjectTemplateResponseMixin`
     * :class:`django.views.generic.base.TemplateResponseMixin`
     * :class:`django.views.generic.dates.BaseDateDetailView`
diff --git a/docs/ref/class-based-views/generic-display.txt b/docs/ref/class-based-views/generic-display.txt
index b827c0005c..c133134d65 100644
--- a/docs/ref/class-based-views/generic-display.txt
+++ b/docs/ref/class-based-views/generic-display.txt
@@ -77,7 +77,6 @@ ListView
 
     This view inherits methods and attributes from the following views:
 
-    * :class:`django.views.generic.list.ListView`
     * :class:`django.views.generic.list.MultipleObjectTemplateResponseMixin`
     * :class:`django.views.generic.base.TemplateResponseMixin`
     * :class:`django.views.generic.list.BaseListView`
diff --git a/docs/ref/class-based-views/generic-editing.txt b/docs/ref/class-based-views/generic-editing.txt
index 1dbb427036..27171e6708 100644
--- a/docs/ref/class-based-views/generic-editing.txt
+++ b/docs/ref/class-based-views/generic-editing.txt
@@ -36,7 +36,6 @@ FormView
 
     This view inherits methods and attributes from the following views:
 
-    * :class:`django.views.generic.edit.FormView`
     * :class:`django.views.generic.base.TemplateResponseMixin`
     * ``django.views.generic.edit.BaseFormView``
     * :class:`django.views.generic.edit.FormMixin`
@@ -83,7 +82,6 @@ CreateView
 
     This view inherits methods and attributes from the following views:
 
-    * :class:`django.views.generic.edit.CreateView`
     * :class:`django.views.generic.detail.SingleObjectTemplateResponseMixin`
     * :class:`django.views.generic.base.TemplateResponseMixin`
     * ``django.views.generic.edit.BaseCreateView``
@@ -125,7 +123,6 @@ UpdateView
 
     This view inherits methods and attributes from the following views:
 
-    * :class:`django.views.generic.edit.UpdateView`
     * :class:`django.views.generic.detail.SingleObjectTemplateResponseMixin`
     * :class:`django.views.generic.base.TemplateResponseMixin`
     * ``django.views.generic.edit.BaseUpdateView``
@@ -167,7 +164,6 @@ DeleteView
 
     This view inherits methods and attributes from the following views:
 
-    * :class:`django.views.generic.edit.DeleteView`
     * :class:`django.views.generic.detail.SingleObjectTemplateResponseMixin`
     * :class:`django.views.generic.base.TemplateResponseMixin`
     * ``django.views.generic.edit.BaseDeleteView``