summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Watkins <krakjoe@php.net>2017-10-03 07:22:04 +0100
committerJoe Watkins <krakjoe@php.net>2017-10-03 07:22:04 +0100
commitd0cda9d0bdcb3102f2aef2212ec32d47dca2b871 (patch)
tree180069ce561dccf096854127a3ae6f6e352ae220
parent1322c2c86ae683b837a45654114abea2a49680a5 (diff)
parente995b7e4758513f8c6dc5ab472e2b57e60eb1058 (diff)
downloadphp-git-d0cda9d0bdcb3102f2aef2212ec32d47dca2b871.tar.gz
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0: Typo in status.html
-rw-r--r--sapi/fpm/status.html.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/fpm/status.html.in b/sapi/fpm/status.html.in
index 86492d73df..77914a6f2b 100644
--- a/sapi/fpm/status.html.in
+++ b/sapi/fpm/status.html.in
@@ -4,7 +4,7 @@
$Id$
(c) 2011 Jerome Loyet
The PHP License, version 3.01
- This is sample real-time status page for FPM. You can change it to better feet your needs.
+ This is sample real-time status page for FPM. You can change it to better fit your needs.
-->
<head>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />