From dab32a1fa66237acc4ece2d3d4e01e84f4d490dc Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 29 Aug 2016 18:10:38 +0200
Subject: [PATCH] nixos manual: move chapter on grsecurity to auto-generated
 module docs

---
 nixos/doc/manual/configuration/configuration.xml             | 1 -
 nixos/modules/security/grsecurity.nix                        | 5 +++++
 .../manual/configuration => modules/security}/grsecurity.xml | 0
 3 files changed, 5 insertions(+), 1 deletion(-)
 rename nixos/{doc/manual/configuration => modules/security}/grsecurity.xml (100%)

diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml
index 2d5281829ed5..9589f3c6276f 100644
--- a/nixos/doc/manual/configuration/configuration.xml
+++ b/nixos/doc/manual/configuration/configuration.xml
@@ -23,7 +23,6 @@ effect after you run <command>nixos-rebuild</command>.</para>
 <xi:include href="x-windows.xml" />
 <xi:include href="networking.xml" />
 <xi:include href="linux-kernel.xml" />
-<xi:include href="grsecurity.xml" />
 
 <xi:include href="emacs.xml" />
 <xi:include href="modules.xml" xpointer="xpointer(//section[@id='modules']/*)" />
diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix
index c6332ca9f9f6..ea1064c2d425 100644
--- a/nixos/modules/security/grsecurity.nix
+++ b/nixos/modules/security/grsecurity.nix
@@ -20,6 +20,11 @@ let
 in
 
 {
+  meta = {
+    maintainers = with maintainers; [ joachifm ];
+    doc = ./grsecurity.xml;
+  };
+
   options.security.grsecurity = {
 
     enable = mkEnableOption "grsecurity/PaX";
diff --git a/nixos/doc/manual/configuration/grsecurity.xml b/nixos/modules/security/grsecurity.xml
similarity index 100%
rename from nixos/doc/manual/configuration/grsecurity.xml
rename to nixos/modules/security/grsecurity.xml