Skip to content

Style it "Xcode", not "XCode" #949

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 17, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docs/scenarios/gui.rst
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ such as: Mouse, Dual Mouse, TUIO, WiiMote, WM_TOUCH, HIDtouch, Apple's products
and so on.

Kivy is actively being developed by a community and is free to use. It operates
on all major platforms (Linux, OSX, Windows, Android).
on all major platforms (Linux, OS X, Windows, Android).

The main resource for information is the website: http://kivy.org

Expand Down Expand Up @@ -124,12 +124,12 @@ non-GUI applications.


***********
PySimpleGUI
PySimpleGUI
***********

`PySimpleGUI <https://pysimplegui.readthedocs.io/>`_ is a wrapper for Tkinter and Qt (others on the way). The amount of code required to implement custom GUIs is much shorter using PySimpleGUI than if the same GUI were written directly using tkinter or Qt. PySimpleGUI code can be "ported" between GUI frameworks by changing import statement.

.. code-block:: console
.. code-block:: console

$ pip install pysimplegui

Expand Down
4 changes: 2 additions & 2 deletions docs/shipping/packaging.rst
Original file line number Diff line number Diff line change
Expand Up @@ -168,10 +168,10 @@ each distribution's format (e.g. .deb for Debian/Ubuntu, .rpm for Red
Hat/Fedora, etc) is a fair amount of work. If your code is an application that
you plan to distribute on other platforms, then you'll also have to create and
maintain the separate config required to freeze your application for Windows
and OSX. It would be much less work to simply create and maintain a single
and OS X. It would be much less work to simply create and maintain a single
config for one of the cross platform :ref:`freezing tools
<freezing-your-code-ref>`, which will produce stand-alone executables for all
distributions of Linux, as well as Windows and OSX.
distributions of Linux, as well as Windows and OS X.

Creating a distribution package is also problematic if your code is for a
version of Python that isn't currently supported by a distribution.
Expand Down
6 changes: 3 additions & 3 deletions docs/starting/install/osx.rst
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ minimal but unofficial
package.

.. note::
If you already have XCode installed, do not install OSX-GCC-Installer.
If you already have Xcode installed, do not install OSX-GCC-Installer.
In combination, the software can cause issues that are difficult to
diagnose.

.. note::
If you perform a fresh install of XCode, you will also need to add the
If you perform a fresh install of Xcode, you will also need to add the
commandline tools by running ``xcode-select --install`` on the terminal.


Expand All @@ -53,7 +53,7 @@ Linux systems will notice one key component missing: a decent package manager.
`Homebrew <http://brew.sh>`_ fills this void.

To `install Homebrew <http://brew.sh/#install>`_, open :file:`Terminal` or
your favorite OSX terminal emulator and run
your favorite OS X terminal emulator and run

.. code-block:: console

Expand Down
8 changes: 4 additions & 4 deletions docs/starting/install3/osx.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,26 +27,26 @@ Doing it Right
Let's install a real version of Python.

Before installing Python, you'll need to install GCC. GCC can be obtained
by downloading `XCode <http://developer.apple.com/xcode/>`_, the smaller
by downloading `Xcode <http://developer.apple.com/xcode/>`_, the smaller
`Command Line Tools <https://developer.apple.com/downloads/>`_ (must have an
Apple account) or the even smaller `OSX-GCC-Installer <https://github.com/kennethreitz/osx-gcc-installer#readme>`_
package.

.. note::
If you already have XCode installed, do not install OSX-GCC-Installer.
If you already have Xcode installed, do not install OSX-GCC-Installer.
In combination, the software can cause issues that are difficult to
diagnose.

.. note::
If you perform a fresh install of XCode, you will also need to add the
If you perform a fresh install of Xcode, you will also need to add the
commandline tools by running ``xcode-select --install`` on the terminal.

While OS X comes with a large number of UNIX utilities, those familiar with
Linux systems will notice one key component missing: a package manager.
`Homebrew <http://brew.sh>`_ fills this void.

To `install Homebrew <http://brew.sh/#install>`_, open :file:`Terminal` or
your favorite OSX terminal emulator and run
your favorite OS X terminal emulator and run

.. code-block:: console

Expand Down
2 changes: 1 addition & 1 deletion docs/starting/install3/win.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Installing Python 3 on Windows
.. image:: /_static/photos/34435689480_2e6f358510_k_d.jpg

First, follow the installation instructions for `Chocolatey <https://chocolatey.org/install>`_.
It's a community system packager manager for Windows 7+. (It's very much like Homebrew on OSX.)
It's a community system packager manager for Windows 7+. (It's very much like Homebrew on OS X.)

Once done, installing Python 3 is very simple, because Chocolatey pushes Python 3 as the default.

Expand Down