diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-08-30 10:35:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-30 10:35:18 +0200 |
| commit | 83103dc2679d966838d8e52765b9a18c4304fd11 (patch) | |
| tree | 7373106364ddf75764c09a46e6958f81b1c9ec85 | |
| parent | f19c961b4e461da045f2e72e73701059e5117be0 (diff) | |
| parent | b50e627ef6016d852f472808a3012233f347c4d9 (diff) | |
| download | nixpkgs-83103dc2679d966838d8e52765b9a18c4304fd11.tar nixpkgs-83103dc2679d966838d8e52765b9a18c4304fd11.tar.gz nixpkgs-83103dc2679d966838d8e52765b9a18c4304fd11.tar.bz2 nixpkgs-83103dc2679d966838d8e52765b9a18c4304fd11.tar.lz nixpkgs-83103dc2679d966838d8e52765b9a18c4304fd11.tar.xz nixpkgs-83103dc2679d966838d8e52765b9a18c4304fd11.tar.zst nixpkgs-83103dc2679d966838d8e52765b9a18c4304fd11.zip | |
Merge pull request #18104 from ericsagnes/feat/nixos-manual-gen-cleanup
nixos manual: cleanup generation
| -rw-r--r-- | nixos/doc/manual/configuration/configuration.xml | 1 | ||||
| -rw-r--r-- | nixos/doc/manual/default.nix | 6 | ||||
| -rw-r--r-- | nixos/modules/services/editors/emacs.nix | 2 |
3 files changed, 2 insertions, 7 deletions
diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml index 9589f3c6276..448e2a932e9 100644 --- a/nixos/doc/manual/configuration/configuration.xml +++ b/nixos/doc/manual/configuration/configuration.xml @@ -24,7 +24,6 @@ effect after you run <command>nixos-rebuild</command>.</para> <xi:include href="networking.xml" /> <xi:include href="linux-kernel.xml" /> -<xi:include href="emacs.xml" /> <xi:include href="modules.xml" xpointer="xpointer(//section[@id='modules']/*)" /> <!-- Apache; libvirtd virtualisation --> diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 0f0c6e66e4c..13668dfd8eb 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -63,12 +63,6 @@ let '' cp -prd $sources/* . # */ chmod -R u+w . - cp ${../../modules/services/databases/postgresql.xml} configuration/postgresql.xml - cp ${../../modules/services/misc/gitlab.xml} configuration/gitlab.xml - 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 ${modulesDoc} configuration/modules.xml ln -s ${optionsDocBook} options-db.xml echo "${version}" > version diff --git a/nixos/modules/services/editors/emacs.nix b/nixos/modules/services/editors/emacs.nix index 43b4219c51d..6795ec52fe4 100644 --- a/nixos/modules/services/editors/emacs.nix +++ b/nixos/modules/services/editors/emacs.nix @@ -83,4 +83,6 @@ in { EDITOR = mkOverride 900 "${editorScript}/bin/emacseditor"; } else {}; }; + + meta.doc = ./emacs.xml; } |