From 3687dc5d1e03bbd0f8e24f41a632f441e97262d8 Mon Sep 17 00:00:00 2001 From: Victor Feyens Date: Wed, 16 Jun 2021 17:01:14 +0200 Subject: [PATCH] [REM][MOV] legal: useless "licenses" toctree page --- content/legal/licenses.rst | 103 ++++++++++++++++++++++++++- content/legal/licenses/licenses.rst | 105 ---------------------------- redirects.txt | 1 + 3 files changed, 101 insertions(+), 108 deletions(-) delete mode 100644 content/legal/licenses/licenses.rst diff --git a/content/legal/licenses.rst b/content/legal/licenses.rst index a20fb8801..7759b2027 100644 --- a/content/legal/licenses.rst +++ b/content/legal/licenses.rst @@ -1,8 +1,105 @@ -:nosearch: + +.. _licenses: ======== Licenses ======== -.. toctree:: - licenses/licenses \ No newline at end of file +.. _odoo_community_license: + +Odoo 14 Community Edition +========================= + +Odoo 14 Community Edition is licensed under +`LGPL version 3 `_ (also known as LGPLv3). +See also the `GPL FAQ `_ and the +`compatibility matrix `_. + + +.. _odoo_enterprise_license: + +Odoo 14 Enterprise Edition +========================== + +Odoo 14 Enterprise Edition is licensed under the Odoo Enterprise Edition License v1.0, +defined as follows: + +.. use to avoid default 
 styling
+
+.. raw:: html
+
+    
+
+.. include:: enterprise_license.txt
+
+.. raw:: html
+
+    
+
+
+.. _odoo_apps_license:
+
+Odoo Apps
+=========
+
+Unless otherwise stated, Odoo Apps by Odoo SA (including the website themes) are published under
+the Odoo Proprietary License v1.0, defined as follows
+
+.. use  to avoid default 
 styling
+
+.. raw:: html
+
+    
+
+Odoo Proprietary License v1.0
+
+This software and associated files (the "Software") may only be used
+(executed, modified, executed after modifications) if you have purchased a
+valid license from the authors, typically via Odoo Apps, or if you have
+received a written agreement from the authors of the Software (see the
+COPYRIGHT file).
+
+You may develop Odoo modules that use the Software as a library (typically
+by depending on it, importing it and using its resources), but without
+copying any source code or material from the Software. You may distribute
+those modules under the license of your choice, provided that this license
+is compatible with the terms of the Odoo Proprietary License (For example:
+LGPL, MIT, or proprietary licenses similar to this one).
+
+It is forbidden to publish, distribute, sublicense, or sell copies of the
+Software or modified copies of the Software.
+
+The above copyright notice and this permission notice must be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+.. raw:: html
+
+    
+
+.. _odoo_9_license:
+
+Odoo 9 - Odoo 13
+================
+
+The licenses for both Community Edition and Enterprise Edition of all
+Odoo versions since Odoo 9 are respectively the same as for
+:ref:`odoo_community_license` and :ref:`odoo_enterprise_license`.
+
+.. _odoo_8_license:
+
+
+Odoo 8
+======
+
+Odoo 8 is licensed under
+`AGPL version 3 `_  (also known as AGPLv3).
+See also the `GPL FAQ `_ and the
+`compatibility matrix `_.
diff --git a/content/legal/licenses/licenses.rst b/content/legal/licenses/licenses.rst
deleted file mode 100644
index 7759b2027..000000000
--- a/content/legal/licenses/licenses.rst
+++ /dev/null
@@ -1,105 +0,0 @@
-
-.. _licenses:
-
-========
-Licenses
-========
-
-.. _odoo_community_license:
-
-Odoo 14 Community Edition
-=========================
-
-Odoo 14 Community Edition is licensed under
-`LGPL version 3 `_  (also known as LGPLv3).
-See also the `GPL FAQ `_ and the
-`compatibility matrix `_.
-
-
-.. _odoo_enterprise_license:
-
-Odoo 14 Enterprise Edition
-==========================
-
-Odoo 14 Enterprise Edition is licensed under the Odoo Enterprise Edition License v1.0,
-defined as follows:
-
-.. use  to avoid default 
 styling
-
-.. raw:: html
-
-    
-
-.. include:: enterprise_license.txt
-
-.. raw:: html
-
-    
-
-
-.. _odoo_apps_license:
-
-Odoo Apps
-=========
-
-Unless otherwise stated, Odoo Apps by Odoo SA (including the website themes) are published under
-the Odoo Proprietary License v1.0, defined as follows
-
-.. use  to avoid default 
 styling
-
-.. raw:: html
-
-    
-
-Odoo Proprietary License v1.0
-
-This software and associated files (the "Software") may only be used
-(executed, modified, executed after modifications) if you have purchased a
-valid license from the authors, typically via Odoo Apps, or if you have
-received a written agreement from the authors of the Software (see the
-COPYRIGHT file).
-
-You may develop Odoo modules that use the Software as a library (typically
-by depending on it, importing it and using its resources), but without
-copying any source code or material from the Software. You may distribute
-those modules under the license of your choice, provided that this license
-is compatible with the terms of the Odoo Proprietary License (For example:
-LGPL, MIT, or proprietary licenses similar to this one).
-
-It is forbidden to publish, distribute, sublicense, or sell copies of the
-Software or modified copies of the Software.
-
-The above copyright notice and this permission notice must be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
-.. raw:: html
-
-    
-
-.. _odoo_9_license:
-
-Odoo 9 - Odoo 13
-================
-
-The licenses for both Community Edition and Enterprise Edition of all
-Odoo versions since Odoo 9 are respectively the same as for
-:ref:`odoo_community_license` and :ref:`odoo_enterprise_license`.
-
-.. _odoo_8_license:
-
-
-Odoo 8
-======
-
-Odoo 8 is licensed under
-`AGPL version 3 `_  (also known as AGPLv3).
-See also the `GPL FAQ `_ and the
-`compatibility matrix `_.
diff --git a/redirects.txt b/redirects.txt
index e39addb98..493374772 100644
--- a/redirects.txt
+++ b/redirects.txt
@@ -219,6 +219,7 @@ applications/finance/sign/overview/signature_validity.rst applications/finance/s
 # Redirections introduced in 14.0 :
 
 legal/others/cla.rst legal/cla.rst
+legal/licenses/licenses.rst legal/licenses.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)