diff --git a/docs/man-configuration.xml b/docs/man-configuration.xml
index 72b61447..c39a7293 100644
--- a/docs/man-configuration.xml
+++ b/docs/man-configuration.xml
@@ -2,19 +2,41 @@
           xmlns:xlink="http://www.w3.org/1999/xlink"
           xmlns:xi="http://www.w3.org/2001/XInclude">
  <refmeta>
-  <refentrytitle><filename>neovim-flake</filename></refentrytitle>
+  <refentrytitle>neovim-flake configuration</refentrytitle>
   <manvolnum>5</manvolnum>
-  <refmiscinfo class="source">Neovim Flake</refmiscinfo>
+  <refmiscinfo class="source">neovim-flake</refmiscinfo>
+<!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
  </refmeta>
  <refnamediv>
-  <refname><filename>neovim-flake</filename></refname>
-  <refpurpose>Neovim Flake f - Configuration specification</refpurpose>
+  <refname>neovim configuration</refname>
+  <refpurpose>neovim-flake configuration specification</refpurpose>
  </refnamediv>
+ <refsection>
+  <title>Description</title>
+  <para>
+    Custom configuration is done with the neovim-flake.lib.neovimConfiguration function. It takes in the configuration as a module.
+    <programlisting>
+      neovim-flake.lib.neovimConfiguration {
+        inherit pkgs;
+        modules = [{config = xxx;}];
+      };
+    </programlisting>
+    The output of the configuration function is an attrset.
+  </para>
+  <programlisting>
+    {
+      options = "The options that were available to configure";
+      config = "The outputted configuration";
+      pkgs = "The package set used to evaluate the module";
+      neovim = "The built neovim package";
+    }
+  </programlisting>
+ </refsection>
  <refsection>
   <title>Options</title>
   <para>
-   You can use the following options in the `programs.neovim-flake` module:
+   You can use the following options in your neovim configuration.
   </para>
-  <xi:include href="./nmd-result/neovim-flake-options.xml" />
+  <xi:include href="./nmd-result/neovim-flake-options.xml"/>
  </refsection>
-</refentry>
+</refentry>
\ No newline at end of file
diff --git a/docs/man-pages.xml b/docs/man-pages.xml
index 001d5175..a89a8e8b 100644
--- a/docs/man-pages.xml
+++ b/docs/man-pages.xml
@@ -1,15 +1,13 @@
 <reference xmlns="http://docbook.org/ns/docbook"
            xmlns:xlink="http://www.w3.org/1999/xlink"
            xmlns:xi="http://www.w3.org/2001/XInclude">
-  <title>Neovim Flake - Reference Pages</title>
-  <info>
-    <author>
-      <personname>Gabriel Volpe</personname>
-    </author>
-    <copyright>
-      <year>2023</year>
-      <holder>NotAShelf</holder>
-    </copyright>
-   </info>
-   <xi:include href="man-configuration.xml" />
-</reference>
+ <title>neovim-flake Reference Pages</title>
+ <info>
+  <author><personname>neovim-flake contributors</personname></author>
+  <copyright>
+      <year>2021–2023</year>
+      <holder>neovim-flake contributors</holder>
+  </copyright>
+ </info>
+ <xi:include href="man-configuration.xml" />
+</reference>
\ No newline at end of file
diff --git a/docs/manual.xml b/docs/manual.xml
index 235c953f..57ec8ac6 100644
--- a/docs/manual.xml
+++ b/docs/manual.xml
@@ -3,13 +3,23 @@
       xmlns:xi="http://www.w3.org/2001/XInclude"
       version="5.0"
       xml:id="book-neovim-flake-manual">
-  <info>
-    <title>Neovim Flake by Gabriel Volpe</title>
-  </info>
-  <xi:include href="try-it-out.xml" />
-  <xi:include href="hm-module.xml" />
-  <appendix xml:id="ch-options">
-    <title>Configuration options</title>
-    <xi:include href="./nmd-result/neovim-flake-options.xml" />
-  </appendix>
-</book>
+ <info>
+  <title>neovim-flake Manual</title>
+ </info>
+ <preface>
+  <title>Preface</title>
+  <para>
+   If your problem is caused by a bug in neovim-flake then it should be reported on the
+   <link xlink:href="https://github.com/notashelf/neovim-flake/issues">neovim-flake issue tracker</link>.
+  </para>
+ </preface>
+ <xi:include href="default-configs.xml"/>
+ <xi:include href="custom-configs.xml"/>
+ <xi:include href="languages.xml"/>
+ <xi:include href="plugins.xml"/>
+ <appendix xml:id="ch-options">
+  <title>Configuration Options</title>
+  <xi:include href="./nmd-result/neovim-flake-options.xml" />
+ </appendix>
+ <xi:include href="./release-notes/release-notes.xml" />
+</book>
\ No newline at end of file