From 9cc4767b2ddf65c4ed592c9deb818cbb2c9def7b Mon Sep 17 00:00:00 2001 From: Christoph Michael Becker Date: Fri, 15 Jun 2018 11:50:40 +0000 Subject: [PATCH] What's in a name? MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Macintosh operating systems changed their name a few times since version 10. We follow suite, and use the proper name whenever we refer to a certain version, and use “macOS” as generic term, since “Mac OS X” and “OS X” versions are already unsupported, or loose support at the end of this year. git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@345139 c90b9560-bf6c-de11-be94-00142212c4b1 --- chapters/intro.xml | 2 +- features/dtrace.xml | 2 +- install/intro.xml | 2 +- install/macos/bundled.xml | 12 ++++++------ install/macos/compile.xml | 4 ++-- install/macos/index.xml | 4 ++-- install/macos/packages.xml | 2 +- language/types/string.xml | 2 +- reference/datetime/functions/strftime.xml | 4 ++-- reference/filesystem/functions/fileperms.xml | 2 +- reference/judy/configure.xml | 2 +- reference/mongo/configure.xml | 12 ++++++------ reference/ncurses/book.xml | 2 +- reference/pdo_4d/reference.xml | 2 +- reference/sockets/constants.xml | 2 +- 15 files changed, 28 insertions(+), 28 deletions(-) diff --git a/chapters/intro.xml b/chapters/intro.xml index b7efc43845..dd3d157f10 100644 --- a/chapters/intro.xml +++ b/chapters/intro.xml @@ -129,7 +129,7 @@ PHP can be used on all major operating systems, including Linux, many Unix variants (including HP-UX, Solaris and OpenBSD), - Microsoft Windows, Mac OS X, RISC OS, and probably others. + Microsoft Windows, macOS, RISC OS, and probably others. PHP also has support for most of the web servers today. This includes Apache, IIS, and many others. And this includes any web server that can utilize the FastCGI PHP binary, like lighttpd diff --git a/features/dtrace.xml b/features/dtrace.xml index bcacfe6839..88eda4badd 100644 --- a/features/dtrace.xml +++ b/features/dtrace.xml @@ -8,7 +8,7 @@ DTrace is an always-available, low overhead, tracing framework - available on a number of platforms including Solaris, Mac OS X, + available on a number of platforms including Solaris, macOS, Oracle Linux and BSD. DTrace can trace operating system behavior and user program execution. It can display argument values and be used to infer performance statistics. Probes are monitored by user diff --git a/install/intro.xml b/install/intro.xml index 2ad05d2141..19c0d3ac9d 100644 --- a/install/intro.xml +++ b/install/intro.xml @@ -19,7 +19,7 @@ PHP itself, a web server and a web browser. You probably already have a web browser, and depending on your operating system setup, you may also have a web - server (e.g. Apache on Linux and MacOS X; IIS on Windows). + server (e.g. Apache on Linux and macOS; IIS on Windows). You may also rent webspace at a company. This way, you don't need to set up anything on your own, only write your PHP scripts, upload it to the server you rent, and diff --git a/install/macos/bundled.xml b/install/macos/bundled.xml index 0b97a3710b..99a0849a0b 100644 --- a/install/macos/bundled.xml +++ b/install/macos/bundled.xml @@ -3,7 +3,7 @@ Using the bundled PHP - PHP has come standard with Macs since OS X version 10.0.0. Enabling PHP + PHP has come standard with Macs since Mac OS X version 10.0.0. Enabling PHP with the default web server requires uncommenting a few lines in the Apache configuration file httpd.conf whereas the CGI and/or CLI are enabled by @@ -14,14 +14,14 @@ a local development environment. It's highly recommended to always upgrade PHP to the newest version. Like most live software, newer versions are created to fix bugs and add features and PHP being is - no different. See the appropriate MAC OS X installation documentation for + no different. See the appropriate macOS installation documentation for further details. The following instructions are geared towards a beginner with details provided for getting a default setup to work. All users are encouraged to compile, or install a new packaged version. The standard installation type is using mod_php, and enabling the bundled - mod_php on Mac OS X for the Apache web server (the default web server, + mod_php on macOS for the Apache web server (the default web server, that is accessible via System Preferences) involves the following steps: @@ -104,7 +104,7 @@ - Before OS X 10.5 (Leopard), PHP 4 was bundled instead of PHP 5 in + Before Mac OS X 10.5 (Leopard), PHP 4 was bundled instead of PHP 5 in which case the above instructions will differ slightly by changing 5's to 4's. @@ -126,7 +126,7 @@ Set the &php.ini; location or use the default - A typical default location on Mac OS X is + A typical default location on macOS is /usr/local/php/php.ini and a call to phpinfo will reveal this information. If a &php.ini; is not used, PHP will use all default values. @@ -169,7 +169,7 @@ To restart, either execute sudo apachectl graceful in the shell or stop/start the "Personal Web Server" option in the - OS X System Preferences. By default, loading local files in the browser + macOS System Preferences. By default, loading local files in the browser will have an URL like so: http://localhost/info.php Or using the DocumentRoot in the user directory is another option and would end up looking like: diff --git a/install/macos/compile.xml b/install/macos/compile.xml index aeb4e48c2b..595b2a5e06 100644 --- a/install/macos/compile.xml +++ b/install/macos/compile.xml @@ -1,10 +1,10 @@ - Compiling PHP on Mac OS X + Compiling PHP on macOS Use the Unix installation guide to compile - PHP on OS X. + PHP on macOS. diff --git a/install/macos/index.xml b/install/macos/index.xml index 1d433c7b9c..a37789616b 100644 --- a/install/macos/index.xml +++ b/install/macos/index.xml @@ -1,9 +1,9 @@ - Installation on Mac OS X + Installation on macOS - This section contains notes and hints specific to installing PHP on Mac OS X. + This section contains notes and hints specific to installing PHP on macOS. PHP is bundled with Macs, and compiling is similar to the Unix installation guide. diff --git a/install/macos/packages.xml b/install/macos/packages.xml index 7cf1b60fcc..610b0b2747 100644 --- a/install/macos/packages.xml +++ b/install/macos/packages.xml @@ -4,7 +4,7 @@ Using Packages There are a few pre-packaged and pre-compiled versions of PHP for - Mac OS X. This can help in setting up a standard + macOS. This can help in setting up a standard configuration, but if you need to have a different set of features (such as a secure server, or a different database driver), you may need to build PHP and/or your web server yourself. If you are unfamiliar diff --git a/language/types/string.xml b/language/types/string.xml index 257fc89212..1530e98cfe 100644 --- a/language/types/string.xml +++ b/language/types/string.xml @@ -233,7 +233,7 @@ echo 'Variables do not $expand $either'; or tabs before or after the semicolon. It's also important to realize that the first character before the closing identifier must be a newline as defined by the local operating system. This is \n on - UNIX systems, including Mac OS X. The closing delimiter must also be + UNIX systems, including macOS. The closing delimiter must also be followed by a newline. diff --git a/reference/datetime/functions/strftime.xml b/reference/datetime/functions/strftime.xml index 88686f55f4..94793c6172 100644 --- a/reference/datetime/functions/strftime.xml +++ b/reference/datetime/functions/strftime.xml @@ -335,8 +335,8 @@ - Mac OS X only: The %P modifier - is not supported in the Mac OS X implementation of this function. + macOS only: The %P modifier + is not supported in the macOS implementation of this function. diff --git a/reference/filesystem/functions/fileperms.xml b/reference/filesystem/functions/fileperms.xml index 88899165d2..1d62ac4535 100644 --- a/reference/filesystem/functions/fileperms.xml +++ b/reference/filesystem/functions/fileperms.xml @@ -41,7 +41,7 @@ however on most platforms the return value will also include information on the type of file given as filename. The examples below demonstrate how to test the return value for specific permissions and - file types on POSIX systems, including Linux and Mac OS X. + file types on POSIX systems, including Linux and macOS. For local files, the specific return value is that of the diff --git a/reference/judy/configure.xml b/reference/judy/configure.xml index c0b13a4b76..194e70d2b8 100644 --- a/reference/judy/configure.xml +++ b/reference/judy/configure.xml @@ -71,7 +71,7 @@
- Installation on Mac OS X + Installation on macOS Download and install libJudy. Then install the Judy extension from PECL or from the sources. diff --git a/reference/mongo/configure.xml b/reference/mongo/configure.xml index a46cf6d65c..e2c9b8c219 100644 --- a/reference/mongo/configure.xml +++ b/reference/mongo/configure.xml @@ -9,7 +9,7 @@ - The MongoDB PHP driver should work on nearly any system: Windows, Mac OS X, + The MongoDB PHP driver should work on nearly any system: Windows, macOS, Unix, and Linux; little- and big-endian machines; 32- and 64-bit machines; PHP 5.3 through 5.6 (versions prior to 1.6 also support PHP 5.2). @@ -162,7 +162,7 @@ extension=php_mongo.dll
- OS X + macOS In most cases installing from PECL is the easiest way: @@ -196,9 +196,9 @@ $ sudo /Applications/XAMPP/xamppfiles/bin/pecl install mongo - Xcode dependency for compiling on OS X + Xcode dependency for compiling on macOS - Compiling the driver on OS X will require Xcode developer tools, which may + Compiling the driver on macOS will require Xcode developer tools, which may be installed with xcode-select --install. If that command is not available, you may first need to install the Command Line Tools package. @@ -270,12 +270,12 @@ $ /usr/sbin/setsebool -P httpd_can_network_connect 1 - (Re)installing PHP on Mac OS X + (Re)installing PHP on macOS This article by Justin Hileman details the process of installing PHP and - additional extensions with Homebrew on OS X. This complements the earlier + additional extensions with Homebrew on macOS. This complements the earlier instructions on this page for installing the driver with Homebrew. diff --git a/reference/ncurses/book.xml b/reference/ncurses/book.xml index d77340d967..e995e96aea 100644 --- a/reference/ncurses/book.xml +++ b/reference/ncurses/book.xml @@ -39,7 +39,7 @@ GNU/Linux HPUX IRIX64 - Mac OS X + macOS OS/2 QNX SCO OpenServer diff --git a/reference/pdo_4d/reference.xml b/reference/pdo_4d/reference.xml index ece55a97b9..7e10b94718 100644 --- a/reference/pdo_4d/reference.xml +++ b/reference/pdo_4d/reference.xml @@ -44,7 +44,7 @@ More details about the 4D development environment on &url.4d;. - PDO_4D is known to work with 4D versions 12 beta and up, for Mac OS X + PDO_4D is known to work with 4D versions 12 beta and up, for macOS and Windows. Older plat-forms may work, but are unsupported.
diff --git a/reference/sockets/constants.xml b/reference/sockets/constants.xml index 1e7f555cd3..f45d92550d 100644 --- a/reference/sockets/constants.xml +++ b/reference/sockets/constants.xml @@ -189,7 +189,7 @@ This constant is only available in PHP 5.4.10 or later on platforms that support the SO_REUSEPORT socket option: this - includes Mac OS X and FreeBSD, but does not include Linux or Windows. + includes macOS and FreeBSD, but does not include Linux or Windows.