From 44630bbe9b3353e3b6bac125cbb4530f72fb00a7 Mon Sep 17 00:00:00 2001 From: Howie Zhao Date: Sun, 28 Aug 2022 12:35:00 +0800 Subject: [PATCH 1/5] Update osx.rst --- docs/starting/install3/osx.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/starting/install3/osx.rst b/docs/starting/install3/osx.rst index 37252d615..6e3f09057 100644 --- a/docs/starting/install3/osx.rst +++ b/docs/starting/install3/osx.rst @@ -9,9 +9,9 @@ Installing Python 3 on Mac OS X .. image:: /_static/photos/34435689480_2e6f358510_k_d.jpg -**Mac OS X comes with Python 2.7 out of the box.** +**Mac OS X comes with Python 2.7 out of the box between versions 10.8 and 12.3.** -You do not need to install or configure anything else to use Python 2. These +If your Mac OS X version is between the above versions, you do not need to install or configure anything else to use Python 2. These instructions document the installation of Python 3. The version of Python that ships with OS X is great for learning, but it's not From d03633e5d62acfee6060430f5e763e3d69d29d0f Mon Sep 17 00:00:00 2001 From: Howie Zhao Date: Sun, 28 Aug 2022 12:38:04 +0800 Subject: [PATCH 2/5] Update osx.rst --- docs/starting/install/osx.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/starting/install/osx.rst b/docs/starting/install/osx.rst index d0aa601aa..4a8a8e03b 100644 --- a/docs/starting/install/osx.rst +++ b/docs/starting/install/osx.rst @@ -10,9 +10,10 @@ Installing Python 2 on Mac OS X .. note:: Check out our :ref:`guide for installing Python 3 on OS X`. -**Mac OS X comes with Python 2.7 out of the box.** +**Mac OS X comes with Python 2.7 out of the box between versions 10.8 and 12.3.** -You do not need to install or configure anything else to use Python. Having said +If your Mac OS X version is between the above versions, +you do not need to install or configure anything else to use Python. Having said that, I would strongly recommend that you install the tools and libraries described in the next section before you start building Python applications for real-world use. In particular, you should always install Setuptools, as it makes From 2935d8f4f7255fa1ad81b06eda2c800f82b9a2f1 Mon Sep 17 00:00:00 2001 From: Howie Zhao Date: Sun, 28 Aug 2022 12:38:33 +0800 Subject: [PATCH 3/5] Update osx.rst --- docs/starting/install3/osx.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/starting/install3/osx.rst b/docs/starting/install3/osx.rst index 6e3f09057..fa90fb93a 100644 --- a/docs/starting/install3/osx.rst +++ b/docs/starting/install3/osx.rst @@ -11,7 +11,8 @@ Installing Python 3 on Mac OS X **Mac OS X comes with Python 2.7 out of the box between versions 10.8 and 12.3.** -If your Mac OS X version is between the above versions, you do not need to install or configure anything else to use Python 2. These +If your Mac OS X version is between the above versions, +you do not need to install or configure anything else to use Python 2. These instructions document the installation of Python 3. The version of Python that ships with OS X is great for learning, but it's not From 4f0ee6998c3c3d27b316bb9356896a18c8e51d63 Mon Sep 17 00:00:00 2001 From: fa064972 Date: Sun, 16 Jun 2024 22:26:05 +0530 Subject: [PATCH 4/5] updated the broken links of opencv and PIL readthedocs site --- docs/scenarios/imaging.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/scenarios/imaging.rst b/docs/scenarios/imaging.rst index 7b0e71935..8fe7e08fe 100644 --- a/docs/scenarios/imaging.rst +++ b/docs/scenarios/imaging.rst @@ -62,7 +62,7 @@ Example exif_data There are more examples of the Pillow library in the -`Pillow tutorial `_. +`Pillow tutorial `_. *************************** @@ -109,4 +109,4 @@ Example There are more Python-implemented examples of OpenCV in this `collection of tutorials -`_. +`_. From 64ac5ceb88f20537c8c5c26cbcbb15f1ca56623f Mon Sep 17 00:00:00 2001 From: d9pouces Date: Thu, 20 Jun 2024 22:34:50 +0200 Subject: [PATCH 5/5] fix: remove Shinken from the admin part, because Shinken is dead (last version 8 years ago) --- docs/scenarios/admin.rst | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/docs/scenarios/admin.rst b/docs/scenarios/admin.rst index 73df990d7..f6433c213 100644 --- a/docs/scenarios/admin.rst +++ b/docs/scenarios/admin.rst @@ -395,17 +395,3 @@ up. Buildout is primarily used to download and set up dependencies in `Python eggs `_ format of the software being developed or deployed. Recipes for build tasks in any environment can be created, and many are already available. - - -******* -Shinken -******* - -`Shinken `_ is a modern, Nagios compatible -monitoring framework written in Python. Its main goal is to give users a flexible -architecture for their monitoring system that is designed to scale to large -environments. - -Shinken is backwards-compatible with the Nagios configuration standard and -plugins. It works on any operating system and architecture that supports Python, -which includes Windows, Linux, and FreeBSD.