Added citation and cleaned up front page.

2 files changed, 50 insertions, 55 deletions

diff --git a/src/riscv-privileged.tex b/src/riscv-privileged.tex
index 9622af3..db10664 100644
--- a/src/riscv-privileged.tex
+++ b/src/riscv-privileged.tex
@@ -24,40 +24,36 @@
   $^{1}$SiFive Inc., \\
   $^{2}$CS Division, EECS Department, University of California, Berkeley \\
   {\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, Anthony Coulter,
-    Palmer Dabbelt, Monte Dalrymple, Dennis Ferguson,
-    Mike Frysinger, John Hauser, David Horner, Olof Johansson, Yunsup Lee,
-    Andrew Lutomirski, 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, Megan Wachs, 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
 
+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, Anthony Coulter, Palmer
+Dabbelt, Monte Dalrymple, Dennis Ferguson, Mike Frysinger, John
+Hauser, David Horner, Olof Johansson, Yunsup Lee, Andrew Lutomirski,
+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, Megan Wachs, Andrew Waterman,
+and Reinoud Zandijk.
+
+This document is released under a Creative Commons Attribution 4.0
+International License.
+
+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.
+
+Please cite as: ``The RISC-V Instruction Set
+Manual, Volume II: Privileged Architecture, Version 1.10'', Editors
+Andrew Waterman and Krste Asanovi\'{c}, RISC-V Foundation, May 2017.
+
 \markboth{Volume II: RISC-V Privileged Architectures V\privrev}
 {Volume II: RISC-V Privileged Architectures V\privrev}
 \thispagestyle{empty}
diff --git a/src/riscv-spec.tex b/src/riscv-spec.tex
index c102c48..c9055b0 100644
--- a/src/riscv-spec.tex
+++ b/src/riscv-spec.tex
@@ -19,38 +19,37 @@
   $^{1}$SiFive Inc., \\
   $^{2}$CS Division, EECS Department, University of California, Berkeley \\
   {\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,
-    Christopher F. Batten, Allen J. Baum, Alex Bradbury, Scott Beamer,
-    Preston Briggs, Christopher Celio, David Chisnall, Paul Clayton,
-    Palmer Dabbelt, Stefan Freudenberger, Jan Gray, Michael Hamburg,
-    John Hauser, David Horner, Olof Johansson, Ben Keller, Yunsup Lee,
-    Joseph Myers, Rishiyur Nikhil, Stefan O'Rear, Albert Ou, John
-    Ousterhout, David Patterson, Colin Schmidt, Michael Taylor, Wesley
-    Terpstra, Matt Thomas, Tommy Thorn, Ray VanDeWalker, Megan Wachs,
-    Andrew Waterman, Robert Watson, 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 Instruction Set
-    Manual, Volume 1: User-Level ISA Version 2.1'' released under the following license:
-    \copyright \,2010--2017 Andrew Waterman, Yunsup Lee, David Patterson, Krste Asanovi\'{c}. 
-    Creative Commons Attribution 4.0 International License.
-  }
-  \\
-  \\
   \today
 }
 \date{} 
 \maketitle
 
+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,
+Christopher F. Batten, Allen J. Baum, Alex Bradbury, Scott Beamer,
+Preston Briggs, Christopher Celio, David Chisnall, Paul Clayton,
+Palmer Dabbelt, Stefan Freudenberger, Jan Gray, Michael Hamburg,
+John Hauser, David Horner, Olof Johansson, Ben Keller, Yunsup Lee,
+Joseph Myers, Rishiyur Nikhil, Stefan O'Rear, Albert Ou, John
+Ousterhout, David Patterson, Colin Schmidt, Michael Taylor, Wesley
+Terpstra, Matt Thomas, Tommy Thorn, Ray VanDeWalker, Megan Wachs,
+Andrew Waterman, Robert Watson, and Reinoud Zandijk.
+
+This document is released under a Creative Commons Attribution 4.0
+International License.
+
+This document is a derivative of ``The RISC-V Instruction Set
+Manual, Volume I: User-Level ISA Version 2.1'' released under the following license:
+\copyright \,2010--2017 Andrew Waterman, Yunsup Lee, David Patterson, Krste Asanovi\'{c}. 
+Creative Commons Attribution 4.0 International License.
+
+Please cite as: ``The RISC-V Instruction Set
+Manual, Volume I: User-Level ISA, Document Version 2.2'', Editors
+Andrew Waterman and Krste Asanovi\'{c}, RISC-V Foundation, May 2017.
+
+
 \markboth{Volume I: RISC-V User-Level ISA V\specrev}
 {Volume I: RISC-V User-Level ISA V\specrev}
 \thispagestyle{empty}