Merge branch 'master'.

acl2 · Oct 12, 2017 · e5bcf98 · e5bcf98
2 parents 72df352 + e762b0c
commit e5bcf98
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/books/build/jenkins/build-multi.sh b/books/build/jenkins/build-multi.sh
@@ -33,6 +33,11 @@ if [ -z "$BOOK_PARALLELISM_LEVEL" ]; then
   BOOK_PARALLELISM_LEVEL='1';
 fi
 
+if [ "${LISP:0:4}" == "sbcl" ]; then
+  # horrible hack to set sbcl-home for leeroy.defthm.com
+  export SBCL_HOME=/usr/local/lib/sbcl;
+fi
+
 LISP=`which $LISP`
 echo "Using LISP = $LISP"
 echo "Using STARTJOB = `which startjob`"

diff --git a/books/centaur/defrstobj/defrstobj.lisp b/books/centaur/defrstobj/defrstobj.lisp
@@ -104,7 +104,7 @@ recognizer function for a typed record; see @(see def-typed-record).</li>
       :inline t)
 })
 
-<p>See also @('centaur/rstobj/defrstobj-tests.lisp') for several more examples,
+<p>See also @('centaur/defrstobj/basic-tests.lisp') for several more examples,
 including examples of how to use @('def-typed-record').</p>
 
 

diff --git a/books/doc/relnotes.lisp b/books/doc/relnotes.lisp
@@ -348,9 +348,9 @@
  been added.</p>
 
  <h4>AVR ISA</h4>
- Julien Schmaltz and Peter Schwabes' AVR ISA model has been contributed in book
- \"projects/avr-isa\".
-  
+ <p>Julien Schmaltz and Peter Schwabes' AVR ISA model has been contributed in book
+ \"projects/avr-isa\".</p>
+
  <h4>Miscellaneous Books</h4>
 
  <p>The book \"clause-processors/use-by-hint\" now contains an additional