diff --git a/docs/sphinx/frontends.rst b/docs/sphinx/frontends.rst index 7cfe20aa9..b57ebca74 100644 --- a/docs/sphinx/frontends.rst +++ b/docs/sphinx/frontends.rst @@ -78,7 +78,7 @@ it's no longer needed. *(Important note: do not use more than one display widget within the hierarchy of the same base window; this will cause presentation stalls -on Macs.)* +on macOS.)* For an example of how displays are used with Qt, see `UI/qt-display.hpp`_ and `UI/qt-display.cpp`_. diff --git a/docs/sphinx/reference-core.rst b/docs/sphinx/reference-core.rst index 4336a01ad..7cfb564f3 100644 --- a/docs/sphinx/reference-core.rst +++ b/docs/sphinx/reference-core.rst @@ -669,7 +669,7 @@ Displays *(Important note: do not use more than one display widget within the hierarchy of the same base window; this will cause presentation - stalls on Macs.)* + stalls on macOS.)* :param graphics_data: The swap chain initialization data :return: The new display context, or NULL if failed diff --git a/docs/sphinx/reference-libobs-graphics-graphics.rst b/docs/sphinx/reference-libobs-graphics-graphics.rst index d39bcff59..3d56f995a 100644 --- a/docs/sphinx/reference-libobs-graphics-graphics.rst +++ b/docs/sphinx/reference-libobs-graphics-graphics.rst @@ -238,7 +238,7 @@ Graphics Structures .. member:: id gs_window.view - (Mac only) A view ID. + (macOS only) A view ID. .. member:: uint32_t gs_window.id void* gs_window.display @@ -267,7 +267,7 @@ Initialization Functions .. function:: void gs_enum_adapters(bool (*callback)(void *param, const char *name, uint32_t id), void *param) - Enumerates adapters (this really only applies on windows). + Enumerates adapters (this really only applies on Windows). :param callback: Enumeration callback :param param: Private data passed to the callback @@ -1084,7 +1084,7 @@ Texture Functions .. function:: gs_texture_t *gs_texture_create_from_iosurface(void *iosurf) - **Mac only:** Creates a texture from an IOSurface. + **macOS only:** Creates a texture from an IOSurface. :param iosurf: IOSurface object @@ -1092,7 +1092,7 @@ Texture Functions .. function:: bool gs_texture_rebind_iosurface(gs_texture_t *texture, void *iosurf) - **Mac only:** Rebinds a texture to another IOSurface + **macOS only:** Rebinds a texture to another IOSurface :param texture: Texture object :param iosuf: IOSurface object diff --git a/docs/sphinx/reference-libobs-graphics-math.rst b/docs/sphinx/reference-libobs-graphics-math.rst index c5cffe416..903981fbc 100644 --- a/docs/sphinx/reference-libobs-graphics-math.rst +++ b/docs/sphinx/reference-libobs-graphics-math.rst @@ -1,7 +1,7 @@ Extra Math Functions/Macros =========================== -.. code:: +.. code:: cpp #include diff --git a/docs/sphinx/reference-libobs-util-threading.rst b/docs/sphinx/reference-libobs-util-threading.rst index 9254695b2..43bba145a 100644 --- a/docs/sphinx/reference-libobs-util-threading.rst +++ b/docs/sphinx/reference-libobs-util-threading.rst @@ -3,7 +3,7 @@ Threading Libobs provides a number of helper functions/types specifically for threading. The threading header will additionally provide access to -pthread functions even on windows. +pthread functions even on Windows. .. code:: cpp diff --git a/docs/sphinx/scripting.rst b/docs/sphinx/scripting.rst index cb55300c1..da80f75e2 100644 --- a/docs/sphinx/scripting.rst +++ b/docs/sphinx/scripting.rst @@ -10,8 +10,8 @@ Scripting can be accessed in OBS Studio via the Tools menu -> Scripts option, which will bring up the scripting dialog. Scripts can be added, removed, and reloaded in real time while the program is running. -**NOTE:** On windows, currently only Python 3.6 is supported. To use -Python on windows, you must download and install Python 3.6.x "x86-64" +**NOTE:** On Windows, currently only Python 3.6 is supported. To use +Python on Windows, you must download and install Python 3.6.x "x86-64" for OBS 64bit (64bit is the default), or Python 3.6.x "x86" if using OBS 32bit. Then, in the scripting dialog, you must set the path to the Python 3.6.x install in the "Python Settings" tab.