diff options
| author | davidak <git@davidak.de> | 2017-08-07 00:05:18 +0200 |
|---|---|---|
| committer | davidak <git@davidak.de> | 2017-08-07 21:41:30 +0200 |
| commit | 3270aa896bc78ee261c34137035d2705aba78440 (patch) | |
| tree | 01c1f1bca1cd4bd6aedaca8114d6e980612beb53 /nixos | |
| parent | ff9479cd543545899cfd6cc20bb446e5a6bf4603 (diff) | |
| download | nixpkgs-3270aa896bc78ee261c34137035d2705aba78440.tar nixpkgs-3270aa896bc78ee261c34137035d2705aba78440.tar.gz nixpkgs-3270aa896bc78ee261c34137035d2705aba78440.tar.bz2 nixpkgs-3270aa896bc78ee261c34137035d2705aba78440.tar.lz nixpkgs-3270aa896bc78ee261c34137035d2705aba78440.tar.xz nixpkgs-3270aa896bc78ee261c34137035d2705aba78440.tar.zst nixpkgs-3270aa896bc78ee261c34137035d2705aba78440.zip | |
replace "Mac OS X" and "OS X" with "macOS"
as it is the official name since 2016 https://en.wikipedia.org/wiki/Macintosh_operating_systems#Desktop exception are parts refering to older versions of macOS like "GUI support for Mac OS X 10.6 - 10.12. Note that Emacs 23 and later [...]"
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 4a74e406b14..b97f989d902 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 9d6395ebd74..dd66bac442c 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> |