From 6711e62d51a014d24eb1ec6313e1facf94bb8498 Mon Sep 17 00:00:00 2001
From: Rodney Lorrimar <dev@rodney.id.au>
Date: Sat, 25 Jun 2016 23:19:27 +0100
Subject: nixos manual: add Emacs section (fixes #13217)

In light of Emacs packaging improvements such as those mentioned
in #11503, and with the addition of a systemd service (#15807
and #16356), and considering that the wiki page is completely
out of date (#13217), it seems that some documentation is in order.
---
 nixos/doc/manual/configuration/configuration.xml | 1 +
 nixos/doc/manual/default.nix                     | 1 +
 2 files changed, 2 insertions(+)

(limited to 'nixos/doc')

diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml
index 48810cc6ac6b..26f8ebad7344 100644
--- a/nixos/doc/manual/configuration/configuration.xml
+++ b/nixos/doc/manual/configuration/configuration.xml
@@ -31,6 +31,7 @@ effect after you run <command>nixos-rebuild</command>.</para>
 <xi:include href="taskserver.xml" />
 <xi:include href="acme.xml" />
 <xi:include href="input-methods.xml" />
+<xi:include href="emacs.xml" />
 
 <!-- Apache; libvirtd virtualisation -->
 
diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index 1bec0d925222..2592766ee496 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -60,6 +60,7 @@ let
       cp ${../../modules/services/misc/taskserver/doc.xml} configuration/taskserver.xml
       cp ${../../modules/security/acme.xml} configuration/acme.xml
       cp ${../../modules/i18n/input-method/default.xml} configuration/input-methods.xml
+      cp ${../../modules/services/editors/emacs.xml} configuration/emacs.xml
       ln -s ${optionsDocBook} options-db.xml
       echo "${version}" > version
     '';
-- 
cgit 1.4.1