From 66ca5c0d95686839f3c7e41d7cfe7428b7dc8693 Mon Sep 17 00:00:00 2001
From: Krste Asanovic <krste@eecs.berkeley.edu>
Date: Sun, 19 Mar 2017 10:43:57 -0700
Subject: Fixed up licence and contributor details on front page.

---
 src/priv-preface.tex     |  8 ++++++--
 src/riscv-privileged.tex | 45 ++++++++++++++++++++++++++++++++-------------
 2 files changed, 38 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/priv-preface.tex b/src/priv-preface.tex
index 8d63770..ca1b5f0 100644
--- a/src/priv-preface.tex
+++ b/src/priv-preface.tex
@@ -1,11 +1,15 @@
 \chapter{Preface}
 
-This is version 1.10 of the RISC-V privileged architecture
-proposal.  Changes from version 1.9.1 include:
+This is {\bf a draft of} version 1.10 of the RISC-V privileged
+architecture proposal.  Changes from version 1.9.1 include:
 
 \begin{itemize}
   \parskip 0pt
   \itemsep 1pt
+\item The previous version of this document was released under a
+  Creative Commons Attribution 4.0 International Licence by the
+  original authors, and this and future versions of this document will
+  be released under the same licence.
 \item A optional mechanism to change the base ISA used by supervisor and user
       modes has bee added.
 \item A mechanism to improve virtualization performance by
diff --git a/src/riscv-privileged.tex b/src/riscv-privileged.tex
index 7e7e47f..8c87b38 100644
--- a/src/riscv-privileged.tex
+++ b/src/riscv-privileged.tex
@@ -20,21 +20,40 @@
     to the future standard.}
   \vspace{-0.1in}}
 
-\author{Andrew Waterman$^{1}$, Yunsup Lee$^{1}$, Rimas Avi\v{z}ienis$^{2}$, David Patterson$^{2}$, Krste
-  Asanovi\'{c}$^{1,2}$ \\
+\author{Editors: Andrew Waterman$^{1}$, Krste Asanovi\'{c}$^{1,2}$ \\
   $^{1}$SiFive Inc., \\
   $^{2}$CS Division, EECS Department, University of California, Berkeley \\
-  {\tt \{andrew|yunsup\}@sifive.com,
-    \{rimas|pattrsn|krste\}@eecs.berkeley.edu} \\
- \today
- \\
- \\
-\copyright \,2010--2017 Andrew Waterman, Yunsup Lee, Rimas
-Avi\v{z}ienis, David Patterson, Krste
-Asanovi\'{c}. \\
-This work is licensed under a Creative Commons Attribution 4.0
-International License.
- }
+  {\tt andrew@sifive.com, krste@berkeley.edu} \\
+  \\
+  \parbox{\textwidth}{
+  Contributors to all versions of the spec in alphabetical order
+  (please contact editors to suggest corrections): Krste Asanovi\'{c},
+  Rimas Avi\v{z}ienis, Jacob Bachmeyer, Allen J. Baum, Paolo Bonzini,
+  Ruslan Bukin, Christopher Celio, David Chisnall, Palmer Dabbelt,
+  Monte Dalrymple, Dennis Ferguson, Mike Frysinger, John Hauser, David
+  Horner, Yunsup Lee, Jonathan Neusch{\"a}fer, Rishiyur Nikhil, Stefan
+  O'Rear, Albert Ou, John Ousterhout, David Patterson, Colin Schmidt,
+  Wesley Terpstra, Matt Thomas, Tommy Thorn, Ray VanDeWalker,
+  Andrew Waterman, and Reinoud Zandijk.}
+  \\
+  \\
+  \parbox{\textwidth}{
+  This document is released under a Creative Commons Attribution 4.0
+  International License.
+  }
+  \\
+  \\
+  \parbox{\textwidth}{
+    This document is a derivative of the RISC-V
+    privileged specification version 1.9.1 released under following license:
+    \copyright \,2010--2017 Andrew Waterman, Yunsup Lee, Rimas
+    Avi\v{z}ienis, David Patterson, Krste Asanovi\'{c}. 
+    Creative Commons Attribution 4.0 International License.
+  }
+  \\
+  \\
+  \today
+}
 
 \date{} 
 \maketitle
-- 
cgit v1.1