From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-315969-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1Poe8y-0007Hw-N8
	for garchives@archives.gentoo.org; Sun, 13 Feb 2011 15:45:50 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id A2120E05B9;
	Sun, 13 Feb 2011 15:45:41 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 57C49E05B9
	for <gentoo-commits@lists.gentoo.org>; Sun, 13 Feb 2011 15:45:41 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
	(using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id A3D741B4085
	for <gentoo-commits@lists.gentoo.org>; Sun, 13 Feb 2011 15:45:40 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by pelican.gentoo.org (Postfix) with ESMTP id 174C08006E
	for <gentoo-commits@lists.gentoo.org>; Sun, 13 Feb 2011 15:45:40 +0000 (UTC)
From: "Ole Markus With" <olemarkus@olemarkus.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Ole Markus With" <olemarkus@olemarkus.org>
Message-ID: <b6e8aa09c8e2386bda0b1ac15888e71c4f01f871.ole_markus_with@gentoo>
Subject: [gentoo-commits] proj/php:master commit in: docs/
X-VCS-Repository: proj/php
X-VCS-Files: docs/index.xml docs/php-installing.xml docs/php-upgrading.xml
X-VCS-Directories: docs/
X-VCS-Committer: ole_markus_with
X-VCS-Committer-Name: Ole Markus With
X-VCS-Revision: b6e8aa09c8e2386bda0b1ac15888e71c4f01f871
Date: Sun, 13 Feb 2011 15:45:40 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 
X-Archives-Hash: 310ea377e96048fd0331e848a48c4b7c

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=3Dproj/php.git;a=3Dc=
ommit;h=3Db6e8aa09

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 en=
vironment possible for
 developing and running software written in PHP.
 </p></goals>
=20
-<!-- Developer Roles -->
-<dev role=3D"Member">mabi</dev>
-<dev role=3D"Member">olemarkus</dev>
-
 <!-- Available jobs -->
 <recruitment>
   <job>
@@ -69,6 +65,10 @@ developing and running software written in PHP.
   </job>
 </recruitment>
=20
+<!-- Developer Roles -->
+<dev role=3D"Member">mabi</dev>
+<dev role=3D"Member">olemarkus</dev>
+
 <!-- Project Specific Pages/Documentation -->
 <resource link=3D"php-installing.xml">Documentation: How to install PHP =
on various servers using the most common SAPIs</resource>
 <resource link=3D"php-upgrade.xml">Documentation: Upgrading PHP</resourc=
e>

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=3D"1.0" encoding=3D"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 $ -->
=20
 <guide link=3D"php-install.xml" lang=3D"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>
=20
+<section>
 <body>
 <warn>Discouraged for PHP 5.3.3 and newer</warn>
 </body>
+</section>
=20
 <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>
=20
-<pre>
+<pre caption=3D"Installing PHP">
 <i>emerge -av php</i>
 </pre>
=20
@@ -133,8 +135,9 @@ phpinfo();
 www-server/lighttpd php
 </pre>
=20
-Then emerge lighttpd
-<pre>
+<p>Then emerge lighttpd</p>
+
+<pre caption=3D"Install lighttpd">
 <i>emerge -av lighttpd</i>
 </pre>
=20
@@ -147,14 +150,18 @@ Then emerge lighttpd
=20
 <chapter>
 <title>Installing PHP FPM </title>
+<section>
 <body>
 <impo>This is only available for PHP 5.3.3 and newer. The PHP herds cons=
ider 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=20
 improved fcgi SAPI that allows for more advanced configuration than the
 original fcgi SAPI. One of the most useful features is process managemen=
t, which=20
 makes it very useful for lightweight webservers, such as <c>www-servers/=
nginx</c>,=20
 that does not handle process management of fcgi themselves.=20
+</p>
 </body>
+</section>
 <section>
 <title>Installing PHP</title>
 <body>
@@ -193,7 +200,7 @@ However it does provide a good foundation for a confi=
guration file that can be u
 <p>Edit <path>/etc/lighttpd/mod_fastcgi.conf</path> so that it looks som=
ething like this:
 </p>
=20
-<pre>
+<pre caption=3D"/etc/lighttpd/mod_fastcgi.conf">
 server.modules +=3D ("mod_fastcgi")
 fastcgi.server =3D ( ".php" =3D>
   ( "localhost" =3D>
@@ -263,7 +270,7 @@ like this:
=20
 <p>Now just start the related services and you should have a working sit=
e</p>
=20
-<pre>
+<pre caption=3D"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=3D"http://www.gentoo.org/proj/en/php/php-guide.xml">PHP Up=
grade guide</uri> - Offers more information about how to deal with multip=
le instals of PHP and how to install extensions.</li>
 <li><uri link=3D"http://olemarkus.org/2011/01/concurrently-running-multi=
ple-versions-of-php/">Concurrently running multiple versions of PHP</uri>=
 - A guide describing how to set up webservers to work with parallel inst=
alls 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=3D"1.0" encoding=3D"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-upgra=
ding.xml,v 1.7 2011/02/13 15:43:41 olemarkus Exp $ -->
=20
 <guide link=3D"php-guide.xml" lang=3D"en">
 <title>Upgrading PHP</title>