diff --git a/book/src/SUMMARY.md b/book/src/SUMMARY.md
index 47d9dc5f4..7565559a7 100644
--- a/book/src/SUMMARY.md
+++ b/book/src/SUMMARY.md
@@ -4,7 +4,56 @@
 
 # User Guide
 
+## Multi-threading
+
+Riot-rs implements a scheduler based on fixed priorities and preemption.
+Within the same priority level, threads are scheduled cooperatively.
+
+Threading can be enabled with the `threading` feature.
+If the feature is enabled, at least one thread **must** be defined.  
+Threads should be implemented using the `riot_rs_macros::thread` proc macro, which takes care of calling the necessary initialization methods and linking the thread function element it into the binary.
+A `ThreadId` between 0 and `riot_rs_threads::THREADS_NUMOF` is assigned to each thread in the order in which the threads are declared (*TODO: is this a defined behavior? Would ease e.g. setting thread\_flags for other threads because the ids are known at compile time, but is it really always ensured?*).
+Optionally, the stacksize and a priority between 1 and `riot_rs_threads::SCHED_PRIO_LEVELS` can be configured. Per default, the stack size is 2048 bytes and priority is 1.
+
+The `riot_rs_threading` crate supports basic synchronization primitives:
+- a synchronous (blocking) channel for sending data between threads (the data must implement `Copy`)
+- a lock that can be used to implement mutually exclusive access to a resource
+- a thread-flags implementation that enables threads to wait for specific flags
+  (*TODO: should the thread\_flags even be mentioned here/ are they meant to be used by users?*)
+
+### Example
+
+```rs
+static CHANNEL: Channel<u8> = riot_rs::thread::channel::Channel::new();
+
+#[riot_rs::thread]
+fn thread0() {
+    println!("Hello from thread 0.");
+    CHANNEL.send(&42);
+}
+
+#[riot_rs::thread(stacksize = 4096, priority = 2)]
+fn thread1() {
+    println!("Hello from thread 1.");
+    let recv = CHANNEL.recv();
+    println!("The answer to the Ultimate Question of Life, the Universe, and Everything is {}.", recv);
+}
+```
+
+(*TODO*)
+
 # Developer Guide
 
+## riot-rs-threads
+
+The `riot-rs-threads` crate implements multi-threading and the scheduler.
+
+It makes heavy use of the `critical_section` crate to ensure that there are no conflicting accesses to the shared thread state.
+
+Threads are managed through the static `Threads` structure, that contains all thread data, runqueues and state information.
+The `EnsureOnce` wrapper around it uses a [`critical_section::Mutex`](https://docs.rs/critical-section/latest/critical_section/struct.Mutex.html) to ensures that each access is marked as a [`critical_section`](https://doc.rust-lang.org/std/cell/struct.RefCell.html), and that a reference is dropped directly after the access.
+
+(*TODO*)
+
 - [Appendices](./appendices.md)
   - [Coding Conventions](./coding-conventions.md)
diff --git a/src/riot-rs-rt/src/threading.rs b/src/riot-rs-rt/src/threading.rs
index 85f669aaa..1c6707791 100644
--- a/src/riot-rs-rt/src/threading.rs
+++ b/src/riot-rs-rt/src/threading.rs
@@ -3,6 +3,10 @@ use riot_rs_threads::{start_threading, THREAD_FNS};
 /// # Safety
 ///
 /// The caller must ensure that this function is only called once.
+///
+/// # Panics
+///
+/// Panics if no thread exists.
 pub unsafe fn start() -> ! {
     for thread_fn in THREAD_FNS {
         thread_fn();
diff --git a/src/riot-rs-threads/src/lib.rs b/src/riot-rs-threads/src/lib.rs
index bd725717a..0a43f00c5 100644
--- a/src/riot-rs-threads/src/lib.rs
+++ b/src/riot-rs-threads/src/lib.rs
@@ -166,7 +166,12 @@ impl Threads {
 /// Supposed to be started early on by OS startup code.
 ///
 /// # Safety
+///
 /// This may only be called once.
+///
+/// # Panics
+///
+/// Panics if no thread exists.
 pub unsafe fn start_threading() {
     // faking a critical section to get THREADS
     let cs = CriticalSection::new();
diff --git a/src/riot-rs-threads/src/lock.rs b/src/riot-rs-threads/src/lock.rs
index 2f6304624..f72231a98 100644
--- a/src/riot-rs-threads/src/lock.rs
+++ b/src/riot-rs-threads/src/lock.rs
@@ -4,7 +4,7 @@ use core::cell::UnsafeCell;
 use super::threadlist::ThreadList;
 use super::ThreadState;
 
-/// A basic locking object
+/// A basic locking object.
 ///
 /// A `Lock` behaves like a Mutex, but carries no data.
 /// This is supposed to be used to implement other locking primitives.