diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-19 10:53:44 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-19 10:53:44 +0100 |
| commit | f6b39f852e0a9eb35a7434f02e5579c15519c41c (patch) | |
| tree | 8af93c37d0e1ec97607e92ba1926ce24ed744040 /nixos/doc | |
| parent | ed9fb90b2855fe09772958494a611248cc23a89c (diff) | |
| parent | 41d921292e922a6cd1aba64259341c244d4c2cc7 (diff) | |
| download | nixlib-f6b39f852e0a9eb35a7434f02e5579c15519c41c.tar nixlib-f6b39f852e0a9eb35a7434f02e5579c15519c41c.tar.gz nixlib-f6b39f852e0a9eb35a7434f02e5579c15519c41c.tar.bz2 nixlib-f6b39f852e0a9eb35a7434f02e5579c15519c41c.tar.lz nixlib-f6b39f852e0a9eb35a7434f02e5579c15519c41c.tar.xz nixlib-f6b39f852e0a9eb35a7434f02e5579c15519c41c.tar.zst nixlib-f6b39f852e0a9eb35a7434f02e5579c15519c41c.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos/doc')
| -rw-r--r-- | nixos/doc/manual/development/running-nixos-tests-interactively.xml | 2 | ||||
| -rw-r--r-- | nixos/doc/manual/development/running-nixos-tests.xml | 2 | ||||
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2003.xml | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/nixos/doc/manual/development/running-nixos-tests-interactively.xml b/nixos/doc/manual/development/running-nixos-tests-interactively.xml index ea3ba0e4bf78..31216874c706 100644 --- a/nixos/doc/manual/development/running-nixos-tests-interactively.xml +++ b/nixos/doc/manual/development/running-nixos-tests-interactively.xml @@ -2,7 +2,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" - xml:id="sec-running-nixos-tests"> + xml:id="sec-running-nixos-tests-interactively"> <title>Running Tests interactively</title> <para> diff --git a/nixos/doc/manual/development/running-nixos-tests.xml b/nixos/doc/manual/development/running-nixos-tests.xml index 13ae1ed93699..e9257c907daf 100644 --- a/nixos/doc/manual/development/running-nixos-tests.xml +++ b/nixos/doc/manual/development/running-nixos-tests.xml @@ -2,7 +2,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" - xml:id="sec-running-nixos-tests-interactively"> + xml:id="sec-running-nixos-tests"> <title>Running Tests</title> <para> diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index 5cdc535f333c..7b9cfbd4df6a 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -149,6 +149,12 @@ SDDM, GDM, or using the startx module which uses Xinitrc. </para> </listitem> + <listitem> + <para> + The BEAM package set has been deleted. You will only find there the different interpreters. + You should now use the different build tools coming with the languages with sandbox mode disabled. + </para> + </listitem> </itemizedlist> </section> |