diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-03-08 09:57:58 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-03-08 09:58:19 +0100 |
commit | 09af15654f0c8091f1b9e0bbb2e523cdee194442 (patch) | |
tree | e648edef1ce4c64c533f2593aa22b8015cf0e506 /nixos/doc | |
parent | f306e67e15bdbe9a8358c9f81319fc4fcbadc2eb (diff) | |
parent | 0ee75214f336474e127c2e3546c0406a0c4d5fa7 (diff) |
Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
Diffstat (limited to 'nixos/doc')
-rw-r--r-- | nixos/doc/manual/configuration/configuration.xml | 2 | ||||
-rw-r--r-- | nixos/doc/manual/default.nix | 2 | ||||
-rw-r--r-- | nixos/doc/manual/installation/installing.xml | 5 | ||||
-rw-r--r-- | nixos/doc/manual/release-notes/release-notes.xml | 2 | ||||
-rw-r--r-- | nixos/doc/manual/release-notes/rl-1603.xml (renamed from nixos/doc/manual/release-notes/rl-unstable.xml) | 87 |
5 files changed, 79 insertions, 19 deletions
diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml index 1e488b59343e..caba8fb1f4ad 100644 --- a/nixos/doc/manual/configuration/configuration.xml +++ b/nixos/doc/manual/configuration/configuration.xml @@ -26,8 +26,8 @@ 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="nixos.xml" /> <!-- Apache; libvirtd virtualisation --> diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 0f0809478339..4c0e5518f1e4 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -56,8 +56,8 @@ 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/security/acme.xml} configuration/acme.xml - cp ${../../modules/misc/nixos.xml} configuration/nixos.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 9aec57fb6d5a..7e71df28cdb3 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -22,7 +22,10 @@ (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> + run <command>start display-manager</command> to start KDE. If you + want to continue on the terminal, you can use + <command>loadkeys</command> to switch to your preferred keyboard layout. + (We even provide neo2 via <command>loadkeys de neo</command>!)</para></listitem> <listitem><para>The boot process should have brought up networking (check <command>ip a</command>). Networking is necessary for the diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml index 6ed99315a7af..2beaab00800d 100644 --- a/nixos/doc/manual/release-notes/release-notes.xml +++ b/nixos/doc/manual/release-notes/release-notes.xml @@ -9,7 +9,7 @@ <para>This section lists the release notes for each stable version of NixOS and current unstable revision.</para> -<xi:include href="rl-unstable.xml" /> +<xi:include href="rl-1603.xml" /> <xi:include href="rl-1509.xml" /> <xi:include href="rl-1412.xml" /> <xi:include href="rl-1404.xml" /> diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-1603.xml index 768b51d84a46..0ede1a9ce8ed 100644 --- a/nixos/doc/manual/release-notes/rl-unstable.xml +++ b/nixos/doc/manual/release-notes/rl-1603.xml @@ -2,9 +2,9 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" - xml:id="sec-release-unstable"> + xml:id="sec-release-16.03"> -<title>Unstable</title> +<title>Release 16.03 (“Emu”, 2016/03/??)</title> <para>In addition to numerous new and upgraded packages, this release has the following highlights:</para> @@ -12,19 +12,6 @@ has the following highlights:</para> <itemizedlist> <listitem> - <para>You can now pin a specific version of NixOS in your <filename>configuration.nix</filename> - by setting: - -<programlisting> -nixos.path = ./nixpkgs-unstable-2015-12-06/nixos; -</programlisting> - - This will make NixOS re-evaluate your configuration with the modules of - the specified NixOS version at the given path. For more details, see - <xref linkend="module-misc-nixos" /></para> - </listitem> - - <listitem> <para>Firefox and similar browsers are now <emphasis>wrapped by default</emphasis>. The package and attribute names are plain <literal>firefox</literal> or <literal>midori</literal>, etc. Backward-compatibility attributes were set up, @@ -41,8 +28,10 @@ nixos.path = ./nixpkgs-unstable-2015-12-06/nixos; <itemizedlist> <listitem><para><literal>services/monitoring/longview.nix</literal></para></listitem> + <listitem><para><literal>services/networking/pdnsd.nix</literal></para></listitem> <listitem><para><literal>services/web-apps/pump.io.nix</literal></para></listitem> <listitem><para><literal>services/security/haka.nix</literal></para></listitem> + <listitem><para><literal>i18n/inputMethod/default.nix</literal></para></listitem> </itemizedlist> </para> @@ -196,6 +185,68 @@ fileSystems."/example" = { <literal>services.hardware.opengl.extraPackages{,32}</literal> instead. You can also specify VDPAU drivers there.</para> </listitem> + + <listitem> + <para> + <literal>programs.ibus</literal> moved to <literal>i18n.inputMethod.ibus</literal>. + The option <literal>programs.ibus.plugins</literal> changed to <literal>i18n.inputMethod.ibus.engines</literal> + and the option to enable ibus changed from <literal>programs.ibus.enable</literal> to + <literal>i18n.inputMethod.enabled</literal>. + <literal>i18n.inputMethod.enabled</literal> should be set to the used input method name, + <literal>"ibus"</literal> for ibus. + An example of the new style: + +<programlisting> +i18n.inputMethod.enabled = "ibus"; +i18n.inputMethod.ibus.engines = with pkgs.ibus-engines; [ anthy mozc ]; +</programlisting> + +That is equivalent to the old version: + +<programlisting> +programs.ibus.enable = true; +programs.ibus.plugins = with pkgs; [ ibus-anthy mozc ]; +</programlisting> + + </para> + </listitem> + + <listitem> + <para><literal>services.udev.extraRules</literal> option now writes rules + to <filename>99-local.rules</filename> instead of <filename>10-local.rules</filename>. + This makes all the user rules apply after others, so their results wouldn't be + overriden by anything else.</para> + </listitem> + + <listitem> + <para>Large parts of the <literal>services.gitlab</literal> module has been + been rewritten. There are new configuration options available. The + <literal>stateDir</literal> option was renamned to + <literal>statePath</literal> and the <literal>satellitesDir</literal> option + was removed. Please review the currently available options.</para> + </listitem> + + <listitem> + <para> + The option <option>services.nsd.zones.<name>.data</option> no + longer interpret the dollar sign ($) as a shell variable, as such it + should not be escaped anymore. Thus the following zone data: + </para> + <programlisting> +\$ORIGIN example.com. +\$TTL 1800 +@ IN SOA ns1.vpn.nbp.name. admin.example.com. ( + </programlisting> + <para> + Should modified to look like the actual file expected by nsd: + </para> + <programlisting> +$ORIGIN example.com. +$TTL 1800 +@ IN SOA ns1.vpn.nbp.name. admin.example.com. ( + </programlisting> + </listitem> + </itemizedlist> @@ -214,6 +265,12 @@ fileSystems."/example" = { NixOS.</para> </listitem> + <listitem> + <para>Input method support was improved. New NixOS modules (fcitx, nabi and uim), + fcitx engines (chewing, hangul, m17n, mozc and table-other) and ibus engines (hangul and m17n) + have been added.</para> + </listitem> + </itemizedlist></para> </section> |