diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-12-03 16:52:44 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-03 16:52:44 +0100 |
| commit | 77b605546c37ab09b519aac52deed42fb2909bf1 (patch) | |
| tree | 1a8bcedd6b7f7d2cba1a27eadea98d3ce446e7ef /nixos/doc | |
| parent | daa676f1d1e946346ab9e414fe507c87298f5d44 (diff) | |
| parent | 30fae2883e655c170e76d0827bcd9f396e9658af (diff) | |
| download | nixpkgs-77b605546c37ab09b519aac52deed42fb2909bf1.tar nixpkgs-77b605546c37ab09b519aac52deed42fb2909bf1.tar.gz nixpkgs-77b605546c37ab09b519aac52deed42fb2909bf1.tar.bz2 nixpkgs-77b605546c37ab09b519aac52deed42fb2909bf1.tar.lz nixpkgs-77b605546c37ab09b519aac52deed42fb2909bf1.tar.xz nixpkgs-77b605546c37ab09b519aac52deed42fb2909bf1.tar.zst nixpkgs-77b605546c37ab09b519aac52deed42fb2909bf1.zip | |
Merge branch 'staging-next' into staging
Diffstat (limited to 'nixos/doc')
| -rw-r--r-- | nixos/doc/manual/installation/installing.xml | 5 | ||||
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2003.xml | 21 |
2 files changed, 25 insertions, 1 deletions
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index 7991c43e01f..5655295871e 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -380,7 +380,10 @@ </para> <para> If you need to configure networking for your machine the configuration - options are described in <xref linkend="sec-networking"/>. + options are described in <xref linkend="sec-networking"/>. In particular, + while wifi is supported on the installation image, it is not enabled by + default in the configuration generated by + <command>nixos-generate-config</command>. </para> <para> Another critical option is <option>fileSystems</option>, specifying the diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index c5b8b1254f7..45071449f9d 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -207,6 +207,21 @@ upstream issue</link> for more information. </para> </listitem> + <listitem> + <para> + The packages <literal>openobex</literal> and <literal>obexftp</literal> + are no loger installed when enabling bluetooth via + <option>hardware.bluetooth.enable</option>. + </para> + </listitem> + <listitem> + <para> + The <literal>dump1090</literal> derivation has been changed to use FlightAware's dump1090 + as its upstream. However, this version does not have an internal webserver anymore. The + assets in the <literal>share/dump1090</literal> directory of the derivation can be used + in conjunction with an external webserver to replace this functionality. + </para> + </listitem> </itemizedlist> </section> @@ -229,6 +244,12 @@ release announcement</link> for more information. </para> </listitem> + <listitem> + <para> + <literal>PRETTY_NAME</literal> in <literal>/etc/os-release</literal> + now uses the short rather than full version string. + </para> + </listitem> </itemizedlist> </section> </section> |