From: "Ole Markus With" <olemarkus@olemarkus.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/php:master commit in: docs/
Date: Sun, 13 Feb 2011 15:45:40 +0000 (UTC) [thread overview]
Message-ID: <b6e8aa09c8e2386bda0b1ac15888e71c4f01f871.ole_markus_with@gentoo> (raw)
commit: b6e8aa09c8e2386bda0b1ac15888e71c4f01f871
Author: Ole Markus With <o.with <AT> sportradar <DOT> com>
AuthorDate: Sun Feb 13 15:45:33 2011 +0000
Commit: Ole Markus With <olemarkus <AT> olemarkus <DOT> org>
CommitDate: Sun Feb 13 15:45:33 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/php.git;a=commit;h=b6e8aa09
Various lint fixes
---
docs/index.xml | 8 ++++----
docs/php-installing.xml | 21 +++++++++++++++------
docs/php-upgrading.xml | 2 +-
3 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/docs/index.xml b/docs/index.xml
index 2eb3752..9537e92 100644
--- a/docs/index.xml
+++ b/docs/index.xml
@@ -37,10 +37,6 @@ Our goal is to ensure that Gentoo provides the best environment possible for
developing and running software written in PHP.
</p></goals>
-<!-- Developer Roles -->
-<dev role="Member">mabi</dev>
-<dev role="Member">olemarkus</dev>
-
<!-- Available jobs -->
<recruitment>
<job>
@@ -69,6 +65,10 @@ developing and running software written in PHP.
</job>
</recruitment>
+<!-- Developer Roles -->
+<dev role="Member">mabi</dev>
+<dev role="Member">olemarkus</dev>
+
<!-- Project Specific Pages/Documentation -->
<resource link="php-installing.xml">Documentation: How to install PHP on various servers using the most common SAPIs</resource>
<resource link="php-upgrade.xml">Documentation: Upgrading PHP</resource>
diff --git a/docs/php-installing.xml b/docs/php-installing.xml
index 97e1be6..539207e 100644
--- a/docs/php-installing.xml
+++ b/docs/php-installing.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/php/php-guide.xml,v 1.1 2010/04/23 23:42:19 mabi Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/php/php-installing.xml,v 1.1 2011/02/13 15:43:41 olemarkus Exp $ -->
<guide link="php-install.xml" lang="en">
<title>Installing PHP</title>
@@ -23,9 +23,11 @@ This document will guide you through installing PHP on Gentoo
<chapter>
<title>Installing PHP FastCGI </title>
+<section>
<body>
<warn>Discouraged for PHP 5.3.3 and newer</warn>
</body>
+</section>
<section>
<title>Emerging PHP</title>
@@ -49,7 +51,7 @@ dev-lang/php cgi
<p>
That is about all the configuration you need for PHP. Now, emerge!</p>
-<pre>
+<pre caption="Installing PHP">
<i>emerge -av php</i>
</pre>
@@ -133,8 +135,9 @@ phpinfo();
www-server/lighttpd php
</pre>
-Then emerge lighttpd
-<pre>
+<p>Then emerge lighttpd</p>
+
+<pre caption="Install lighttpd">
<i>emerge -av lighttpd</i>
</pre>
@@ -147,14 +150,18 @@ Then emerge lighttpd
<chapter>
<title>Installing PHP FPM </title>
+<section>
<body>
<impo>This is only available for PHP 5.3.3 and newer. The PHP herds consider FPM as the recommended setup for PHP</impo>
+<p>
In PHP 5.3.3, PHP is shipped with support for the FPM SAPI. The FPM SAPI is an
improved fcgi SAPI that allows for more advanced configuration than the
original fcgi SAPI. One of the most useful features is process management, which
makes it very useful for lightweight webservers, such as <c>www-servers/nginx</c>,
that does not handle process management of fcgi themselves.
+</p>
</body>
+</section>
<section>
<title>Installing PHP</title>
<body>
@@ -193,7 +200,7 @@ However it does provide a good foundation for a configuration file that can be u
<p>Edit <path>/etc/lighttpd/mod_fastcgi.conf</path> so that it looks something like this:
</p>
-<pre>
+<pre caption="/etc/lighttpd/mod_fastcgi.conf">
server.modules += ("mod_fastcgi")
fastcgi.server = ( ".php" =>
( "localhost" =>
@@ -263,7 +270,7 @@ like this:
<p>Now just start the related services and you should have a working site</p>
-<pre>
+<pre caption="Starting nginx and php-fpm">
<i>/etc/init.d/nginx start</i>
<i>/etc/init.d/php-fpm start</i>
</pre>
@@ -315,11 +322,13 @@ creating a new user for your web application. </p>
</chapter>
<chapter>
<title>Further reading</title>
+<section>
<body>
<ul>
<li><uri link="http://www.gentoo.org/proj/en/php/php-guide.xml">PHP Upgrade guide</uri> - Offers more information about how to deal with multiple instals of PHP and how to install extensions.</li>
<li><uri link="http://olemarkus.org/2011/01/concurrently-running-multiple-versions-of-php/">Concurrently running multiple versions of PHP</uri> - A guide describing how to set up webservers to work with parallel installs of PHP</li>
</ul>
</body>
+</section>
</chapter>
</guide>
diff --git a/docs/php-upgrading.xml b/docs/php-upgrading.xml
index 20db4cc..a514f2b 100644
--- a/docs/php-upgrading.xml
+++ b/docs/php-upgrading.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/php/php-guide.xml,v 1.4 2011/01/05 12:15:50 mabi Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/php/Attic/php-upgrading.xml,v 1.7 2011/02/13 15:43:41 olemarkus Exp $ -->
<guide link="php-guide.xml" lang="en">
<title>Upgrading PHP</title>
next reply other threads:[~2011-02-13 15:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-13 15:45 Ole Markus With [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-06-05 12:29 [gentoo-commits] proj/php:master commit in: docs/ Ole Markus With
2011-06-05 12:29 Ole Markus With
2011-06-05 12:29 Ole Markus With
2011-02-15 17:39 Ole Markus With
2011-02-13 15:21 Ole Markus With
2011-02-13 15:21 Ole Markus With
2011-02-13 15:21 Ole Markus With
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b6e8aa09c8e2386bda0b1ac15888e71c4f01f871.ole_markus_with@gentoo \
--to=olemarkus@olemarkus.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox