Make second edition the default (#437)

blog/content/first-edition/_index.md

@@ -1,4 +1,4 @@
 +++
 title = "First Edition"
-template = "index.html"
+template = "first-edition/index.html"
 +++

blog/content/first-edition/extra/naked-exceptions/01-catching-exceptions/index.md

@@ -3,6 +3,7 @@ title = "Catching Exceptions"
 order = 1
 path = "catching-exceptions"
 date  = 2016-05-28
+template = "first-edition/page.html"
 [extra]
 updated = "2016-06-25"
 +++
@@ -18,8 +19,8 @@ As always, the complete source code is on [Github]. Please file [issues] for any
 
 > **Note**: This post describes how to handle exceptions using naked functions (see [“Handling Exceptions with Naked Functions”] for an overview). Our new way of handling exceptions can be found in the [“Handling Exceptions”] post.
 
-[“Handling Exceptions with Naked Functions”]: ./extra/naked-exceptions/_index.md
+[“Handling Exceptions with Naked Functions”]: ./first-edition/extra/naked-exceptions/_index.md
-[“Handling Exceptions”]: ./posts/09-handling-exceptions/index.md
+[“Handling Exceptions”]: ./first-edition/posts/09-handling-exceptions/index.md
 
 ## Exceptions
 An exception signals that something is wrong with the current instruction. For example, the CPU issues an exception if the current instruction tries to divide by 0. When an exception occurs, the CPU interrupts its current work and immediately calls a specific exception handler function, depending on the exception type.

blog/content/first-edition/extra/naked-exceptions/02-better-exception-messages/index.md

@@ -3,6 +3,7 @@ title = "Better Exception Messages"
 order = 2
 path = "better-exception-messages"
 date  = 2016-08-03
+template = "first-edition/page.html"
 [extra]
 updated = "2016-11-01"
 +++
@@ -19,8 +20,8 @@ As always, the complete source code is on [Github]. Please file [issues] for any
 
 > **Note**: This post describes how to handle exceptions using naked functions (see [“Handling Exceptions with Naked Functions”] for an overview). Our new way of handling exceptions can be found in the [“Handling Exceptions”] post.
 
-[“Handling Exceptions with Naked Functions”]: ./extra/naked-exceptions/_index.md
+[“Handling Exceptions with Naked Functions”]: ./first-edition/extra/naked-exceptions/_index.md
-[“Handling Exceptions”]: ./posts/09-handling-exceptions/index.md
+[“Handling Exceptions”]: ./first-edition/posts/09-handling-exceptions/index.md
 
 ## Exceptions in Detail
 An exception signals that something is wrong with the currently-executed instruction. Whenever an exception occurs, the CPU interrupts its current work and starts an internal exception routine.

blog/content/first-edition/extra/naked-exceptions/03-returning-from-exceptions/index.md

@@ -3,6 +3,7 @@ title = "Returning from Exceptions"
 order = 3
 path = "returning-from-exceptions"
 date  = 2016-09-21
+template = "first-edition/page.html"
 [extra]
 updated = "2016-11-01"
 +++
@@ -19,8 +20,8 @@ As always, the complete source code is on [Github]. Please file [issues] for any
 
 > **Note**: This post describes how to handle exceptions using naked functions (see [“Handling Exceptions with Naked Functions”] for an overview). Our new way of handling exceptions can be found in the [“Handling Exceptions”] post.
 
-[“Handling Exceptions with Naked Functions”]: ./extra/naked-exceptions/_index.md
+[“Handling Exceptions with Naked Functions”]: ./first-edition/extra/naked-exceptions/_index.md
-[“Handling Exceptions”]: ./posts/09-handling-exceptions/index.md
+[“Handling Exceptions”]: ./first-edition/posts/09-handling-exceptions/index.md
 
 ## Introduction
 Most exceptions are fatal and can't be resolved. For example, we can't return from a divide-by-zero exception in a reasonable way. However, there are some exceptions that we can resolve:
@@ -40,7 +41,7 @@ The breakpoint exception is commonly used in debuggers: When the user sets a bre
 
 For our use case, we don't need to overwrite any instructions (it wouldn't even be possible since we [set the page table flags] to read-only). Instead, we just want to print a message when the breakpoint instruction is executed and then continue the program.
 
-[set the page table flags]: ./posts/07-remap-the-kernel/index.md#using-the-correct-flags
+[set the page table flags]: ./first-edition/posts/07-remap-the-kernel/index.md#using-the-correct-flags
 
 ### Catching Breakpoints
 Let's start by defining a handler function for the breakpoint exception:
@@ -214,7 +215,7 @@ Instead of the expected _“It did not crash”_ message after the breakpoint ex
 ### Debugging
 Let's debug it using GDB. For that we execute `make debug` in one terminal (which starts QEMU with the `-s -S` flags) and then `make gdb` (which starts and connects GDB) in a second terminal. For more information about GDB debugging, check out our [Set Up GDB] guide.
 
-[Set Up GDB]: ./extra/set-up-gdb/index.md
+[Set Up GDB]: ./first-edition/extra/set-up-gdb/index.md
 
 First we want to check if our `iretq` was successful. Therefore we set a breakpoint on the `println!("It did not crash line!")` statement in `src/lib.rs`. Let's assume that it's on line 61:
 
@@ -302,7 +303,7 @@ Unfortunately, Rust does not support such a calling convention. It was [proposed
 
 [interrupt calling conventions]: https://github.com/rust-lang/rfcs/pull/1275
 [Naked functions]: https://github.com/rust-lang/rfcs/blob/master/text/1201-naked-fns.md
-[naked fn post]: ./extra/naked-exceptions/02-better-exception-messages/index.md#naked-functions
+[naked fn post]: ./first-edition/extra/naked-exceptions/02-better-exception-messages/index.md#naked-functions
 
 ### A naked wrapper function
 
@@ -572,7 +573,7 @@ It doesn't compile anymore. The error tells us that the Rust compiler no longer
 The [core library] is implicitly linked to all `no_std` crates and contains things such as `Result`, `Option`, and iterators. We've used that library without problems since [the very beginning], so why is it no longer available?
 
 [core library]: https://doc.rust-lang.org/nightly/core/index.html
-[the very beginning]: ./posts/03-set-up-rust/index.md
+[the very beginning]: ./first-edition/posts/03-set-up-rust/index.md
 
 The problem is that the core library is distributed together with the Rust compiler as a _precompiled_ library. So it is only valid for the host triple, which is `x86_64-unknown-linux-gnu` in our case. If we want to compile code for other targets, we need to recompile `core` for these targets first.
 

blog/content/first-edition/extra/naked-exceptions/_index.md

@@ -1,6 +1,6 @@
 +++
 title = "Handling Exceptions using naked Functions"
 sort_by = "order"
-template = "handling-exceptions-with-naked-fns.html"
+template = "first-edition/handling-exceptions-with-naked-fns.html"
 insert_anchor_links = "left"
 +++

blog/content/first-edition/posts/01-multiboot-kernel/index.md

@@ -3,6 +3,7 @@ title = "A minimal Multiboot Kernel"
 order = 1
 path = "multiboot-kernel/"
 date  = 2015-08-18
+template = "first-edition/page.html"
 +++
 
 This post explains how to create a minimal x86 operating system kernel using the Multiboot standard. In fact, it will just boot and print `OK` to the screen. In subsequent blog posts we will extend it using the [Rust] programming language.
@@ -185,7 +186,7 @@ Idx Name      Size      VMA               LMA               File off  Algn
 ```
 _Note_: The `ld` and `objdump` commands are platform specific. If you're _not_ working on x86_64 architecture, you will need to [cross compile binutils]. Then use `x86_64‑elf‑ld` and `x86_64‑elf‑objdump` instead of `ld` and `objdump`.
 
-[cross compile binutils]: ./extra/cross-compile-binutils.md
+[cross compile binutils]: ./first-edition/extra/cross-compile-binutils.md
 
 ## Creating the ISO
 All PC BIOSes know how to boot from a CD-ROM, so we want to create a bootable CD-ROM image, containing our kernel and the GRUB bootloader's files, in a single file called an [ISO](https://en.wikipedia.org/wiki/ISO_image). Make the following directory structure and copy the `kernel.bin` to the right place:
@@ -315,7 +316,7 @@ Now we can invoke `make` and all updated assembly files are compiled and linked.
 
 In the [next post] we will create a page table and do some CPU configuration to switch to the 64-bit [long mode].
 
-[next post]: ./posts/02-entering-longmode/index.md
+[next post]: ./first-edition/posts/02-entering-longmode/index.md
 [long mode]: https://en.wikipedia.org/wiki/Long_mode
 
 ## Footnotes

blog/content/first-edition/posts/02-entering-longmode/index.md

@@ -3,13 +3,14 @@ title = "Entering Long Mode"
 order = 2
 path = "entering-longmode"
 date  = 2015-08-25
+template = "first-edition/page.html"
 [extra]
 updated = "2015-10-29"
 +++
 
 In the [previous post] we created a minimal multiboot kernel. It just prints `OK` and hangs. The goal is to extend it and call 64-bit [Rust] code. But the CPU is currently in [protected mode] and allows only 32-bit instructions and up to 4GiB memory. So we need to set up _Paging_ and switch to the 64-bit [long mode] first.
 
-[previous post]: ./posts/01-multiboot-kernel/index.md
+[previous post]: ./first-edition/posts/01-multiboot-kernel/index.md
 [Rust]: http://www.rust-lang.org/
 [protected mode]: https://en.wikipedia.org/wiki/Protected_mode
 [long mode]: https://en.wikipedia.org/wiki/Long_mode
@@ -37,7 +38,7 @@ error:
 At address `0xb8000` begins the so-called [VGA text buffer]. It's an array of screen characters that are displayed by the graphics card. A [future post] will cover the VGA buffer in detail and create a Rust interface to it. But for now, manual bit-fiddling is the easiest option.
 
 [VGA text buffer]: https://en.wikipedia.org/wiki/VGA-compatible_text_mode
-[future post]: ./posts/04-printing-to-screen/index.md
+[future post]: ./first-edition/posts/04-printing-to-screen/index.md
 
 A screen character consists of a 8 bit color code and a 8 bit [ASCII] character. We used the color code `4f` for all characters, which means white text on red background. `0x52` is an ASCII `R`, `0x45` is an `E`, `0x3a` is a `:`, and `0x20` is a space. The second space is overwritten by the given ASCII byte. Finally the CPU is stopped with the `hlt` instruction.
 
@@ -492,8 +493,8 @@ _Congratulations_! You have successfully wrestled through this CPU configuration
 #### One Last Thing
 Above, we reloaded the code segment register `cs` with the new GDT offset. However, the data segment registers `ss`, `ds`, `es`, `fs`, and `gs` still contain the data segment offsets of the old GDT. This isn't necessarily bad, since they're ignored by almost all instructions in 64-bit mode. However, there are a few instructions that expect a valid data segment descriptor _or the null descriptor_ in those registers. An example is the the [iretq] instruction that we'll need in the [_Returning from Exceptions_] post.
 
-[iretq]: ./extra/naked-exceptions/03-returning-from-exceptions/index.md#the
+[iretq]: ./first-edition/extra/naked-exceptions/03-returning-from-exceptions/index.md#the
-[_Returning from Exceptions_]: ./extra/naked-exceptions/03-returning-from-exceptions/index.md
+[_Returning from Exceptions_]: ./first-edition/extra/naked-exceptions/03-returning-from-exceptions/index.md
 
 To avoid future problems, we reload all data segment registers with null:
 
@@ -515,7 +516,7 @@ long_mode_start:
 It's time to finally leave assembly behind and switch to [Rust]. Rust is a systems language without garbage collections that guarantees memory safety. Through a real type system and many abstractions it feels like a high-level language but can still be low-level enough for OS development. The [next post] describes the Rust setup.
 
 [Rust]: https://www.rust-lang.org/
-[next post]: ./posts/03-set-up-rust/index.md
+[next post]: ./first-edition/posts/03-set-up-rust/index.md
 
 ## Footnotes
 [^hardware_lookup]: In the x86 architecture, the page tables are _hardware walked_, so the CPU will look at the table on its own when it needs a translation. Other architectures, for example MIPS, just throw an exception and let the OS translate the virtual address.

blog/content/first-edition/posts/03-set-up-rust/index.md

@@ -3,14 +3,15 @@ title = "Set Up Rust"
 order = 3
 path = "set-up-rust"
 date  = 2015-09-02
+template = "first-edition/page.html"
 [extra]
 updated = "2017-04-12"
 +++
 
 In the previous posts we created a [minimal Multiboot kernel][multiboot post] and [switched to Long Mode][long mode post]. Now we can finally switch to [Rust] code. Rust is a high-level language without runtime. It allows us to not link the standard library and write bare metal code. Unfortunately the setup is not quite hassle-free yet.
 
-[multiboot post]: ./posts/01-multiboot-kernel/index.md
+[multiboot post]: ./first-edition/posts/01-multiboot-kernel/index.md
-[long mode post]: ./posts/02-entering-longmode/index.md
+[long mode post]: ./first-edition/posts/02-entering-longmode/index.md
 [Rust]: https://www.rust-lang.org/
 
 <!-- more -->
@@ -90,7 +91,7 @@ Let's define some properties of our target system:
 - **No SSE**: Our target might not have [SSE] support. Even if it does, we probably don't want to use SSE instructions in our kernel, because it makes interrupt handling much slower. We will explain this in detail in the [“Handling Exceptions”] post.
 - **No hardware floats**: The `x86_64` architecture uses SSE instructions for floating point operations, which we don't want to use (see the previous point). So we also need to avoid hardware floating point operations in our kernel. Instead, we will use _soft floats_, which are basically software functions that emulate floating point operations using normal integers.
 
-[“Handling Exceptions”]: ./posts/09-handling-exceptions/index.md
+[“Handling Exceptions”]: ./first-edition/posts/09-handling-exceptions/index.md
 
 ### Target Specifications
 Rust allows us to define [custom targets] through a JSON configuration file. A minimal target specification equal to `x86_64-unknown-linux-gnu` (the default 64-bit Linux target) looks like this:
@@ -484,10 +485,10 @@ Some notes:
 ### Stack Overflows
 Since we still use the small 64 byte [stack from the last post], we must be careful not to [overflow] it. Normally, Rust tries to avoid stack overflows through _guard pages_: The page below the stack isn't mapped and such a stack overflow triggers a page fault (instead of silently overwriting random memory). But we can't unmap the page below our stack right now since we currently use only a single big page. Fortunately the stack is located just above the page tables. So some important page table entry would probably get overwritten on stack overflow and then a page fault occurs, too.
 
-[stack from the last post]: ./posts/02-entering-longmode/index.md#creating-a-stack
+[stack from the last post]: ./first-edition/posts/02-entering-longmode/index.md#creating-a-stack
 [overflow]: https://en.wikipedia.org/wiki/Stack_overflow
 
 ## What's next?
 Until now we write magic bits to some memory location when we want to print something to screen. In the [next post] we create a abstraction for the VGA text buffer that allows us to print strings in different colors and provides a simple interface.
 
-[next post]: ./posts/04-printing-to-screen/index.md
+[next post]: ./first-edition/posts/04-printing-to-screen/index.md

blog/content/first-edition/posts/04-printing-to-screen/index.md

@@ -3,13 +3,14 @@ title = "Printing to Screen"
 order = 4
 path = "printing-to-screen"
 date  = 2015-10-23
+template = "first-edition/page.html"
 [extra]
 updated = "2016-10-31"
 +++
 
 In the [previous post] we switched from assembly to [Rust], a systems programming language that provides great safety. But so far we are using unsafe features like [raw pointers] whenever we want to print to screen. In this post we will create a Rust module that provides a safe and easy-to-use interface for the VGA text buffer. It will support Rust's [formatting macros], too.
 
-[previous post]: ./posts/03-set-up-rust/index.md
+[previous post]: ./first-edition/posts/03-set-up-rust/index.md
 [Rust]: https://www.rust-lang.org/
 [raw pointers]: https://doc.rust-lang.org/book/raw-pointers.html
 [formatting macros]: https://doc.rust-lang.org/std/fmt/#related-macros
@@ -642,7 +643,7 @@ In the next posts we will map the kernel pages correctly so that accessing `0x0`
 
 The [next post] describes the Multiboot information structure and creates a frame allocator using the information about memory areas.
 
-[next post]: ./posts/05-allocating-frames/index.md
+[next post]: ./first-edition/posts/05-allocating-frames/index.md
 
 ## Other Rust OS Projects
 Now that you know the very basics of OS development in Rust, you should also check out the following projects:
@@ -658,7 +659,7 @@ _Note_: You need to [cross compile binutils] to build it (or you create some sym
 
 [Rust Bare-Bones Kernel]: https://github.com/thepowersgang/rust-barebones-kernel
 [higher half]: http://wiki.osdev.org/Higher_Half_Kernel
-[cross compile binutils]: ./extra/cross-compile-binutils.md
+[cross compile binutils]: ./first-edition/extra/cross-compile-binutils.md
 [RustOS]: https://github.com/RustOS-Fork-Holding-Ground/RustOS
 ["Tifflin" Experimental Kernel]:https://github.com/thepowersgang/rust_os
 [Redox]: https://github.com/redox-os/redox

blog/content/first-edition/posts/05-allocating-frames/index.md

@@ -3,6 +3,7 @@ title = "Allocating Frames"
 order = 5
 path = "allocating-frames"
 date  = 2015-11-15
+template = "first-edition/page.html"
 +++
 
 In this post we create an allocator that provides free physical frames for a future paging module. To get the required information about available and used memory we use the Multiboot information structure. Additionally, we improve the `panic` handler to print the corresponding message and source line.
@@ -428,10 +429,10 @@ Now we have a working frame allocator. It is a bit rudimentary and cannot free f
 ## What's next?
 The [next post] will be about paging again. We will use the frame allocator to create a safe module that allows us to switch page tables and map pages. Then we will use this module and the information from the Elf-sections tag to remap the kernel correctly.
 
-[next post]: ./posts/06-page-tables/index.md
+[next post]: ./first-edition/posts/06-page-tables/index.md
 
 ## Recommended Posts
 Eric Kidd started the [Bare Metal Rust] series last week. Like this post, it builds upon the code from [Printing to Screen], but tries to support keyboard input instead of wrestling through memory management details.
 
 [Bare Metal Rust]: http://www.randomhacks.net/bare-metal-rust/
-[Printing to Screen]: ./posts/04-printing-to-screen/index.md
+[Printing to Screen]: ./first-edition/posts/04-printing-to-screen/index.md

blog/content/first-edition/posts/06-page-tables/index.md

@@ -3,6 +3,7 @@ title = "Page Tables"
 order = 6
 path = "page-tables"
 date  = 2015-12-09
+template = "first-edition/page.html"
 +++
 
 In this post we will create a paging module, which allows us to access and modify the 4-level page table. We will explore recursive page table mapping and use some Rust features to make it safe. Finally we will create functions to translate virtual addresses and to map and unmap pages.
@@ -50,7 +51,7 @@ pub struct Page {
 ```
 We import the `PAGE_SIZE` and define a constant for the number of entries per table. To make future function signatures more expressive, we can use the type aliases `PhysicalAddress` and `VirtualAddress`. The `Page` struct is similar to the `Frame` struct in the [previous post], but represents a virtual page instead of a physical frame.
 
-[previous post]: ./posts/05-allocating-frames/index.md#a-memory-module
+[previous post]: ./first-edition/posts/05-allocating-frames/index.md#a-memory-module
 
 ### Page Table Entries
 To model page table entries, we create a new `entry` submodule:
@@ -650,7 +651,7 @@ pub struct ActivePageTable {
 ```
 We can't store the `Table<Level4>` directly because it needs to be at a special memory location (like the [VGA text buffer]). We could use a raw pointer or `&mut` instead of [Unique], but Unique indicates ownership better.
 
-[VGA text buffer]: ./posts/04-printing-to-screen/index.md#the-text-buffer
+[VGA text buffer]: ./first-edition/posts/04-printing-to-screen/index.md#the-text-buffer
 [Unique]: https://doc.rust-lang.org/nightly/core/ptr/struct.Unique.html
 
 Because the `ActivePageTable` owns the unique recursive mapped P4 table, there must be only one `ActivePageTable` instance. Thus we make the constructor function unsafe:
@@ -879,7 +880,7 @@ This post has become pretty long. So let's summarize what we've done:
 ## What's next?
 In the [next post] we will extend this module and add a function to modify inactive page tables. Through that function, we will create a new page table hierarchy that maps the kernel correctly using 4KiB pages. Then we will switch to the new table to get a safer kernel environment.
 
-[next post]: ./posts/07-remap-the-kernel/index.md
+[next post]: ./first-edition/posts/07-remap-the-kernel/index.md
 
 Afterwards, we will use this paging module to build a heap allocator. This will allow us to use allocation and collection types such as `Box` and `Vec`.
 

blog/content/first-edition/posts/07-remap-the-kernel/index.md

@@ -3,6 +3,7 @@ title = "Remap the Kernel"
 order = 7
 path = "remap-the-kernel"
 date  = 2016-01-01
+template = "first-edition/page.html"
 [extra]
 updated = "2016-03-06"
 +++
@@ -19,18 +20,18 @@ As always, you can find the source code on [Github]. Don't hesitate to file issu
 
 In the [previous post], we had a strange bug in the `unmap` function. Its reason was a silent stack overflow, which corrupted the page tables. Fortunately, our kernel stack is right above the page tables so that we noticed the overflow relatively quickly. This won't be the case when we add threads with new stacks in the future. Then a silent stack overflow could overwrite some data without us noticing. But eventually some completely unrelated function fails because a variable changed its value.
 
-[previous post]: ./posts/06-page-tables/index.md
+[previous post]: ./first-edition/posts/06-page-tables/index.md
 
 As you can imagine, these kinds of bugs are horrendous to debug. For that reason we will create a new hierarchical page table in this post, which has _guard page_ below the stack. A guard page is basically an unmapped page that causes a page fault when accessed. Thus we can catch stack overflows right when they happen.
 
 Also, we will use the [information about kernel sections] to map the various sections individually instead of blindly mapping the first gigabyte. To improve safety even further, we will set the correct page table flags for the various sections. Thus it won't be possible to modify the contents of `.text` or to execute code from `.data` anymore.
 
-[information about kernel sections]: ./posts/05-allocating-frames/index.md#kernel-elf-sections
+[information about kernel sections]: ./first-edition/posts/05-allocating-frames/index.md#kernel-elf-sections
 
 ## Preparation
 There are many things that can go wrong when we switch to a new table. Therefore it's a good idea to [set up a debugger][set up gdb]. You should not need it when you follow this post, but it's good to know how to debug a problem when it occurs[^fn-debug-notes].
 
-[set up gdb]: ./extra/set-up-gdb/index.md
+[set up gdb]: ./first-edition/extra/set-up-gdb/index.md
 
 We also update the `Page` and `Frame` types to make our lives easier. The `Page` struct gets some derived traits:
 
@@ -279,7 +280,7 @@ pub fn map_table_frame(&mut self,
 ```
 This function interprets the given frame as a page table frame and returns a `Table` reference. We return a table of level 1 because it [forbids calling the `next_table` methods][some clever solution]. Calling `next_table` must not be possible since it's not a page of the recursive mapping. To be able to return a `Table<Level1>`, we need to make the `Level1` enum in `memory/paging/table.rs` public.
 
-[some clever solution]: ./posts/06-page-tables/index.md#some-clever-solution
+[some clever solution]: ./first-edition/posts/06-page-tables/index.md#some-clever-solution
 
 
 The `unsafe` block is safe since the `VirtualAddress` returned by the `map` function is always valid and the type cast just reinterprets the frame's content.
@@ -552,7 +553,7 @@ First, we create a temporary page at page number `0xcafebabe`. We could use `0xd
 
 Then we use the `with` function to temporary change the recursive mapping and execute the closure as if the `new_table` were active. This allows us to map the sections in the new table without changing the active mapping. To get the kernel sections, we use the [Multiboot information structure].
 
-[Multiboot information structure]: ./posts/05-allocating-frames/index.md#the-multiboot-information-structure
+[Multiboot information structure]: ./first-edition/posts/05-allocating-frames/index.md#the-multiboot-information-structure
 
 Let's resolve the above `TODO` by identity mapping the sections:
 
@@ -804,7 +805,7 @@ Let's cross our fingers and run it…
 ### Debugging
 A QEMU boot loop indicates that some CPU exception occured. We can see all thrown CPU exception by starting QEMU with `-d int` (as described [here][qemu debugging]):
 
-[qemu debugging]: ./posts/03-set-up-rust/index.md#debugging
+[qemu debugging]: ./first-edition/posts/03-set-up-rust/index.md#debugging
 
 ```bash
 > qemu-system-x86_64 -d int -no-reboot -cdrom build/os-x86_64.iso
@@ -829,8 +830,8 @@ These lines are the important ones. We can read many useful information from the
 [osdev exception overview]: http://wiki.osdev.org/Exceptions
 [page fault]: http://wiki.osdev.org/Exceptions#Page_Fault
 [page fault error code]: http://wiki.osdev.org/Exceptions#Error_code
-[GDT segment]: ./posts/02-entering-longmode/index.md#loading-the-gdt
+[GDT segment]: ./first-edition/posts/02-entering-longmode/index.md#loading-the-gdt
-[VGA text buffer]: ./posts/04-printing-to-screen/index.md#the-vga-text-buffer
+[VGA text buffer]: ./first-edition/posts/04-printing-to-screen/index.md#the-vga-text-buffer
 
 So let's find out which function caused the exception:
 
@@ -1028,7 +1029,7 @@ The final step is to create a guard page for our kernel stack.
 
 The decision to place the kernel stack right above the page tables was already useful to detect a silent stack overflow in the [previous post][silent stack overflow]. Now we profit from it again. Let's look at our assembly `.bss` section again to understand why:
 
-[silent stack overflow]: ./posts/06-page-tables/index.md#translate
+[silent stack overflow]: ./first-edition/posts/06-page-tables/index.md#translate
 
 ```nasm
 ; in src/arch/x86_64/boot.asm
@@ -1089,7 +1090,7 @@ Unfortunately stack probes require compiler support. They already work on Window
 ## What's next?
 Now that we have a (mostly) safe kernel stack and a working page table module, we can add a virtual memory allocator. The [next post] will explore Rust's allocator API and create a very basic allocator. At the end of that post, we will be able to use Rust's allocation and collections types such as [Box], [Vec], or even [BTreeMap].
 
-[next post]: ./posts/08-kernel-heap/index.md
+[next post]: ./first-edition/posts/08-kernel-heap/index.md
 [Box]: https://doc.rust-lang.org/nightly/alloc/boxed/struct.Box.html
 [Vec]: https://doc.rust-lang.org/nightly/collections/vec/struct.Vec.html
 [BTreeMap]: https://doc.rust-lang.org/nightly/collections/btree_map/struct.BTreeMap.html

blog/content/first-edition/posts/08-kernel-heap/index.md

@@ -4,12 +4,13 @@ order = 8
 path = "kernel-heap"
 date  = 2016-04-11
 updated = "2017-11-19"
+template = "first-edition/page.html"
 +++
 
 In the previous posts we created a [frame allocator] and a [page table module]. Now we are ready to create a kernel heap and a memory allocator. Thus, we will unlock `Box`, `Vec`, `BTreeMap`, and the rest of the [alloc] crate.
 
-[frame allocator]: ./posts/05-allocating-frames/index.md
+[frame allocator]: ./first-edition/posts/05-allocating-frames/index.md
-[page table module]: ./posts/06-page-tables/index.md
+[page table module]: ./first-edition/posts/06-page-tables/index.md
 [alloc]: https://doc.rust-lang.org/nightly/alloc/index.html
 
 <!-- more -->
@@ -458,8 +459,8 @@ That's it. Now our `memory::init` function can only be called once. The macro wo
 ### Mapping the Heap
 Now we're ready to map the heap pages. In order to do it, we need access to the `ActivePageTable` or `Mapper` instance (see the [page table] and [kernel remapping] posts). For that we return it from the `paging::remap_the_kernel` function:
 
-[page table]: ./posts/06-page-tables/index.md
+[page table]: ./first-edition/posts/06-page-tables/index.md
-[kernel remapping]: ./posts/07-remap-the-kernel/index.md
+[kernel remapping]: ./first-edition/posts/07-remap-the-kernel/index.md
 
 ```rust
 // in src/memory/paging/mod.rs
@@ -734,4 +735,4 @@ Now we're able to use heap storage in our kernel without leaking memory. This al
 ## What's next?
 This post concludes the section about memory management for now. We will revisit this topic eventually, but now it's time to explore other topics. The upcoming posts will be about CPU exceptions and interrupts. We will catch all page, double, and triple faults and create a driver to read keyboard input. The [next post] starts by setting up a so-called _Interrupt Descriptor Table_.
 
-[next post]: ./posts/09-handling-exceptions/index.md
+[next post]: ./first-edition/posts/09-handling-exceptions/index.md

blog/content/first-edition/posts/09-handling-exceptions/index.md

@@ -3,6 +3,7 @@ title = "Handling Exceptions"
 order = 9
 path = "handling-exceptions"
 date  = 2017-03-26
+template = "first-edition/page.html"
 +++
 
 In this post, we start exploring CPU exceptions. Exceptions occur in various erroneous situations, for example when accessing an invalid memory address or when dividing by zero. To catch them, we have to set up an _interrupt descriptor table_ that provides handler functions. At the end of this post, our kernel will be able to catch [breakpoint exceptions] and to resume normal execution afterwards.
@@ -227,7 +228,7 @@ The breakpoint exception is commonly used in debuggers: When the user sets a bre
 
 For our use case, we don't need to overwrite any instructions (it wouldn't even be possible since we [set the page table flags] to read-only). Instead, we just want to print a message when the breakpoint instruction is executed and then continue the program.
 
-[set the page table flags]: ./posts/07-remap-the-kernel/index.md#using-the-correct-flags
+[set the page table flags]: ./first-edition/posts/07-remap-the-kernel/index.md#using-the-correct-flags
 
 So let's create a simple `breakpoint_handler` function and add it to our IDT:
 
@@ -459,7 +460,7 @@ The documentation of the [`Idt`] struct and the [OSDev Wiki][osdev wiki exceptio
 ## Too much Magic?
 The `x86-interrupt` calling convention and the [`Idt`] type made the exception handling process relatively straightforward and painless. If this was too much magic for you and you like to learn all the gory details of exception handling, we got you covered: Our [“Handling Exceptions with Naked Functions”] series shows how to handle exceptions without the `x86-interrupt` calling convention and also creates its own `Idt` type. Historically, these posts were the main exception handling posts before the `x86-interrupt` calling convention and the `x86_64` crate existed.
 
-[“Handling Exceptions with Naked Functions”]: ./extra/naked-exceptions/_index.md
+[“Handling Exceptions with Naked Functions”]: ./first-edition/extra/naked-exceptions/_index.md
 
 ## What's next?
 We've successfully caught our first exception and returned from it! The next step is to add handlers for other common exceptions such as page faults. We also need to make sure that we never cause a [triple fault], since it causes a complete system reset. The next post explains how we can avoid this by correctly catching [double faults].

blog/content/first-edition/posts/10-double-faults/index.md

@@ -3,6 +3,7 @@ title = "Double Faults"
 order = 10
 path = "double-faults"
 date  = 2017-01-02
+template = "first-edition/page.html"
 +++
 
 In this post we explore double faults in detail. We also set up an _Interrupt Stack Table_ to catch double faults on a separate kernel stack. This way, we can completely prevent triple faults, even on kernel stack overflow.
@@ -18,7 +19,7 @@ As always, the complete source code is available on [Github]. Please file [issue
 ## What is a Double Fault?
 In simplified terms, a double fault is a special exception that occurs when the CPU fails to invoke an exception handler. For example, it occurs when a page fault is triggered but there is no page fault handler registered in the [Interrupt Descriptor Table][IDT] (IDT). So it's kind of similar to catch-all blocks in programming languages with exceptions, e.g. `catch(...)` in C++ or `catch(Exception e)` in Java or C#.
 
-[IDT]: ./posts/09-handling-exceptions/index.md#the-interrupt-descriptor-table
+[IDT]: ./first-edition/posts/09-handling-exceptions/index.md#the-interrupt-descriptor-table
 
 A double fault behaves like a normal exception. It has the vector number `8` and we can define a normal handler function for it in the IDT. It is really important to provide a double fault handler, because if a double fault is unhandled a fatal _triple fault_ occurs. Triple faults can't be caught and most hardware reacts with a system reset.
 
@@ -117,7 +118,7 @@ For example, what happens if… :
 3. a divide-by-zero handler causes a breakpoint exception, but the breakpoint handler is swapped out?
 4. our kernel overflows its stack and the [guard page] is hit?
 
-[guard page]: ./posts/07-remap-the-kernel/index.md#creating-a-guard-page
+[guard page]: ./first-edition/posts/07-remap-the-kernel/index.md#creating-a-guard-page
 
 Fortunately, the AMD64 manual ([PDF][AMD64 manual]) has an exact definition (in Section 8.2.9). According to it, a “double fault exception _can_ occur when a second exception occurs during the handling of a prior (first) exception handler”. The _“can”_ is important: Only very specific combinations of exceptions lead to a double fault. These combinations are:
 
@@ -197,7 +198,7 @@ struct InterruptStackTable {
 
 For each exception handler, we can choose an stack from the IST through the `options` field in the corresponding [IDT entry]. For example, we could use the first stack in the IST for our double fault handler. Then the CPU would automatically switch to this stack whenever a double fault occurs. This switch would happen before anything is pushed, so it would prevent the triple fault.
 
-[IDT entry]: ./posts/09-handling-exceptions/index.md#the-interrupt-descriptor-table
+[IDT entry]: ./first-edition/posts/09-handling-exceptions/index.md#the-interrupt-descriptor-table
 
 ### Allocating a new Stack
 In order to fill an Interrupt Stack Table later, we need a way to allocate new stacks. Therefore we extend our `memory` module with a new `stack_allocator` submodule:
@@ -228,7 +229,7 @@ impl StackAllocator {
 ```
 We create a simple `StackAllocator` that allocates stacks from a given range of pages (`PageIter` is an Iterator over a range of pages; we introduced it [in the kernel heap post].).
 
-[in the kernel heap post]:  ./posts/08-kernel-heap/index.md#mapping-the-heap
+[in the kernel heap post]:  ./first-edition/posts/08-kernel-heap/index.md#mapping-the-heap
 
 We add a `alloc_stack` method that allocates a new stack:
 
@@ -283,8 +284,8 @@ impl StackAllocator {
 ```
 The method takes mutable references to the [ActivePageTable] and a [FrameAllocator], since it needs to map the new virtual stack pages to physical frames. We define that the stack size is a multiple of the page size.
 
-[ActivePageTable]: ./posts/06-page-tables/index.md#page-table-ownership
+[ActivePageTable]: ./first-edition/posts/06-page-tables/index.md#page-table-ownership
-[FrameAllocator]: ./posts/05-allocating-frames/index.md#a-frame-allocator
+[FrameAllocator]: ./first-edition/posts/05-allocating-frames/index.md#a-frame-allocator
 
 Instead of operating directly on `self.range`, we [clone] it and only write it back on success. This way, subsequent stack allocations can still succeed if there are pages left (e.g., a call with `size_in_pages = 3` can still succeed after a failed call with `size_in_pages = 100`).
 
@@ -295,7 +296,7 @@ In order to be able to clone `PageIter`, we add a `#[derive(Clone)]` to its defi
 The actual allocation is straightforward: First, we choose the next page as [guard page]. Then we choose the next `size_in_pages` pages as stack pages using [Iterator::nth]. If all three variables are `Some`, the allocation succeeded and we map the stack pages to physical frames using [ActivePageTable::map]. The guard page remains unmapped.
 
 [Iterator::nth]: https://doc.rust-lang.org/nightly/core/iter/trait.Iterator.html#method.nth
-[ActivePageTable::map]: ./posts/06-page-tables/index.md#more-mapping-functions
+[ActivePageTable::map]: ./first-edition/posts/06-page-tables/index.md#more-mapping-functions
 
 Finally, we create and return a new `Stack`, which we define as follows:
 
@@ -503,7 +504,7 @@ The Global Descriptor Table (GDT) is a relict that was used for [memory segmenta
 
 We already created a GDT [when switching to long mode]. Back then, we used assembly to create valid code and data segment descriptors, which were required to enter 64-bit mode. We could just edit that assembly file and add an additional TSS descriptor. However, we now have the expressiveness of Rust, so let's do it in Rust instead.
 
-[when switching to long mode]: ./posts/02-entering-longmode/index.md#the-global-descriptor-table
+[when switching to long mode]: ./first-edition/posts/02-entering-longmode/index.md#the-global-descriptor-table
 
 We start by creating a new `interrupts::gdt` submodule. For that we need to rename the `src/interrupts.rs` file to `src/interrupts/mod.rs`. Then we can create a new submodule:
 

blog/content/news/2018-03-09-pure-rust.md

@@ -23,7 +23,7 @@ The [first edition] required several C-tools for building:
 [`GRUB`]: https://www.gnu.org/software/grub/
 [`grub-mkrescue`]: https://www.gnu.org/software/grub/manual/grub/html_node/Invoking-grub_002dmkrescue.html
 [`xorriso`]: https://www.gnu.org/software/xorriso/
-[entering long mode]: ./posts/02-entering-longmode/index.md
+[entering long mode]: ./first-edition/posts/02-entering-longmode/index.md
 [`nasm`]: http://www.nasm.us/xdoc/2.13.03/html/nasmdoc1.html
 [`ld`]: https://ftp.gnu.org/old-gnu/Manuals/ld-2.9.1/html_node/ld_3.html
 [linker script]: http://www.scoberlin.de/content/media/http/informatik/gcc_docs/ld_3.html

blog/static/css/main.css

@@ -58,6 +58,11 @@ main img {
   border: 2px solid #aaa;
 }
 
+.posts.first-edition {
+  border: 2px solid #aaa;
+  background-color: #99ff0022;
+}
+
 .posts.bare-bones {
   border: 2px solid #66f;
 }

blog/templates/first-edition/base.html

@@ -14,14 +14,14 @@
 
     <script async src="/js/main.js"></script>
 
-    <title>{% block title %}{% endblock title %}</title>
+    <title>{% block title %}{% endblock title %} (First Edition)</title>
 </head>
 
 <body>
     <div class="container content">
         <header class="masthead">
             <h1 class="masthead-title">
-                <a href="/" title="Home">{{ config.title }}</a>
+                <a href="/first-edition" title="Home">{{ config.title }} (First Edition)</a>
             </h1>
             <p><small>{{ config.extra.subtitle }}</small></p>
         </header>

blog/templates/first-edition/handling-exceptions-with-naked-fns.html

@@ -1,4 +1,4 @@
-{% extends "section.html" %}
+{% extends "first-edition/section.html" %}
 
 {% block title %}{{ super() }}{% endblock title %}
 
@@ -6,6 +6,6 @@
 
 {% block introduction %}
 
-    <p>These posts explain how to handle CPU exceptions using naked functions. Historically, these posts were the main exception handling posts before the <code>x86-interrupt</code> calling convention and the <code>x86_64</code> crate existed. Our new way of handling exceptions can be found in the <a href="{{ get_url(path="./posts/09-handling-exceptions/index.md") }}">“Handling Exceptions”</a> post.</p>
+    <p>These posts explain how to handle CPU exceptions using naked functions. Historically, these posts were the main exception handling posts before the <code>x86-interrupt</code> calling convention and the <code>x86_64</code> crate existed. Our new way of handling exceptions can be found in the <a href="{{ get_url(path="./first-edition/posts/09-handling-exceptions/index.md") }}">“Handling Exceptions”</a> post.</p>
 
 {% endblock introduction %}

blog/templates/first-edition/index.html

@@ -0,0 +1,66 @@
+{% extends "first-edition/base.html" %}
+
+{% import "macros.html" as macros %}
+
+{% block title %}{{ config.title }}{% endblock title %}
+
+{% block main %}
+{% set posts_section = get_section(path = "first-edition/posts/_index.md") %}
+{% set posts = posts_section.pages | reverse %}
+<div class="front-page-introduction">
+    <p>
+        This blog series creates a small operating system in the
+        <a href="https://www.rust-lang.org/">Rust programming language</a>. Each post is a small tutorial and includes all
+        needed code, so you can follow along if you like. The source code is also available in the corresponding
+        <a href="https://github.com/phil-opp/blog_os">Github repository</a>.
+    </p>
+    <p>Latest post:
+        {% set latest_post = posts|last %}
+        <strong><a href="/{{ latest_post.path | safe }}">{{ latest_post.title }}</a></strong>
+    </p>
+</div>
+
+<div class="warning">
+    <b>No longer updated!</b> You are viewing the first edition of “Writing an OS in Rust”, which is no longer updated. You can find the second edition <a href="{{ get_url(path = "./second-edition/_index.md") }}">here</a>.
+</div>
+
+<div id="bare-bones" class="post-category bare-bones">Bare Bones</div>
+<div class="posts bare-bones">
+    {{ macros::post_link(page=posts.0) }}
+    {{ macros::post_link(page=posts.1) }}
+    {{ macros::post_link(page=posts.2) }}
+    {{ macros::post_link(page=posts.3) }}
+</div>
+
+<div id="memory-management" class="post-category memory-management">Memory Management</div>
+<div class="posts memory-management">
+    {{ macros::post_link(page=posts.4) }}
+    {{ macros::post_link(page=posts.5) }}
+    {{ macros::post_link(page=posts.6) }}
+    {{ macros::post_link(page=posts.7) }}
+</div>
+
+<div id="interrupts" class="post-category exceptions">Exceptions</div>
+<div class="posts exceptions">
+    {{ macros::post_link(page=posts.8) }}
+    {{ macros::post_link(page=posts.9) }}
+</div>
+
+<hr>
+{% set extra = get_section(path = "first-edition/extra/_index.md") %}
+<h1>{{ extra.title }}</h1>
+<ul>
+    {% for subsection in extra.subsections|reverse %}
+        <li><a href="/{{ subsection.path | safe }}">{{ subsection.title }}</a></li>
+    {% endfor %}
+    {% for page in extra.pages|reverse %}
+        <li><a href="/{{ page.path | safe }}">{{ page.title }}</a></li>
+    {% endfor %}
+</ul>
+
+<aside id="recent-updates">
+    <h2>Recent Updates</h2>
+    {% include "recent-updates.html" %}
+</aside>
+
+{% endblock main %}

blog/templates/first-edition/page.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "first-edition/base.html" %}
 
 {% block title %}{{ page.title }} | {{ config.title }}{% endblock title %}
 
@@ -8,6 +8,11 @@
         {{ page.date | date(format="%b %d, %Y") }}
         {% if page.extra.updated %} (updated on {{ page.extra.updated | date(format="%b %d, %Y") }}) {% endif %}
     </time>
+
+    <div class="warning">
+        <b>No longer updated!</b> You are viewing the a post of the first edition of “Writing an OS in Rust”, which is no longer updated. You can find the second edition <a href="{{ get_url(path = "./second-edition/_index.md") }}">here</a>.
+    </div>
+
     <aside id="toc">
         <h2>Table of Contents</h2>
         <ol>

blog/templates/first-edition/section.html

@@ -0,0 +1,19 @@
+{% extends "first-edition/base.html" %}
+
+{% import "macros.html" as macros %}
+
+{% block title %}{{ section.title }} | {{ config.title }}{% endblock title %}
+
+{% block main %}
+
+<h1>{{ section.title }}</h1>
+
+{% block introduction %}{% endblock introduction %}
+
+<div class="posts neutral">
+    {% for page in section.pages|reverse %}
+        {{ macros::post_link(page=page) }}
+    {% endfor %}
+</div>
+
+{% endblock main %}

blog/templates/index.html

@@ -1,66 +1 @@
-{% extends "base.html" %}
+{% extends "second-edition/index.html" %}
-
-{% import "macros.html" as macros %}
-
-{% block title %}{{ config.title }}{% endblock title %}
-
-{% block main %}
-{% set posts_section = get_section(path = "posts/_index.md") %}
-{% set posts = posts_section.pages | reverse %}
-<div class="front-page-introduction">
-    <p>
-        This blog series creates a small operating system in the
-        <a href="https://www.rust-lang.org/">Rust programming language</a>. Each post is a small tutorial and includes all
-        needed code, so you can follow along if you like. The source code is also available in the corresponding
-        <a href="https://github.com/phil-opp/blog_os">Github repository</a>.
-    </p>
-    <p>Latest post:
-        {% set latest_post = posts|last %}
-        <strong><a href="/{{ latest_post.path | safe }}">{{ latest_post.title }}</a></strong>
-    </p>
-</div>
-
-<div class="note">
-    <b>Want to try something new?</b> We are working on a second edition of the blog, which <a href="{{ get_url(path = "./news/2018-03-09-pure-rust.md") }}">works without any non-Rust dependencies</a>. You can read the new posts <a href="{{ get_url(path = "./second-edition/_index.md") }}">here</a>.
-</div>
-
-<div id="bare-bones" class="post-category bare-bones">Bare Bones</div>
-<div class="posts bare-bones">
-    {{ macros::post_link(page=posts.0) }}
-    {{ macros::post_link(page=posts.1) }}
-    {{ macros::post_link(page=posts.2) }}
-    {{ macros::post_link(page=posts.3) }}
-</div>
-
-<div id="memory-management" class="post-category memory-management">Memory Management</div>
-<div class="posts memory-management">
-    {{ macros::post_link(page=posts.4) }}
-    {{ macros::post_link(page=posts.5) }}
-    {{ macros::post_link(page=posts.6) }}
-    {{ macros::post_link(page=posts.7) }}
-</div>
-
-<div id="interrupts" class="post-category exceptions">Exceptions</div>
-<div class="posts exceptions">
-    {{ macros::post_link(page=posts.8) }}
-    {{ macros::post_link(page=posts.9) }}
-</div>
-
-<hr>
-{% set extra = get_section(path = "extra/_index.md") %}
-<h1>{{ extra.title }}</h1>
-<ul>
-    {% for subsection in extra.subsections|reverse %}
-        <li><a href="/{{ subsection.path | safe }}">{{ subsection.title }}</a></li>
-    {% endfor %}
-    {% for page in extra.pages|reverse %}
-        <li><a href="/{{ page.path | safe }}">{{ page.title }}</a></li>
-    {% endfor %}
-</ul>
-
-<aside id="recent-updates">
-    <h2>Recent Updates</h2>
-    {% include "recent-updates.html" %}
-</aside>
-
-{% endblock main %}

blog/templates/news-page.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "second-edition/base.html" %}
 
 {% block title %}{{ page.title }} | {{ config.title }}{% endblock title %}
 

blog/templates/news-section.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "second-edition/base.html" %}
 
 {% import "macros.html" as macros %}
 

blog/templates/plain.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "second-edition/base.html" %}
 
 {% block title %}{{ page.title }} | {{ config.title }}{% endblock title %}
 

blog/templates/second-edition/extra.html

@@ -5,7 +5,7 @@
 {% block main %}
     <h1>{{ page.title }}</h1>
     <div class="warning">
-        <b>Note:</b> This post is part of the upcoming <a href="{{ get_url(path = "./second-edition/_index.md") }}">second edition</a> of “Writing an OS in Rust”, which is still under construction. To read the first edition, go <a href="{{ get_url(path = "/") }}">here</a>.
+        <b>Note:</b> You are viewing the in-progress second edition of “Writing an OS in Rust”. For more content, take a look at the <a href="{{ get_url(path = "/first-edition") }}">first edition</a>.
     </div>
     {{ page.content | safe }}
 {% endblock main %}

blog/templates/second-edition/index.html

@@ -7,9 +7,7 @@
 {% block main %}
 {% set posts_section = get_section(path = "second-edition/posts/_index.md") %}
 {% set posts = posts_section.pages | reverse %}
-<div class="warning">
+
-    <b>Note:</b> You are viewing the upcoming second edition of “Writing an OS in Rust”, which is still under construction. To read the first edition, go <a href="{{ get_url(path = "/") }}">here</a>.
-</div>
 <div class="front-page-introduction">
     <p>
         This blog series creates a small operating system in the
@@ -49,6 +47,11 @@
     </form>
 </div>
 
+<div class="posts first-edition">
+    <h2 class="post-title">First Edition</h2>
+    You are viewing the second edition of “Writing an OS in Rust”, which is still in progress. The <a href="{{ get_url(path = "/first-edition") }}">first edition</a> has more content, but is no longer updated. We try our best to incorporate the missing content soon.
+</div>
+
 <aside id="recent-updates">
     <h2>Recent Updates</h2>
     {% include "recent-updates.html" %}

blog/templates/second-edition/page.html

@@ -21,9 +21,6 @@
             </li>{% endfor %}
         </ol>
     </aside>
-    <div class="warning">
-        <b>Note:</b> This post is part of the upcoming <a href="{{ get_url(path = "./second-edition/_index.md") }}">second edition</a> of “Writing an OS in Rust”, which is still under construction. To read the first edition, go <a href="{{ get_url(path = "/") }}">here</a>.
-    </div>
     {{ page.content | safe }}
 {% endblock main %}
 

blog/templates/section.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "second-edition/base.html" %}
 
 {% import "macros.html" as macros %}
 

netlify.toml

@@ -13,6 +13,10 @@
     command = "python before_build.py && gutenberg build --base-url $DEPLOY_PRIME_URL"
 
 
+[[redirects]]
+from = "/second-edition/"
+to = "/"
+
 [[redirects]]
 from = "/2015/08/18/multiboot-kernel/"
 to = "/multiboot-kernel/"