Take out DRAFT watermark

user_guides/cern_ohl_s_v2_user_guide.tex

@@ -12,9 +12,8 @@ citecolor=blue]{hyperref}
 
 \usepackage{xcolor}
 
-\usepackage{draftwatermark}
-\SetWatermarkText{DRAFT}
-%\SetWatermarkScale{5}
+%\usepackage{draftwatermark}
+%\SetWatermarkText{DRAFT}
 
 \title{CERN Open Hardware Licence Version 2 - Strongly Reciprocal \\ User Guide}
 
@@ -159,7 +158,7 @@ suggested in the REUSE guidelines. See
       \href{https://ohwr.org/cern\_ohl\_s\_v2.txt}
            {https://ohwr.org/cern\_ohl\_s\_v2.txt}:
       \begin{enumerate}
-        \item ``Licensed under CERN-OHL-S v2 or later'' or
+        \item ``Licensed under CERN-OHL-S v2 or any later version'' or
         \item ``Licensed under CERN-OHL-S v2'';
       \end{enumerate}
     \item a disclaimer of warranties;
@@ -203,7 +202,7 @@ type, can be substituted by a valid SPDX header, like this:
 \noindent SPDX-FileCopyrightText: 2020 Sam Smith \textless
 sam@example.com\textgreater\\ SPDX-License-Identifier: CERN-OHL-S-2.0
 
-or, in case the `or later' option is preferred:
+or, in case the `or any later version' option is preferred:
 
 \noindent SPDX-FileCopyrightText: 2020 Sam Smith \textless
 sam@example.com\textgreater\\ SPDX-License-Identifier: CERN-OHL-S-2.0+
@@ -213,22 +212,23 @@ sam@example.com\textgreater\\ SPDX-License-Identifier: CERN-OHL-S-2.0+
   your choice of licence is easy to understand by humans and computers alike.
 \end{enumerate}
 
-Why would you license your design under `CERN-OHL-S v2 or later'? Imagine we
-discovered a shortcoming of the licence which made us write a new version, let's
-say version 3.0, to fix it. Let us further imagine that we decided to make v3
-incompatible with v2 (this actually happened with the GPL). If you licensed your
-design under `v2 only' that means it could not be combined with new designs
-licensed under v3. If, on the other hand, you license your design under `v2 or
-later', you give future licensees the option of interpreting the design as
-licensed under the hypothetical v3, and there would be no compatibility issues.
-This is quite an important decision to take when you use a reciprocal licence,
-so we thought we'd mention it in this guide. You have to make your own judgment
-as to whether you believe that CERN can be trusted to ensure that future
-versions of the CERN-OHL will be similar in spirit and effect to this version.
+Why would you license your design under `CERN-OHL-S v2 or any later version'?
+Imagine we discovered a shortcoming of the licence which made us write a new
+version, let's say version 3.0, to fix it. Let us further imagine that we
+decided to make v3 incompatible with v2 (this actually happened with the GPL).
+If you licensed your design under `v2 only' that means it could not be combined
+with new designs licensed under v3. If, on the other hand, you license your
+design under `v2 or any later version', you give future licensees the option of
+interpreting the design as licensed under the hypothetical v3, and there would
+be no compatibility issues. This is quite an important decision to take when you
+use a reciprocal licence, so we thought we'd mention it in this guide. You have
+to make your own judgment as to whether you believe that CERN can be trusted to
+ensure that future versions of the CERN-OHL will be similar in spirit and effect
+to this version.
 
 \begin{enumerate}[label=\textbf{\ref*{subsec:your-sources}.8}]
-\item \textbf{Suggestion: } give some thought to the `or later' option before
-  publishing your design under CERN-OHL-S v2.
+\item \textbf{Suggestion: } give some thought to the `or any later version'
+  option before publishing your design under CERN-OHL-S v2.
 \end{enumerate}
 
 We are going to assume that you, as a licensor, want people who receive a product
@@ -313,8 +313,9 @@ products, you must:
 
 \begin{enumerate}[label=\textbf{\ref*{subsec:modify-designs}.4}]
 \item \textbf{Rule: } license the modifications under the `CERN-OHL-S v2' (or
-  `CERN-OHL-S v2 or later' if permitted by the original licensor, and all other
-components of the design allow you to license with the `or later' option).
+  `CERN-OHL-S v2 or any later version' if permitted by the original licensor,
+  and all other components of the design allow you to license with the `or any
+  later version' option).
 \end{enumerate}
 
 \begin{enumerate}[label=\textbf{\ref*{subsec:modify-designs}.5}]