From 8db8fd601b82df885db0becfffb87c7f2d522c78 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Tue, 4 Jul 2023 23:56:29 +0200 Subject: [PATCH] docs: OS X -> macOS --- docs/development.rst | 4 ++-- docs/usage/general/file-metadata.rst.inc | 2 +- src/borg/testsuite/platform.py | 2 +- src/borg/xattr.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/development.rst b/docs/development.rst index 0bbf03923..7f38545d4 100644 --- a/docs/development.rst +++ b/docs/development.rst @@ -372,7 +372,7 @@ Checklist: * pypi dist package and signature * Standalone binaries (see above for how to create them). - + For OS X, document the OS X Fuse version in the README of the binaries. - OS X FUSE uses a kernel extension that needs to be compatible with the + + For macOS, document the macFUSE version in the README of the binaries. + macFUSE uses a kernel extension that needs to be compatible with the code contained in the binary. * A link to ``CHANGES.rst``. diff --git a/docs/usage/general/file-metadata.rst.inc b/docs/usage/general/file-metadata.rst.inc index c2694d188..c2921819e 100644 --- a/docs/usage/general/file-metadata.rst.inc +++ b/docs/usage/general/file-metadata.rst.inc @@ -29,7 +29,7 @@ On some platforms additional features are supported: +=========================+==========+===========+============+ | Linux | Yes | Yes | Yes [1]_ | +-------------------------+----------+-----------+------------+ -| Mac OS X | Yes | Yes | Yes (all) | +| macOS | Yes | Yes | Yes (all) | +-------------------------+----------+-----------+------------+ | FreeBSD | Yes | Yes | Yes (all) | +-------------------------+----------+-----------+------------+ diff --git a/src/borg/testsuite/platform.py b/src/borg/testsuite/platform.py index 1f03c9a8f..598a8b5b6 100644 --- a/src/borg/testsuite/platform.py +++ b/src/borg/testsuite/platform.py @@ -161,7 +161,7 @@ class PlatformLinuxTestCase(BaseTestCase): self.assert_equal(acl_use_local_uid_gid(b"group:root:rw-:0"), b"group:0:rw-") -@unittest.skipUnless(sys.platform.startswith("darwin"), "OS X only test") +@unittest.skipUnless(sys.platform.startswith("darwin"), "macOS only test") @unittest.skipIf(fakeroot_detected(), "not compatible with fakeroot") class PlatformDarwinTestCase(BaseTestCase): def setUp(self): diff --git a/src/borg/xattr.py b/src/borg/xattr.py index f3bd27610..b914c5046 100644 --- a/src/borg/xattr.py +++ b/src/borg/xattr.py @@ -1,4 +1,4 @@ -"""A basic extended attributes (xattr) implementation for Linux, FreeBSD and MacOS X.""" +"""A basic extended attributes (xattr) implementation for Linux, FreeBSD and macOS.""" import errno import os