Updated info for jupyer-book format

Author: andreas-zeller

Chapters.makefile

@@ -98,6 +98,7 @@ FRONTMATTER = \
 EXTRAS = \
 	ReleaseNotes.ipynb \
 	Importing.ipynb \
+	Copyright.ipynb \
 	Guide_for_Authors.ipynb \
 	Template.ipynb \
 	404.ipynb

_config.yml

@@ -37,16 +37,18 @@ parse:
     - deflist
 
 html:
-  announcement: '<p>This is a beta version of fuzzingbook.org, currently in development. See the <a href="https://fuzzingbook.org/classic/"  style="color:white!important;">classic site</a> for resources.</p>'
+  announcement: '<p>This is a beta version of fuzzingbook.org, currently in development. See the <a href="https://fuzzingbook.org/classic/"  style="color:white!important;">classic site</a> for the 2024 version.</p>'
   use_issues_button: true
   use_repository_button: true
   extra_footer: |
     <div>
-      Copyright &copy; 
-      2021–2025 <a href="https://www.cispa.de/">CISPA Helmholtz Center for Information Security</a>. Copyright &copy; 2018-2020 <a href="https://www.uni-saarland.de/">Saarland University</a>. Copyright &copy; 2018-2025 external contributors.
-      The content of this project is licensed under the <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/">Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License</a>. The source code that is part of the content, as well as the source code used to format and display that content is licensed under the <a href="https://github.com/uds-se/fuzzingbook/blob/master/LICENSE.md#mit-license">MIT License</a>. <a href="https://cispa.de/en/impressum">Imprint</a>.
+      Copyright &copy; 2021–2025 <a href="https://www.cispa.de/">CISPA Helmholtz Center for Information Security</a>. Copyright &copy; 2018-2020 <a href="https://www.uni-saarland.de/">Saarland University</a>. Copyright &copy; 2018-2025 external contributors.
+      The <strong>content</strong> of this project is licensed under the <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/">Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License</a>.
+      The <strong>source code</strong> that is part of the content, as well as the source code used to format and display that content is licensed under the <a href="https://github.com/uds-se/fuzzingbook/blob/master/LICENSE.md#mit-license">MIT License</a>.
+      <br>
+      <a href="https://cispa.de/en/impressum">Imprint</a> &middot; <a href="/html/index.html#how-do-i-cite-your-work">Cite</a>
     </div>
-    
+
 sphinx:
   config:
     html_show_copyright: false

_toc.yml

@@ -59,4 +59,5 @@ parts:
     chapters:
     - file: ReleaseNotes
     - file: Importing
+    - file: Copyright
     - file: Guide_for_Authors

notebooks/Copyright.ipynb

@@ -0,0 +1,65 @@
+{
+ "cells": [
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "button": false,
+    "new_sheet": false,
+    "run_control": {
+     "read_only": false
+    }
+   },
+   "source": [
+    "# Copyright\n",
+    "\n",
+    "This material is copyright © \n",
+    "2021–2025 <a href=\"https://www.cispa.de/\">CISPA Helmholtz Center for Information Security</a>. Copyright &copy; 2018-2020 <a href=\"https://www.uni-saarland.de/\">Saarland University</a>. Copyright &copy; 2018-2025 external contributors.\n",
+    "\n",
+    "The <strong>content</strong> of this project is licensed under the <a href=\"https://creativecommons.org/licenses/by-nc-sa/4.0/\">Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License</a>.\n",
+    "\n",
+    "The <strong>source code</strong> that is part of the content, as well as the source code used to format and display that content is licensed under the <a href=\"https://github.com/uds-se/fuzzingbook/blob/master/LICENSE.md#mit-license\">MIT License</a>.\n",
+    "\n",
+    "<a href=\"https://cispa.de/en/impressum\">Imprint</a> &middot; <a href=\"/html/index.html#how-do-i-cite-your-work\">Cite</a>"
+   ]
+  }
+ ],
+ "metadata": {
+  "ipub": {
+   "bibliography": "fuzzingbook.bib",
+   "toc": true
+  },
+  "kernelspec": {
+   "display_name": "Python 3 (ipykernel)",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.9.7"
+  },
+  "toc": {
+   "base_numbering": 1,
+   "nav_menu": {},
+   "number_sections": true,
+   "sideBar": true,
+   "skip_h1_title": true,
+   "title_cell": "",
+   "title_sidebar": "Contents",
+   "toc_cell": false,
+   "toc_position": {},
+   "toc_section_display": true,
+   "toc_window_display": true
+  },
+  "toc-autonumbering": false
+ },
+ "nbformat": 4,
+ "nbformat_minor": 4
+}

notebooks/Importing.ipynb

@@ -22,7 +22,7 @@
     "In short, there are three ways:\n",
     "\n",
     "1. Simply run the notebooks in your browser, using the \"mybinder\" environment. Choose \"Binder\" from the menus at the top; this will lead you to a preconfigured Jupyter Notebook environment where you can toy around at your leisure.\n",
-    "2. Import the code for your own Python programs. Using `pip install fuzzingbook`, you can install all code and start using it from your own code. See \"Can I import the code for my own Python projects?\", below.\n",
+    "2. Import the code for your own Python programs. Using `pip install fuzzingbook`, you can install all code and start using it from your own code. See \"Installing Fuzzingbook Code for your own Python projects\", below.\n",
     "3. Download or check out the code and/or the notebooks from the project site. This allows you to edit and run all things locally. However, be sure to also install the required packages; see below for details."
    ]
   },
@@ -217,11 +217,13 @@
    "source": [
     "#### Installing Graphviz on Linux\n",
     "\n",
+    "Use\n",
+    "\n",
     "```sh\n",
     "$ sudo apt-get install graphviz libgraphviz-dev\n",
     "```\n",
     "\n",
-    "to install it. "
+    "to install `dot`."
    ]
   },
   {
@@ -319,6 +321,28 @@
     "\n",
     "to run the tests."
    ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Using Docker\n",
+    "\n",
+    "As another alternative, you can also **use our Docker images** (experimental). [Install Docker](https://docs.docker.com/get-docker/) and then run\n",
+    "```\n",
+    "    $ docker pull zeller24/fuzzingbook\n",
+    "    $ docker run -it --rm -p 8888:8888 zeller24/fuzzingbook\n",
+    "```\n",
+    "and then in your Web browser, open the URL (`http://127.0.0.1/...` or `http://localhost/...`) given in the console output.\n",
+    "This should kick off the same Jupyter environment as in mybinder.org.\n",
+    "\n",
+    "If you want to create your own Docker images, use our [Dockerfile](https://github.com/uds-se/fuzzingbook/blob/master/binder/Dockerfile) as a starting point."
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": []
   }
  ],
  "metadata": {

notebooks/Tours.ipynb

@@ -13,7 +13,7 @@
     }
    },
    "source": [
-    "# Tours through the Book\n",
+    "# Sitemap\n",
     "\n",
     "This book is _massive_.  With more than 20,000 lines of code and 150,000 words of text, a printed version would cover more than 1,200 pages of text.  Obviously, we do not assume that everybody wants to read everything."
    ]

notebooks/index.ipynb

@@ -125,22 +125,7 @@
    "source": [
     "#### Do I have alternatives to the interactive notebook?\n",
     "\n",
-    "If mybinder.org does not work or match your needs, you have a number of alternatives:\n",
-    "\n",
-    "1. **Download the Python code** (using the menu at the top) and edit and run it in your favorite environment.  This is easy to do and does not require lots of resources.\n",
-    "2. **Download the Jupyter Notebooks** (using the menu at the top) and open them in Jupyter.  Here's [how to install jupyter notebook on your machine](https://www.dataquest.io/blog/jupyter-notebook-tutorial/).\n",
-    "\n",
-    "For details, see our article on [Using Debuggingbook Code in your own Programs](Importing.ipynb).\n",
-    "\n",
-    "As another alternative, you can also **use our Docker images** (experimental). [Install Docker](https://docs.docker.com/get-docker/) and then run\n",
-    "```\n",
-    "    $ docker pull zeller24/fuzzingbook\n",
-    "    $ docker run -it --rm -p 8888:8888 zeller24/fuzzingbook\n",
-    "```\n",
-    "and then in your Web browser, open the URL (`http://127.0.0.1/...` or `http://localhost/...`) given in the console output.\n",
-    "This should give you the same environment as in mybinder.org.\n",
-    "\n",
-    "If you want to create your own Docker images, use our [Dockerfile](https://github.com/uds-se/fuzzingbook/blob/master/binder/Dockerfile) as a starting point."
+    "If mybinder.org does not work or match your needs, you can [download the code and/or notebooks and run them on your machine](Importing.ipynb)"
    ]
   },
   {
@@ -198,7 +183,7 @@
    "source": [
     "#### How do I cite your work?\n",
     "\n",
-    "Sure! Here's how to cite it:\n",
+    "Here's how to cite it:\n",
     "\n",
     "> Andreas Zeller, Rahul Gopinath, Marcel Böhme, Gordon Fraser, and Christian Holler: \"The Fuzzing Book\". CISPA Helmholtz Center for Information Security, 2024.\n",
     "\n",
@@ -276,18 +261,6 @@
     "We have compiled a number of [tours through the book](Tours.ipynb) for various audiences.  Our [Sitemap](00_Table_of_Contents.ipynb) lists the dependencies between the individual chapters."
    ]
   },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "#### How can I extend or adapt your slides?\n",
-    "\n",
-    "Download the Jupyter Notebooks (using the menu at the top) and adapt the notebooks at your leisure (see above), including \"Slide Type\" settings.  Then,\n",
-    "\n",
-    "1. Download slides from Jupyter Notebook; or\n",
-    "2. Use the RISE extension ([instructions](http://www.blog.pythonlibrary.org/2018/09/25/creating-presentations-with-jupyter-notebook/)) to present your slides right out of Jupyter notebook."
-   ]
-  },
   {
    "cell_type": "markdown",
    "metadata": {},