sigmasternchen/php-doc-en
1
0
Fork 0
mirror of https://github.com/sigmasternchen/php-doc-en synced 2025-03-15 08:28:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

What's in a name?

Browse source 
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
This commit is contained in:
Christoph Michael Becker 2018-06-15 11:50:40 +00:00
parent b7b8f77a69
commit 9cc4767b2d
15 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
chapters/intro.xml
View file

@ -129,7 +129,7 @@
<para>
PHP can be <link linkend="install">used</link> 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

2
features/dtrace.xml
View file

@ -8,7 +8,7 @@
<para>
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

2
install/intro.xml
View file

@ -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

12
install/macos/bundled.xml
View file

@ -3,7 +3,7 @@
<sect1 xml:id="install.macosx.bundled" xmlns="http://docbook.org/ns/docbook">
<title>Using the bundled PHP</title>
<simpara>
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 <filename>httpd.conf</filename> whereas the
<acronym>CGI</acronym> and/or <acronym>CLI</acronym> are enabled by
@ -14,14 +14,14 @@
a local development environment. It's <emphasis>highly recommended</emphasis>
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.
</simpara>
<simpara>
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:
</simpara>
<para>
@ -104,7 +104,7 @@
</para>
<note>
<para>
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.
</para>
@ -126,7 +126,7 @@
Set the &php.ini; location or use the default
</simpara>
<simpara>
A typical default location on Mac OS X is
A typical default location on macOS is
<filename>/usr/local/php/php.ini</filename> and a call to
<function>phpinfo</function> will reveal this information.
If a &php.ini; is not used, PHP will use all default values.
@ -169,7 +169,7 @@
<para>
To restart, either execute <literal>sudo apachectl graceful</literal> 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 <acronym>URL</acronym> like so:
<filename>http://localhost/info.php</filename> Or using the DocumentRoot
in the user directory is another option and would end up looking like:

4
install/macos/compile.xml
View file

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<sect1 xml:id="install.macosx.compile" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Compiling PHP on Mac OS X</title>
<title>Compiling PHP on macOS</title>
<simpara>
Use the <link linkend="install.unix">Unix installation guide</link> to compile
PHP on OS X.
PHP on macOS.
</simpara>
</sect1>

4
install/macos/index.xml
View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<chapter xml:id="install.macosx" xmlns="http://docbook.org/ns/docbook">
<title>Installation on Mac OS X</title>
<title>Installation on macOS</title>
<para>
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
<link linkend="install.unix">Unix installation guide</link>.
</para>

2
install/macos/packages.xml
View file

@ -4,7 +4,7 @@
<title>Using Packages</title>
<simpara>
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

2
language/types/string.xml
View file

@ -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 <literal>\n</literal> 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.
</simpara>

4
reference/datetime/functions/strftime.xml
View file

@ -335,8 +335,8 @@
</warning>
<warning>
<simpara>
<emphasis>Mac OS X only:</emphasis> The <literal>%P</literal> modifier
is not supported in the Mac OS X implementation of this function.
<emphasis>macOS only:</emphasis> The <literal>%P</literal> modifier
is not supported in the macOS implementation of this function.
</simpara>
</warning>
</listitem>

2
reference/filesystem/functions/fileperms.xml
View file

@ -41,7 +41,7 @@
however on most platforms the return value will also include information on
the type of file given as <parameter>filename</parameter>. 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.
</para>
<para>
For local files, the specific return value is that of the

2
reference/judy/configure.xml
View file

@ -71,7 +71,7 @@
</section>
<section xml:id="judy.install.macos">
<title>Installation on Mac OS X</title>
<title>Installation on macOS</title>
<para>
Download and install <link xlink:href="http://judy.sourceforge.net">libJudy</link>.
Then install the Judy extension from PECL or from the sources.

12
reference/mongo/configure.xml
View file

@ -9,7 +9,7 @@
</warning>
<para>
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).
</para>
@ -162,7 +162,7 @@ extension=php_mongo.dll
</section>
<section xml:id="mongo.installation.osx">
<title>OS X</title>
<title>macOS</title>
<para>
In most cases installing from PECL is the easiest way:
@ -196,9 +196,9 @@ $ sudo /Applications/XAMPP/xamppfiles/bin/pecl install mongo
</para>
<note>
<title>Xcode dependency for compiling on OS X</title>
<title>Xcode dependency for compiling on macOS</title>
<para>
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 <code>xcode-select --install</code>. If that command is
not available, you may first need to install the
<link xlink:href="&url.apple.clt;">Command Line Tools</link> package.
@ -270,12 +270,12 @@ $ /usr/sbin/setsebool -P httpd_can_network_connect 1
<listitem>
<para>
<link xlink:href="&url.mongodb.install.osx.homebrew;">
(Re)installing PHP on Mac OS X
(Re)installing PHP on macOS
</link>
</para>
<para>
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.
</para>
</listitem>

2
reference/ncurses/book.xml
View file

@ -39,7 +39,7 @@
<listitem><simpara>GNU/Linux</simpara></listitem>
<listitem><simpara>HPUX</simpara></listitem>
<listitem><simpara>IRIX64</simpara></listitem>
<listitem><simpara>Mac OS X</simpara></listitem>
<listitem><simpara>macOS</simpara></listitem>
<listitem><simpara>OS/2</simpara></listitem>
<listitem><simpara>QNX</simpara></listitem>
<listitem><simpara>SCO OpenServer</simpara></listitem>

2
reference/pdo_4d/reference.xml
View file

@ -44,7 +44,7 @@
More details about the 4D development environment on <link xlink:href="&url.4d;">&url.4d;</link>.
</para>
<para>
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.
</para>
</section>

2
reference/sockets/constants.xml
View file

@ -189,7 +189,7 @@
<simpara>
This constant is only available in PHP 5.4.10 or later on platforms that
support the <constant>SO_REUSEPORT</constant> 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.
</simpara>
</listitem>
</varlistentry>