summaryrefslogtreecommitdiff
path: root/docs/faq
diff options
context:
space:
mode:
authorMichiel Beijen <mb@x14.nl>2017-04-23 22:06:12 +0200
committerTim Graham <timograham@gmail.com>2017-04-24 20:51:55 -0400
commit7eecf496eecdf9ce1227e0ea517d32880e3300d9 (patch)
treef213d2fb894edb8c5eeb19ca960547eb84beae1a /docs/faq
parent6cbfaba1787b17752361ae4de1fff8d0acfe62f1 (diff)
[1.11.x] Renamed "Mac OS X" to "macOS" in docs.
Backport of 5e8625ba643db118a44cb32e9e48bf431ef4da53 from master
Diffstat (limited to 'docs/faq')
-rw-r--r--docs/faq/troubleshooting.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/faq/troubleshooting.txt b/docs/faq/troubleshooting.txt
index 4deaf0feb0..aa302b6f3b 100644
--- a/docs/faq/troubleshooting.txt
+++ b/docs/faq/troubleshooting.txt
@@ -24,12 +24,12 @@ If ``django-admin`` doesn't work but ``django-admin.py`` does, you're probably
using a version of Django that doesn't match the version of this documentation.
``django-admin`` is new in Django 1.7.
-Mac OS X permissions
---------------------
+macOS permissions
+-----------------
-If you're using Mac OS X, you may see the message "permission denied" when
+If you're using macOS, you may see the message "permission denied" when
you try to run ``django-admin``. This is because, on Unix-based systems like
-OS X, a file must be marked as "executable" before it can be run as a program.
+macOS, a file must be marked as "executable" before it can be run as a program.
To do this, open Terminal.app and navigate (using the ``cd`` command) to the
directory where :doc:`django-admin </ref/django-admin>` is installed, then
run the command ``sudo chmod +x django-admin``.