summary refs log tree commit diff
path: root/nixos/modules/services
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2017-08-13 18:34:59 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2017-08-13 18:34:59 +0200
commit7ebcd39a0f147ffa544818c9fd5954bc9dcae2d8 (patch)
treee2ad4a017b7946b4bf72a3ae863960a4b5ffa55c /nixos/modules/services
parent206faacbcb8c9a4655c6c8cf2cf5eec688d59719 (diff)
parent4c4920567605bd24226522fbd4c2a24d8cef86b6 (diff)
downloadnixlib-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/modules/services')
-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>