summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorDomen Kožar <domen@enlambda.com>2017-08-11 13:01:36 +0200
committerGitHub <noreply@github.com>2017-08-11 13:01:36 +0200
commit486e1c3c16b922818c182de37c9f21a6c2d5309a (patch)
tree80088faa87f6d57fdbe12219ebea16f95deafea3 /nixos/modules
parent3be89a675814c3c2dd21fc3102c71960e896b97c (diff)
parent3270aa896bc78ee261c34137035d2705aba78440 (diff)
downloadnixlib-486e1c3c16b922818c182de37c9f21a6c2d5309a.tar
nixlib-486e1c3c16b922818c182de37c9f21a6c2d5309a.tar.gz
nixlib-486e1c3c16b922818c182de37c9f21a6c2d5309a.tar.bz2
nixlib-486e1c3c16b922818c182de37c9f21a6c2d5309a.tar.lz
nixlib-486e1c3c16b922818c182de37c9f21a6c2d5309a.tar.xz
nixlib-486e1c3c16b922818c182de37c9f21a6c2d5309a.tar.zst
nixlib-486e1c3c16b922818c182de37c9f21a6c2d5309a.zip
Merge pull request #27998 from davidak/macOS
replace "Mac OS X" and "OS X" with "macOS"
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/services/editors/emacs.xml4
1 files changed, 2 insertions, 2 deletions
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>