diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2017-08-13 18:34:59 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-08-13 18:34:59 +0200 |
| commit | 7ebcd39a0f147ffa544818c9fd5954bc9dcae2d8 (patch) | |
| tree | e2ad4a017b7946b4bf72a3ae863960a4b5ffa55c /nixos | |
| parent | 206faacbcb8c9a4655c6c8cf2cf5eec688d59719 (diff) | |
| parent | 4c4920567605bd24226522fbd4c2a24d8cef86b6 (diff) | |
| download | nixlib-7ebcd39a0f147ffa544818c9fd5954bc9dcae2d8.tar nixlib-7ebcd39a0f147ffa544818c9fd5954bc9dcae2d8.tar.gz nixlib-7ebcd39a0f147ffa544818c9fd5954bc9dcae2d8.tar.bz2 nixlib-7ebcd39a0f147ffa544818c9fd5954bc9dcae2d8.tar.lz nixlib-7ebcd39a0f147ffa544818c9fd5954bc9dcae2d8.tar.xz nixlib-7ebcd39a0f147ffa544818c9fd5954bc9dcae2d8.tar.zst nixlib-7ebcd39a0f147ffa544818c9fd5954bc9dcae2d8.zip | |
Merge commit '4c49205' into HEAD
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/doc/manual/installation/installing-usb.xml | 2 | ||||
| -rw-r--r-- | nixos/modules/services/editors/emacs.xml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nixos/doc/manual/installation/installing-usb.xml b/nixos/doc/manual/installation/installing-usb.xml index 4a74e406b14c..b97f989d902c 100644 --- a/nixos/doc/manual/installation/installing-usb.xml +++ b/nixos/doc/manual/installation/installing-usb.xml @@ -11,7 +11,7 @@ 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. If you're on OS X you can run <command>diskutil list</command> +block devices. If you're on macOS 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> diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml index 9d6395ebd74c..dd66bac442c6 100644 --- a/nixos/modules/services/editors/emacs.xml +++ b/nixos/modules/services/editors/emacs.xml @@ -24,7 +24,7 @@ <para> Emacs runs within a graphical desktop environment using the X Window System, but works equally well on a text terminal. Under - <productname>OS X</productname>, a "Mac port" edition is + <productname>macOS</productname>, a "Mac port" edition is available, which uses Apple's native GUI frameworks. </para> @@ -84,7 +84,7 @@ <listitem> <para> Emacs 25 with the "Mac port" patches, providing a more - native look and feel under OS X. + native look and feel under macOS. </para> </listitem> </varlistentry> |