diff options
Diffstat (limited to 'nixos/doc')
| -rw-r--r-- | nixos/doc/manual/installation/installing.xml | 4 | ||||
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-unstable.xml | 14 |
2 files changed, 16 insertions, 2 deletions
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index e40c15e8316d..6d734cd8caca 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -18,8 +18,8 @@ <listitem><para>The NixOS manual is available on virtual console 8 (press Alt+F8 to access).</para></listitem> - <listitem><para>Login as <literal>root</literal> and the empty - password.</para></listitem> + <listitem><para>You get logged in as <literal>root</literal> + (with empty password).</para></listitem> <listitem><para>If you downloaded the graphical ISO image, you can run <command>start display-manager</command> to start KDE.</para></listitem> diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml index 2745fb2cbe42..573b99d4902f 100644 --- a/nixos/doc/manual/release-notes/rl-unstable.xml +++ b/nixos/doc/manual/release-notes/rl-unstable.xml @@ -40,6 +40,20 @@ following incompatible changes:</para> will include the Gitit service configuration options.</para> </listitem> + <listitem> + <para><command>nginx</command> does not accept flags for enabling and + disabling modules anymore. Instead it accepts <literal>modules</literal> + argument, which is a list of modules to be built in. All modules now + reside in <literal>nginxModules</literal> set. Example configuration: + +<programlisting><![CDATA[ +nginx.override { + modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ]; +} +]]></programlisting> + </para> + </listitem> + </itemizedlist> </section> |