diff options
Diffstat (limited to 'nixos/doc')
| -rw-r--r-- | nixos/doc/manual/configuration/configuration.xml | 1 | ||||
| -rw-r--r-- | nixos/doc/manual/default.nix | 3 | ||||
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-1603.xml | 10 |
3 files changed, 8 insertions, 6 deletions
diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml index caba8fb1f4ad..fb3f1498a9b7 100644 --- a/nixos/doc/manual/configuration/configuration.xml +++ b/nixos/doc/manual/configuration/configuration.xml @@ -28,6 +28,7 @@ effect after you run <command>nixos-rebuild</command>.</para> <xi:include href="postgresql.xml" /> <xi:include href="gitlab.xml" /> <xi:include href="acme.xml" /> +<xi:include href="input-methods.xml" /> <!-- Apache; libvirtd virtualisation --> diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 746ddc071b6a..69da1f948829 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -44,7 +44,7 @@ let echo "for hints about the offending path)." exit 1 fi - ${libxslt}/bin/xsltproc \ + ${libxslt.bin}/bin/xsltproc \ --stringparam revision '${revision}' \ -o $out ${./options-to-docbook.xsl} $optionsXML ''; @@ -58,6 +58,7 @@ let cp ${../../modules/services/databases/postgresql.xml} configuration/postgresql.xml cp ${../../modules/services/misc/gitlab.xml} configuration/gitlab.xml cp ${../../modules/security/acme.xml} configuration/acme.xml + cp ${../../modules/i18n/input-method/default.xml} configuration/input-methods.xml ln -s ${optionsDocBook} options-db.xml echo "${version}" > version ''; diff --git a/nixos/doc/manual/release-notes/rl-1603.xml b/nixos/doc/manual/release-notes/rl-1603.xml index 1528c8a72463..620c3e362a65 100644 --- a/nixos/doc/manual/release-notes/rl-1603.xml +++ b/nixos/doc/manual/release-notes/rl-1603.xml @@ -63,11 +63,11 @@ has the following highlights:</para> <itemizedlist> <listitem><para><literal>services/monitoring/longview.nix</literal></para></listitem> <listitem><para><literal>hardware/video/webcam/facetimehd.nix</literal></para></listitem> - <listitem><para><literal>i18n/inputMethod/default.nix</literal></para></listitem> - <listitem><para><literal>i18n/inputMethod/fcitx.nix</literal></para></listitem> - <listitem><para><literal>i18n/inputMethod/ibus.nix</literal></para></listitem> - <listitem><para><literal>i18n/inputMethod/nabi.nix</literal></para></listitem> - <listitem><para><literal>i18n/inputMethod/uim.nix</literal></para></listitem> + <listitem><para><literal>i18n/input-method/default.nix</literal></para></listitem> + <listitem><para><literal>i18n/input-method/fcitx.nix</literal></para></listitem> + <listitem><para><literal>i18n/input-method/ibus.nix</literal></para></listitem> + <listitem><para><literal>i18n/input-method/nabi.nix</literal></para></listitem> + <listitem><para><literal>i18n/input-method/uim.nix</literal></para></listitem> <listitem><para><literal>programs/fish.nix</literal></para></listitem> <listitem><para><literal>security/acme.nix</literal></para></listitem> <listitem><para><literal>security/audit.nix</literal></para></listitem> |