From 8798cc13a66cf8edad0634638457bcc70364214f Mon Sep 17 00:00:00 2001 From: Patrik Erdes Date: Fri, 6 Apr 2018 08:31:45 +0200 Subject: Change 'Mac OS X' and OS X' to 'macOS' Mac OS X was renamed to OS X in 2012, and then renamed again to macOS in 2016. I suggest that the current name (macOS) should be used whenever referencing the Apple OS. --- contributors/guide/coding-conventions.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'contributors/guide/coding-conventions.md') diff --git a/contributors/guide/coding-conventions.md b/contributors/guide/coding-conventions.md index 680080da..6bd597a2 100644 --- a/contributors/guide/coding-conventions.md +++ b/contributors/guide/coding-conventions.md @@ -16,7 +16,7 @@ Updated: 1/24/2018 - https://google.github.io/styleguide/shell.xml - Ensure that build, release, test, and cluster-management scripts run on -OS X +macOS - Go @@ -75,7 +75,7 @@ example, see [TestNamespaceAuthorization](https://git.k8s.io/kubernetes/test/int [end-to-end (test/e2e) tests](/contributors/devel/e2e-tests.md) - Including new kubectl commands and major features of existing commands - - Unit tests must pass on OS X and Windows platforms - if you use Linux + - Unit tests must pass on macOS and Windows platforms - if you use Linux specific features, your test case must either be skipped on windows or compiled out (skipped is better when running Linux specific commands, compiled out is required when your code does not compile on Windows). -- cgit v1.2.3