From 819d1d733293a8aa361c71efdfe7eeeb75459c93 Mon Sep 17 00:00:00 2001
From: Victor Feyens <vfe@odoo.com>
Date: Wed, 16 Jun 2021 17:00:29 +0200
Subject: [PATCH] [REM][MOV] legal: remove empty privacy page

* Also move the cla page since the intermediate "others" page isn't
useful anymore.
---
 content/legal.rst                  |  2 +-
 content/legal/{others => }/cla.rst |  0
 content/legal/others.rst           | 10 ----------
 content/legal/others/privacy.rst   |  7 -------
 redirects.txt                      |  2 ++
 5 files changed, 3 insertions(+), 18 deletions(-)
 rename content/legal/{others => }/cla.rst (100%)
 delete mode 100644 content/legal/others.rst
 delete mode 100644 content/legal/others/privacy.rst

diff --git a/content/legal.rst b/content/legal.rst
index fb87d7b87..f70be5c8c 100644
--- a/content/legal.rst
+++ b/content/legal.rst
@@ -10,9 +10,9 @@ Legal
 .. toctree::
     :hidden:
 
+    legal/cla
     legal/licenses
     legal/terms
-    legal/others
 
 Licenses
 ========
diff --git a/content/legal/others/cla.rst b/content/legal/cla.rst
similarity index 100%
rename from content/legal/others/cla.rst
rename to content/legal/cla.rst
diff --git a/content/legal/others.rst b/content/legal/others.rst
deleted file mode 100644
index fa5b86ebe..000000000
--- a/content/legal/others.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-:nosearch:
-
-======================
-Other legal references
-======================
-
-.. toctree::
-
-    others/privacy
-    others/cla
diff --git a/content/legal/others/privacy.rst b/content/legal/others/privacy.rst
deleted file mode 100644
index 95dae38d1..000000000
--- a/content/legal/others/privacy.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-.. _privacy_policy:
-
-==============
-Privacy Policy
-==============
-
-Temporary version at `<https://www.odoo.com/page/odoo-privacy-policy>`__ (needs cleanup)
\ No newline at end of file
diff --git a/redirects.txt b/redirects.txt
index e4989c103..e39addb98 100644
--- a/redirects.txt
+++ b/redirects.txt
@@ -218,6 +218,8 @@ applications/finance/sign/overview/signature_validity.rst applications/finance/s
 
 # Redirections introduced in 14.0 :
 
+legal/others/cla.rst legal/cla.rst
+
 crm/optimize/mail_client_extension.rst applications/sales/crm/optimize/outlook_extension.rst  # mail_client_extension -> outlook_extension | mail_client_extension is the first link provided as a tip in Odoo 14 but should be updated and point directly to outlook_extension
 crm/optimize/google_calendar_credentials.rst applications/general/calendars/google/google_calendar_credentials.rst    # (#765)