From d5edf0feb7503917a73febb70f7070e4db372efd Mon Sep 17 00:00:00 2001
From: David Smith <smithdc@gmail.com>
Date: Thu, 15 Apr 2021 19:33:01 +0100
Subject: [PATCH] Changed left/right to start/end

Changed in beta 1. See https://getbootstrap.com/docs/5.0/migration/#utilities-2
---
 rest_framework/templates/rest_framework/admin.html        | 2 +-
 rest_framework/templates/rest_framework/base.html         | 4 ++--
 rest_framework/templates/rest_framework/docs/sidebar.html | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/rest_framework/templates/rest_framework/admin.html b/rest_framework/templates/rest_framework/admin.html
index d99799cbc..d071e4307 100644
--- a/rest_framework/templates/rest_framework/admin.html
+++ b/rest_framework/templates/rest_framework/admin.html
@@ -70,7 +70,7 @@
           <!-- Content -->
           <div id="content">
             {% if 'GET' in allowed_methods %}
-              <form id="get-form" class="float-right">
+              <form id="get-form" class="float-end">
                 <fieldset>
                   <div class="dropdown format-selection">
                     <button class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown">
diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html
index 02960c4f3..e4a5a2945 100644
--- a/rest_framework/templates/rest_framework/base.html
+++ b/rest_framework/templates/rest_framework/base.html
@@ -77,7 +77,7 @@
           {% block request_forms %}
 
           {% if 'GET' in allowed_methods %}
-            <form id="get-form" class="float-right">
+            <form id="get-form" class="float-end">
               <fieldset>
                 {% if api_settings.URL_FORMAT_OVERRIDE %}
                   <div class="btn-group">
@@ -117,7 +117,7 @@
                     <h4 class="text-center">Are you sure you want to delete this {{ name }}?</h4>
                   </div>
                   <div class="modal-footer">
-                    <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+                    <button type="button" class="btn btn-default" data-bs-dismiss="modal">Cancel</button>
                     <form class="button-form" action="{{ request.get_full_path }}" data-method="DELETE">
                       <button class="btn btn-danger">Delete</button>
                     </form>
diff --git a/rest_framework/templates/rest_framework/docs/sidebar.html b/rest_framework/templates/rest_framework/docs/sidebar.html
index 166537c76..1f358ac4c 100644
--- a/rest_framework/templates/rest_framework/docs/sidebar.html
+++ b/rest_framework/templates/rest_framework/docs/sidebar.html
@@ -11,14 +11,14 @@
             {% for section_key, section in document|data|items %}
             <li data-bs-toggle="collapse" data-bs-target="#{{ section_key }}-dropdown" class="collapsed">
                 <a class="d-flex align-items-center">
-                  <svg width="1.5em" height="1.5em" viewBox="0 0 16 16" class="mr-2 ml-2 bi bi-bullseye" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+                  <svg width="1.5em" height="1.5em" viewBox="0 0 16 16" class="me-2 ms-2 bi bi-bullseye" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
                     <path fill-rule="evenodd" d="M8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z"/>
                     <path fill-rule="evenodd" d="M8 13A5 5 0 1 0 8 3a5 5 0 0 0 0 10zm0 1A6 6 0 1 0 8 2a6 6 0 0 0 0 12z"/>
                     <path fill-rule="evenodd" d="M8 11a3 3 0 1 0 0-6 3 3 0 0 0 0 6zm0 1a4 4 0 1 0 0-8 4 4 0 0 0 0 8z"/>
                     <path d="M9.5 8a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0z"/>
                   </svg>
                   {% if section_key %}{{ section_key }}{% else %}API Endpoints{% endif %}
-                  <svg width="1em" height="1em" viewBox="0 0 16 16" class="ml-auto mr-3 bi bi-chevron-down" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+                  <svg width="1em" height="1em" viewBox="0 0 16 16" class="ms-auto me-3 bi bi-chevron-down" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
                     <path fill-rule="evenodd" d="M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z"/>
                   </svg>
 
@@ -44,7 +44,7 @@
         <ul class="menu-list menu-list-bottom">
             <li data-bs-toggle="collapse" data-bs-target="#auth-control" class="collapsed">
                 <a>
-                  <svg width="1.5em" height="1.5em" viewBox="0 0 16 16" class="mb-1 mr-2 ml-3 bi bi-person-fill" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+                  <svg width="1.5em" height="1.5em" viewBox="0 0 16 16" class="mb-1 me-2 ms-3 bi bi-person-fill" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
                     <path fill-rule="evenodd" d="M3 14s-1 0-1-1 1-4 6-4 6 3 6 4-1 1-1 1H3zm5-6a3 3 0 1 0 0-6 3 3 0 0 0 0 6z"/>
                   </svg>
                   Authentication
@@ -60,7 +60,7 @@
 
             <li data-bs-toggle="collapse" data-bs-target="#language-control" class="collapsed">
                 <a>
-                  <svg width="1.5em" height="1.5em" viewBox="0 0 16 16" class="mb-1 ml-3 mr-2 bi bi-code-slash" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+                  <svg width="1.5em" height="1.5em" viewBox="0 0 16 16" class="mb-1 ms-3 me-2 bi bi-code-slash" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
                     <path fill-rule="evenodd" d="M4.854 4.146a.5.5 0 0 1 0 .708L1.707 8l3.147 3.146a.5.5 0 0 1-.708.708l-3.5-3.5a.5.5 0 0 1 0-.708l3.5-3.5a.5.5 0 0 1 .708 0zm6.292 0a.5.5 0 0 0 0 .708L14.293 8l-3.147 3.146a.5.5 0 0 0 .708.708l3.5-3.5a.5.5 0 0 0 0-.708l-3.5-3.5a.5.5 0 0 0-.708 0zm-.999-3.124a.5.5 0 0 1 .33.625l-4 13a.5.5 0 0 1-.955-.294l4-13a.5.5 0 0 1 .625-.33z"/>
                   </svg>
                   Source Code