From ab68ad8749c92abadaf6ea779ebe809e3b9490a1 Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axil@gitlab.com>
Date: Thu, 3 May 2018 16:59:58 +0200
Subject: [PATCH] Change the docs license to CC BY-SA

As discussed in https://gitlab.com/gitlab-org/gitlab-ce/issues/42891
---
 CONTRIBUTING.md | 4 ++++
 LICENSE         | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5cd73f94aea0c..f70dd15c5057d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -9,6 +9,10 @@ terms.
 
 [DCO + License](https://gitlab.com/gitlab-org/dco/blob/master/README.md)
 
+All Documentation content that resides under the [doc/ directory](/doc) of this
+repository is licensed under Creative Commons:
+[CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/).
+
 _This notice should stay as the first item in the CONTRIBUTING.md file._
 
 ---
diff --git a/LICENSE b/LICENSE
index 4b66533e99d6e..636ed8404e51b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
 The GitLab Enterprise Edition (EE) license (the “EE License”)
-Copyright (c) 2011-2017 GitLab B.V.
+Copyright (c) 2011-2018 GitLab B.V.
 
 With regard to the GitLab Software:
 
@@ -42,3 +42,8 @@ THE SOFTWARE.
 For all third party components incorporated into the GitLab Software, those
 components are licensed under the original license provided by the owner of the
 applicable component.
+
+---
+
+All Documentation content that resides under the doc/ directory of this
+repository is licensed under Creative Commons: CC BY-SA 4.0.
-- 
GitLab