upstream update

.github/workflows/book.yml

@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly
+          toolchain: '1.76.0'
           override: true
 
       # - name: Setup mdBook
@@ -26,7 +26,7 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: install
-          args: mdbook --git https://github.com/HollowMan6/mdBook.git --rev 62e01b34c23b957579c04ee1b24b57814ed8a4d5
+          args: mdbook --git https://github.com/HollowMan6/mdBook.git --rev 5830c9555a4dc051675d17f1fcb04dd0920543e8
 
       - name: Install mdbook-katex and mdbook-pdf
         uses: actions-rs/cargo@v1
@@ -40,6 +40,11 @@ jobs:
       - name: Build halo2 book
         run: mdbook build book/
 
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: nightly-2023-10-05 
+          override: true
+
       - name: Build latest rustdocs
         uses: actions-rs/cargo@v1
         with:

.gitignore

@@ -4,5 +4,5 @@
 **/.*.swp
 **/*.rs.bk
 .vscode
-**/*.html
 .DS_Store
+/book/book

README.md

@@ -1,6 +1,9 @@
-# halo2 [![Crates.io](https://img.shields.io/crates/v/halo2.svg)](https://crates.io/crates/halo2) #
+# halo2
 
-## [Documentation](https://docs.rs/halo2)
+## Usage
+
+This repository contains the [halo2_proofs](halo2_proofs/README.md) and
+[halo2_gadgets](halo2_gadgets/README.md) crates, which should be used directly.
 
 ## Minimum Supported Rust Version
 

book/book.toml

@@ -2,7 +2,7 @@
 authors = [
     "Jack Grigg",
     "Sean Bowe",
-    "Daira Hopwood",
+    "Daira Emma Hopwood",
     "Ying Tong Lai",
 ]
 language = "en"
@@ -14,8 +14,6 @@ title = "The halo2 Book"
 macros = "macros.txt"
 renderers = ["html"]
 
-[output.katex]
-
 [output.html]
 
 [output.html.print]

halo2_gadgets/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.3.0"
 authors = [
     "Sean Bowe <[email protected]>",
     "Jack Grigg <[email protected]>",
-    "Daira Hopwood <[email protected]>",
+    "Daira Emma Hopwood <[email protected]>",
     "Ying Tong Lai <[email protected]>",
     "Kris Nuttycombe <[email protected]>",
 ]

halo2_proofs/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.3.0"
 authors = [
     "Sean Bowe <[email protected]>",
     "Ying Tong Lai <[email protected]>",
-    "Daira Hopwood <daira@electriccoin.co>",
+    "Daira Emma Hopwood <daira@jacaranda.org>",
     "Jack Grigg <[email protected]>",
 ]
 edition = "2021"