From b51b2d08feed0175a7285bd0930ec1e12adc15ae Mon Sep 17 00:00:00 2001
From: Adam Harvey
Date: Fri, 7 Sep 2012 17:52:03 +0800
Subject: [PATCH] Work through the remaining FIXME pages; put them in their
correct categories, and update aged markup as appropriate.
Yes, I did check the new markup on the non-beta site too.
---
cvsup.php | 16 +++++++---------
git-php.php | 8 +++++---
mirror.php | 2 +-
mirroring-stats.php | 12 ++++++------
mirroring-troubles.php | 24 ++++++++++++------------
mirroring.php | 42 +++++++++++++++++++++---------------------
search.php | 2 +-
security-note.php | 2 +-
source.php | 2 +-
submit-event.php | 2 +-
thanks.php | 2 +-
usage.php | 2 +-
12 files changed, 58 insertions(+), 58 deletions(-)
diff --git a/cvsup.php b/cvsup.php
index 550648350..9bdafa3ce 100644
--- a/cvsup.php
+++ b/cvsup.php
@@ -28,7 +28,7 @@ $SIDEBAR_DATA = '
Compiled snapshots for Windows users are also included.
';
-site_header("Using CVSup to maintain a local CVS repository", array("current" => "FIXME"));
+site_header("Using CVSup to maintain a local CVS repository", array("current" => "help"));
?>
Once your PEAR package has been approved, or you get the sense that
people generally agree that your PECL contribution is worthwhile, you
may apply for a Git account here. Specify the name of your PEAR package
@@ -381,7 +383,7 @@ foreach ($purposes as $i => $p) { ?>
- Type of initial karma (who to send this request to):
+ Type of initial karma (who to send this request to):
.
';
-site_header("Information About This PHP Mirror Site", array("current" => "FIXME"));
+site_header("Information About This PHP Mirror Site", array("current" => "community"));
?>
Information About This PHP Mirror Site
diff --git a/mirroring-stats.php b/mirroring-stats.php
index aeaedf52f..7141d710a 100644
--- a/mirroring-stats.php
+++ b/mirroring-stats.php
@@ -2,7 +2,7 @@
// $Id$
$_SERVER['BASE_PAGE'] = 'mirroring-stats.php';
include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
-site_header("Setting Up Local Stats", array("current" => "FIXME"));
+site_header("Setting Up Local Stats", array("current" => "community"));
?>
Setting Up Local Stats
@@ -26,15 +26,15 @@ site_header("Setting Up Local Stats", array("current" => "FIXME"));
Install The Webalizer
- There is a configure file in the distribution now, and other setup options
- are also available. Consult the INSTALL file included in the package.
- Copy the executable to somewhere accessible, eg. /usr/bin .
+ There is a configure file in the distribution now, and other setup options
+ are also available. Consult the INSTALL file included in the package.
+ Copy the executable to somewhere accessible, eg. /usr/bin.
Grab mirrorkit.tgz , extract
- stats/php.conf and edit the file.
+ stats/php.conf and edit the file.
This is the main conf file for The Webalizer. Specifically, you will want to
change the lines which define where your log file sits, where the output
should go, and the name of your host machine. Look for these settings:
@@ -47,7 +47,7 @@ site_header("Setting Up Local Stats", array("current" => "FIXME"));
Give it a test
From the command line in the stats directory, type:
- webalizer -c php.conf You should get an index
+ webalizer -c php.conf You should get an index
file, a usage file for the current month, some images,
and a history file.
diff --git a/mirroring-troubles.php b/mirroring-troubles.php
index 80843b2be..29cf7a073 100644
--- a/mirroring-troubles.php
+++ b/mirroring-troubles.php
@@ -13,7 +13,7 @@ $SIDEBAR_DATA = '
';
-site_header("The PHP mirrors problem and troubleshooting guide", array("current" => "FIXME"));
+site_header("The PHP mirrors problem and troubleshooting guide", array("current" => "help"));
?>
Common troubles that PHP.net mirrors face
@@ -33,15 +33,15 @@ site_header("The PHP mirrors problem and troubleshooting guide", array("current"
directory and disable it from there. For example:
- <VirtualHost *:80>
- <Directory /path/to/phpweb>
+ <VirtualHost *:80>
+ <Directory /path/to/phpweb>
Options -Indexes -MultiViews
- </Directory>
+ </Directory>
DocumentRoot /path/to/phpweb
ServerName ....
....
- </VirtualHost>
+ </VirtualHost>
The mirror settings example also
@@ -53,9 +53,9 @@ site_header("The PHP mirrors problem and troubleshooting guide", array("current"
Improper Content-Type [? ]
- Some pages are returning incorrect Content-Type headers. For example,
- xx.php.net/manual/en/faq.html.php should be returning text/html
- instead of application/x-httpd-php . See also the Apache
+ Some pages are returning incorrect Content-Type headers. For example,
+ xx.php.net/manual/en/faq.html.php should be returning text/html
+ instead of application/x-httpd-php. See also the Apache
documentation describing
Content
Negotiation . This problem might be specific to
@@ -65,7 +65,7 @@ site_header("The PHP mirrors problem and troubleshooting guide", array("current"
Manual redirects [? ]
- By default, Apache inserts an alias for /manual/ in the configuration
+ By default, Apache inserts an alias for /manual/ in the configuration
and this causes problems for mirrors. So for example if you find that
the manuals are listed on the documentation page but all of the links
open up a search page, you probably suffer from this problem and must
@@ -76,7 +76,7 @@ site_header("The PHP mirrors problem and troubleshooting guide", array("current"
Broken manual shortcuts [? ]
If the shortcut features [e.g. xx.php.net/echo] are not working, be sure
- the manual files are really under DOCUMENT_ROOT and that the English
+ the manual files are really under DOCUMENT_ROOT and that the English
manual files are present. Also make sure that you have a correct
ErrorDocument setting.
@@ -94,7 +94,7 @@ site_header("The PHP mirrors problem and troubleshooting guide", array("current"
The mirroring guidelines mention that Apache2
enables a 'var' handler by default and this may be disabled by using
- RemoveHandler var in the configuration file.
+ RemoveHandler var in the configuration file.
@@ -104,7 +104,7 @@ site_header("The PHP mirrors problem and troubleshooting guide", array("current"
when attempting to download the PHP Installer (a .msi file). Your web
server configuration should be adjusted to force .msi files as
'application/octet-stream'. In Apache this may be done by using:
- AddType application/octet-stream .msi
+ AddType application/octet-stream .msi
diff --git a/mirroring.php b/mirroring.php
index 4a6ab4527..a49a98255 100644
--- a/mirroring.php
+++ b/mirroring.php
@@ -20,7 +20,7 @@ $SIDEBAR_DATA = '
';
*/
-site_header("Mirroring The PHP Website", array("current" => "FIXME"));
+site_header("Mirroring The PHP Website", array("current" => "community"));
// Get a minute to print out for the cron example
function make_seed()
@@ -94,7 +94,7 @@ $minute = rand(0, 59);
If you are not an official mirror (e.g. you mirror the site for your company's
- internal use), you should not rsync from rsync.php.net more frequently
+ internal use), you should not rsync from rsync.php.net more frequently
than once a day, or you may find your IP blocked. Also, please make
an effort to only mirror those parts of the site that you actually need.
(For example, exclude the manual in all languages that you
@@ -134,22 +134,22 @@ europe.rsync.php.net
- after "--delete-after" in the command line above (substituting your
- prefered language code in place of 'en' ). You can also exclude the
+ after "--delete-after" in the command line above (substituting your
+ prefered language code in place of 'en'). You can also exclude the
whole distributions directory (and the related extra folder) by replacing
- "--exclude='distributions/manual/**'" with
- "--exclude='distributions/**' --exclude='extra/**'" .
+ "--exclude='distributions/manual/**'" with
+ "--exclude='distributions/**' --exclude='extra/**'".
- If /your/local/path isn't in your web document tree (why isn't it?),
- then symlink the phpweb/ directory to the correct place on your
+ If /your/local/path isn't in your web document tree (why isn't it?),
+ then symlink the phpweb/ directory to the correct place on your
server.
Official PHP mirror sites should provide the exact content coming from
- rsync.php.net , and should not be altered in any way not described
+ rsync.php.net, and should not be altered in any way not described
in the mirroring guidelines. Failing to do so can result in immediate
removal of your mirror from our list.
@@ -177,7 +177,7 @@ europe.rsync.php.net
Setup Apache VirtualHost
- Make sure your web server is set up to serve up .php files
+ Make sure your web server is set up to serve up .php files
as PHP parsed files. If it isn't, add the mime-type to your config.
@@ -252,10 +252,10 @@ europe.rsync.php.net
You should only start to set up an Apache virtualhost for an official
mirror, if you have contacted us first , and asked
for a possible name for your mirror. The official names for PHP mirrors
- are in the convention: "xx.php.net" , where "xx" is
+ are in the convention: "xx.php.net", where "xx" is
replaced by the 2-letter ISO country code of your mirror's location. If
- there already is a "xx.php.net" , then you will probably get
- "xx2.php.net" . Do not assume that you know the code you will
+ there already is a "xx.php.net", then you will probably get
+ "xx2.php.net". Do not assume that you know the code you will
receive until your application has been reviewed and approved, and do
not submit an application saying, for example, "We are applying to
become DE.PHP.NET," because it's possible that the mirror already
@@ -267,10 +267,10 @@ europe.rsync.php.net
Before adding new official mirrors to our DNS, we require the maintainers
to set up the mirrors with an address we can use as a CNAME in the DNS.
- This subdomain (the.cname.you.set.up.example.com in the above
+ This subdomain (the.cname.you.set.up.example.com in the above
example) will be checked by mirror admins before the mirror is added.
Therefore it is important that the mirror is capable of serving requests
- for this name and the (www.)xx.php.net address provided by the
+ for this name and the (www.)xx.php.net address provided by the
mirror administrators.
@@ -281,7 +281,7 @@ europe.rsync.php.net
or just a specific hostname/IP address. Consult
the Apache
documentation for the differences of the two methods. It is very
- important to use your xx.php.net address as the ServerName, so
+ important to use your xx.php.net address as the ServerName, so
URL redirections will keep the requests in the php.net domain, ensuring
that the My PHP.net service will work.
@@ -319,7 +319,7 @@ europe.rsync.php.net
Remember to specify the same rsync parameters you used to get
the phpweb files. You should try to stagger your times a bit from the
- example to help spread the load on the rsync.php.net server.
+ example to help spread the load on the rsync.php.net server.
Sponsor Logo
@@ -332,7 +332,7 @@ europe.rsync.php.net
Create a 120 x 60 pixel sized logo button.
- Copy it to your /www/htdocs/phpweb/backend folder as mirror.gif , mirror.jpg or mirror.png .
+ Copy it to your /www/htdocs/phpweb/backend folder as mirror.gif, mirror.jpg or mirror.png.
Go visit your mirror URL and check if it is there.
@@ -389,7 +389,7 @@ europe.rsync.php.net
A hostname that we can use as a CNAME for the country-code-based
- name of the mirror (the.cname.you.set.up.example.com in the
+ name of the mirror (the.cname.you.set.up.example.com in the
above setup example). Using a name means you can move the mirror to
another IP address without coordinating with us at all.
@@ -407,8 +407,8 @@ europe.rsync.php.net
- There is a mailing list named "php-mirrors" at
- lists.php.net which we would appreciate if you could sign up to.
+ There is a mailing list named "php-mirrors" at
+ lists.php.net which we would appreciate if you could sign up to.
This mailing list is extremly low traffic and only used for communication
between mirror maintainers and the php.net webmasters.
diff --git a/search.php b/search.php
index 31aa4f093..c5671b8c7 100644
--- a/search.php
+++ b/search.php
@@ -109,7 +109,7 @@ else {
"href" => $MYSITE . "phpnetimprovedsearch.src",
"title" => "Add PHP.net search"
);
- site_header("Search", array("link" => array($link), "current" => "FIXME"));
+ site_header("Search", array("link" => array($link), "current" => "docs"));
?>
The autocompleting search feature is accessible via the form elements at the top
diff --git a/security-note.php b/security-note.php
index f9f3441c1..4e928b1bb 100644
--- a/security-note.php
+++ b/security-note.php
@@ -2,7 +2,7 @@
// $Id$
$_SERVER['BASE_PAGE'] = 'security-note.php';
include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
-site_header("A Note on Security in PHP", array("current" => "FIXME"));
+site_header("A Note on Security in PHP", array("current" => "docs"));
?>
A Note on Security in PHP
diff --git a/source.php b/source.php
index 5739827db..82abfed19 100644
--- a/source.php
+++ b/source.php
@@ -32,7 +32,7 @@ $SIDEBAR_DATA = '
git.php.net .
';
-site_header("Show Source", array("current" => "FIXME"));
+site_header("Show Source", array("current" => "community"));
// No file param specified
if (!isset($_GET['url']) || (isset($_GET['url']) && !is_string($_GET['url']))) {
diff --git a/submit-event.php b/submit-event.php
index 3edf30c19..05b2b2b59 100644
--- a/submit-event.php
+++ b/submit-event.php
@@ -4,7 +4,7 @@ $_SERVER['BASE_PAGE'] = 'submit-event.php';
include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
include_once $_SERVER['DOCUMENT_ROOT'] . '/include/posttohost.inc';
include_once $_SERVER['DOCUMENT_ROOT'] . '/include/email-validation.inc';
-site_header("Submit an Event", array("current" => "FIXME"));
+site_header("Submit an Event", array("current" => "community"));
// No errors, processing depends on POST data
$errors = array();
diff --git a/thanks.php b/thanks.php
index 72b4b673c..3d29767b8 100644
--- a/thanks.php
+++ b/thanks.php
@@ -2,7 +2,7 @@
// $Id$
$_SERVER['BASE_PAGE'] = 'thanks.php';
include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
-site_header("Thanks", array("current" => "FIXME"));
+site_header("Thanks", array("current" => "community"));
?>
Thanks
diff --git a/usage.php b/usage.php
index 8529e48b5..6b01f658d 100644
--- a/usage.php
+++ b/usage.php
@@ -2,7 +2,7 @@
// $Id$
$_SERVER['BASE_PAGE'] = 'usage.php';
include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
-site_header("PHP Usage Stats", array("current" => "FIXME"));
+site_header("PHP Usage Stats", array("current" => "community"));
?>
Usage Stats for April 2007