4 files changed, 10 insertions, 12 deletions
diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml
index 501ad10788c5..cfa5619938bb 100644
--- a/nixos/doc/manual/configuration/configuration.xml
+++ b/nixos/doc/manual/configuration/configuration.xml
@@ -27,8 +27,9 @@ effect after you run <command>nixos-rebuild</command>.</para>
 <!-- FIXME: auto-include NixOS module docs -->
 <xi:include href="postgresql.xml" />
 <xi:include href="gitlab.xml" />
-<xi:include href="acme.xml" />
 <xi:include href="taskserver.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 130b016aa266..86a39322ba51 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
   '';
@@ -57,8 +57,9 @@ let
       chmod -R u+w .
       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/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
       ln -s ${optionsDocBook} options-db.xml
       echo "${version}" > version
     '';
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index 7e71df28cdb3..4a0b3fee7c18 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -157,10 +157,6 @@ $ nano /mnt/etc/nixos/configuration.nix
     <command>nixos-generate-config</command> will figure out the
     required modules.</para></note>
 
-    <para>Examples of real-world NixOS configuration files can be
-    found at <link
-    xlink:href="https://nixos.org/repos/nix/configurations/trunk/"/>.</para>
-
   </listitem>
 
   <listitem><para>Do the installation:
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>