From 41d8fe411f4479999cf441e8d1e7d3f2daa669b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= Date: Tue, 1 Apr 2025 15:30:20 +0200 Subject: [PATCH 1/2] Update php/variant-fpm.md Fixes docker-library/docs#2558 --- php/variant-fpm.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/php/variant-fpm.md b/php/variant-fpm.md index 06ba66065500..6a68377ec393 100644 --- a/php/variant-fpm.md +++ b/php/variant-fpm.md @@ -1,14 +1,14 @@ ## `%%IMAGE%%:-fpm` -This variant contains PHP-FPM, which is a FastCGI implementation for PHP. See [the PHP-FPM website](https://php-fpm.org/) for more information about PHP-FPM. +This variant contains [PHP’s FastCGI Process Manager (FPM)](https://www.php.net/fpm), which is the recommended FastCGI implementation for PHP. In order to use this image variant, some kind of reverse proxy (such as NGINX, Apache, or other tool which speaks the FastCGI protocol) will be required. Some potentially helpful resources: -- [PHP-FPM.org](https://php-fpm.org/) -- [simplified example by @md5](https://gist.github.com/md5/d9206eacb5a0ff5d6be0) -- [very detailed article by Pascal Landau](https://www.pascallandau.com/blog/php-php-fpm-and-nginx-on-docker-in-windows-10/) +- [FPM’s Official Configuration Reference](https://www.php.net/manual/en/install.fpm.configuration.php) +- [Simplified example by @md5](https://gist.github.com/md5/d9206eacb5a0ff5d6be0) +- [Very detailed article by Pascal Landau](https://www.pascallandau.com/blog/php-php-fpm-and-nginx-on-docker-in-windows-10/) - [Stack Overflow discussion](https://stackoverflow.com/q/29905953/433558) - [Apache httpd Wiki example](https://wiki.apache.org/httpd/PHPFPMWordpress) From e9851c7e4944cc5f3eb79363fa44950d43a7bb49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= Date: Tue, 1 Apr 2025 22:20:42 +0200 Subject: [PATCH 2/2] Use ASCII apostrophe Co-authored-by: Tianon Gravi --- php/variant-fpm.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/php/variant-fpm.md b/php/variant-fpm.md index 6a68377ec393..5ea228701ea5 100644 --- a/php/variant-fpm.md +++ b/php/variant-fpm.md @@ -1,12 +1,12 @@ ## `%%IMAGE%%:-fpm` -This variant contains [PHP’s FastCGI Process Manager (FPM)](https://www.php.net/fpm), which is the recommended FastCGI implementation for PHP. +This variant contains [PHP's FastCGI Process Manager (FPM)](https://www.php.net/fpm), which is the recommended FastCGI implementation for PHP. In order to use this image variant, some kind of reverse proxy (such as NGINX, Apache, or other tool which speaks the FastCGI protocol) will be required. Some potentially helpful resources: -- [FPM’s Official Configuration Reference](https://www.php.net/manual/en/install.fpm.configuration.php) +- [FPM's Official Configuration Reference](https://www.php.net/manual/en/install.fpm.configuration.php) - [Simplified example by @md5](https://gist.github.com/md5/d9206eacb5a0ff5d6be0) - [Very detailed article by Pascal Landau](https://www.pascallandau.com/blog/php-php-fpm-and-nginx-on-docker-in-windows-10/) - [Stack Overflow discussion](https://stackoverflow.com/q/29905953/433558)