diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-03-23 13:31:28 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-03-23 13:31:28 +0100 |
| commit | c1a9dc3d3753ee02eff4ffdcf6a0238554afd243 (patch) | |
| tree | 0a53ef8069562523a831ff0d835bfd4d68a66314 /nixos/doc/manual | |
| parent | f0875982d17a7478d3ea0051e6a0be1bc98ff364 (diff) | |
| parent | 632e81083caf8821c1c37e8476dac94910237d69 (diff) | |
| download | nixlib-c1a9dc3d3753ee02eff4ffdcf6a0238554afd243.tar nixlib-c1a9dc3d3753ee02eff4ffdcf6a0238554afd243.tar.gz nixlib-c1a9dc3d3753ee02eff4ffdcf6a0238554afd243.tar.bz2 nixlib-c1a9dc3d3753ee02eff4ffdcf6a0238554afd243.tar.lz nixlib-c1a9dc3d3753ee02eff4ffdcf6a0238554afd243.tar.xz nixlib-c1a9dc3d3753ee02eff4ffdcf6a0238554afd243.tar.zst nixlib-c1a9dc3d3753ee02eff4ffdcf6a0238554afd243.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'nixos/doc/manual')
| -rw-r--r-- | nixos/doc/manual/installation/installing-usb.xml | 4 | ||||
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-1703.xml | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/nixos/doc/manual/installation/installing-usb.xml b/nixos/doc/manual/installation/installing-usb.xml index a4b5dafbed16..dae733060569 100644 --- a/nixos/doc/manual/installation/installing-usb.xml +++ b/nixos/doc/manual/installation/installing-usb.xml @@ -11,7 +11,9 @@ a USB stick. You can use the <command>dd</command> utility to write the image: <command>dd if=<replaceable>path-to-image</replaceable> of=<replaceable>/dev/sdb</replaceable></command>. Be careful about specifying the correct drive; you can use the <command>lsblk</command> command to get a list of -block devices.</para> +block devices. If you're on OS X you can run <command>diskutil list</command> +to see the list of devices; the device you'll use for the USB must be ejected +before writing the image.</para> <para>The <command>dd</command> utility will write the image verbatim to the drive, making it the recommended option for both UEFI and non-UEFI installations. For diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml index 49ae296c40c8..cae46258b808 100644 --- a/nixos/doc/manual/release-notes/rl-1703.xml +++ b/nixos/doc/manual/release-notes/rl-1703.xml @@ -97,15 +97,6 @@ following incompatible changes:</para> <listitem> <para> - The Yama LSM is now enabled by default in the kernel, - which prevents ptracing non-child processes. - This means you will not be able to attach gdb to an existing process, - but will need to start that process from gdb (so it is a child). - </para> - </listitem> - - <listitem> - <para> The <literal>stripHash</literal> bash function in <literal>stdenv</literal> changed according to its documentation; it now outputs the stripped name to <literal>stdout</literal> instead of putting it in the variable @@ -249,6 +240,13 @@ following incompatible changes:</para> </para> </listitem> + <listitem> + <para> + The <literal>fetch*</literal> functions no longer support md5, + please use sha256 instead. + </para> + </listitem> + </itemizedlist> |