From f91f3518511f5a1e39abfd75ac11313bc3db0f6b Mon Sep 17 00:00:00 2001
From: Christoph Groth <christoph.groth@cea.fr>
Date: Tue, 3 Feb 2015 12:41:09 +0100
Subject: [PATCH] OSX -> OS X
---
content/install.txt | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/content/install.txt b/content/install.txt
index 2aa4a63..1f8d8b0 100644
--- a/content/install.txt
+++ b/content/install.txt
@@ -114,11 +114,11 @@ Arch Linux
To install, follow the `Arch User Repository installation instructions <https://wiki.archlinux.org/index.php/Arch_User_Repository#Installing_packages>`_.
-Mac OSX
-=======
+Mac OS X
+========
There is a number of different package managers for bringing software from the
-Unix/Linux world to Mac OSX. Since the community is quite split, we provide
+Unix/Linux world to Mac OS X. Since the community is quite split, we provide
Kwant and its dependencies both via the `homebrew <http://brew.sh>`_ and the
`MacPorts <http://www.macports.org>`_ systems.
@@ -126,7 +126,7 @@ Kwant and its dependencies both via the `homebrew <http://brew.sh>`_ and the
Mac OS X: homebrew
==================
-homebrew is a recent addition to the package managers on Mac OSX. It is
+homebrew is a recent addition to the package managers on Mac OS X. It is
lightweight, tries to be as minimalistic as possible and give the user
freedom than Macports. We recommend this option if you have no preferences.
@@ -141,7 +141,7 @@ freedom than Macports. We recommend this option if you have no preferences.
and follow its directions. It will ask for a few prerequisites to be
installed, in particular
- * the Xcode developer tools (compiler suite for Mac OSX) from
+ * the Xcode developer tools (compiler suite for Mac OS X) from
`<http://developer.apple.com/downloads>`_. You will need an Apple ID to
download. Note that if you have one already from using the App store on the
Mac/Ipad/Iphone/... you can use that one. Downloading the command line
@@ -152,7 +152,7 @@ freedom than Macports. We recommend this option if you have no preferences.
click on `Install`.
* although `brew doctor` might not complain about it right away, while we're
at it, you should also install the X11 server from the `XQuartz project
- <http://xquartz.macosforge.org>`_ if you have Mac OSX 10.8 or higher.
+ <http://xquartz.macosforge.org>`_ if you have Mac OS X 10.8 or higher.
3. Add permanently ``/usr/local/bin`` before ``/usr/bin/`` in the ``$PATH$``
environment variable of your shell, for example by adding ::
@@ -192,8 +192,8 @@ Notes:
though.
-Mac OSX: MacPorts
-=================
+Mac OS X: MacPorts
+==================
MacPorts is a full-fledged package manager that recreates a whole Linux-like
environment on your Mac.
@@ -206,7 +206,7 @@ In order to install Kwant using MacPorts, you have to
In particular, as explained there, you will have to install also a
few prerequisites, namely
- * the Xcode developer tools (compiler suite for Mac OSX) from
+ * the Xcode developer tools (compiler suite for Mac OS X) from
`<http://developer.apple.com/downloads>`_. You will need an Apple ID to
download. Note that if you have one already from using the App store
on the Mac/Ipad/Iphone/... you can use that one. You will also need the
@@ -215,7 +215,7 @@ In order to install Kwant using MacPorts, you have to
select `Command Line Tools` and click on `Install`. Alternatively, you can
also directly download the command line tools from the
Apple developer website.
- * if you have MacOSX 10.8 or higher, the X11 server from the
+ * if you have Mac OS X 10.8 or higher, the X11 server from the
`XQuartz project <http://xquartz.macosforge.org>`_.
2. After the installation, open a terminal and execute ::
--
GitLab