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

@@ -28,7 +28,7 @@ $SIDEBAR_DATA = '
  Compiled snapshots for Windows users are also included.
 </p>
 ';
-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"));
 ?>
 
 <h1>Using CVSup To Maintain A Local CVS Repository</h1>
@@ -50,29 +50,27 @@ site_header("Using CVSup to maintain a local CVS repository", array("current" =>
  </li>
  <li>
   Create a php.cvsup file containing the following content:
-  <pre>
-*default host=CVSup.php.net
+<pre class="info">*default host=CVSup.php.net
 *default base=/usr/src/php
 *default release=cvs
 *default compress
 *default tag=.
 *default delete use-rel-suffix
-php-src
-  </pre>
-  This will cause the php-src tree to be stored in <tt>/usr/src/php</tt>
+php-src</pre>
+  This will cause the php-src tree to be stored in <code>/usr/src/php</code>
   (you need to create that directory manually).
  </li>
  <li>
   At a command prompt, simply type:
-  <pre>cvsup php.cvsup</pre>
+  <code>cvsup php.cvsup</code>
  </li>
  <li>
   If you are behind a firewall, you might need to use:
-  <pre>cvsup -P - php.cvsup</pre>
+  <code>cvsup -P - php.cvsup</code>
  </li>
  <li>
   To build PHP, you need to install a few utilities (GNU autoconf,
-  libtool, bison). Cd into <tt>php-src</tt> and run
+  libtool, bison). Cd into <code>php-src</code> and run
   <code>./buildconf</code>.
  </li>
 </ol>

git-php.php

@@ -19,7 +19,7 @@ $SIDEBAR_DATA = '
  <a href="/git.php">Git</a>. No Git account is required.
 </p>
 ';
-site_header("Using Git for PHP Development", array("current" => "FIXME"));
+site_header("Using Git for PHP Development", array("current" => "community"));
 
 $groups = array(
   "none" => "Choose One",
@@ -281,7 +281,9 @@ EOT;
  <a href="http://pear.php.net/">the PEAR website</a>. If you have a new PECL
  extension you wish to contribute, bring it up on the appropriate
  <a href="http://pecl.php.net/support.php">PECL mailing list</a> first. 
- <br />
+</p>
+
+<p>
  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) { ?>
  <td><input type="text" size="10" name="yesno" class="max" value="no" /></td>
 </tr>
 <tr>
- <th>Type of initial karma (who to send this request to):</th>
+ <th class="subr">Type of initial karma (who to send this request to):</th>
  <td>
   <select name="group">
 <?php

mirror.php

@@ -16,7 +16,7 @@ $SIDEBAR_DATA = '
  mirroring page</a>.
 </p>
 ';
-site_header("Information About This PHP Mirror Site", array("current" => "FIXME"));
+site_header("Information About This PHP Mirror Site", array("current" => "community"));
 ?>
 
 <h1>Information About This PHP Mirror Site</h1>

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"));
 ?>
 
 <h1>Setting Up Local Stats</h1>
@@ -26,15 +26,15 @@ site_header("Setting Up Local Stats", array("current" => "FIXME"));
  <li>
   <p>
    Install The Webalizer<br /><br />
-   There is a <tt>configure</tt> file in the distribution now, and other setup options
-   are also available. Consult the <tt>INSTALL</tt> file included in the package.
-   Copy the executable to somewhere accessible, eg. <tt>/usr/bin</tt>.
+   There is a <code>configure</code> file in the distribution now, and other setup options
+   are also available. Consult the <code>INSTALL</code> file included in the package.
+   Copy the executable to somewhere accessible, eg. <code>/usr/bin</code>.
   </p>
  </li>
  <li>
   <p>
    Grab <a href="/mirrorkit.tgz">mirrorkit.tgz</a>, extract
-   <tt>stats/php.conf</tt> and edit the file.<br /><br />
+   <code>stats/php.conf</code> and edit the file.<br /><br />
    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"));
   <p>
    Give it a test<br /><br />
    From the command line in the stats directory, type:
-   <tt>webalizer -c php.conf</tt> You should get an index
+   <code>webalizer -c php.conf</code> You should get an index
    file, a usage file for the current month, some images,
    and a history file.
   </p>

mirroring-troubles.php

@@ -13,7 +13,7 @@ $SIDEBAR_DATA = '
 </p>
 ';
 
-site_header("The PHP mirrors problem and troubleshooting guide", array("current" => "FIXME"));
+site_header("The PHP mirrors problem and troubleshooting guide", array("current" => "help"));
 ?>
 
 <h1>Common troubles that PHP.net mirrors face</h1>
@@ -33,15 +33,15 @@ site_header("The PHP mirrors problem and troubleshooting guide", array("current"
  directory and disable it from there. For example:
 </p>
 <pre class="info">
-  &lt;VirtualHost *:80>
-    &lt;Directory /path/to/phpweb>
+  &lt;VirtualHost *:80&gt;
+    &lt;Directory /path/to/phpweb&gt;
       Options -Indexes -MultiViews
-    &lt;/Directory>
+    &lt;/Directory&gt;
    
     DocumentRoot /path/to/phpweb
     ServerName ....
     ....
-  &lt;/VirtualHost> 
+  &lt;/VirtualHost&gt; 
 </pre>
 <p>
  The <a href="mirroring.php#settings">mirror settings</a> example also 
@@ -53,9 +53,9 @@ site_header("The PHP mirrors problem and troubleshooting guide", array("current"
 <a name="content-type"></a>
 <h3>Improper Content-Type [<a href="/manual/en/faq.html.php">?</a>]</h3>
 <p>
- Some pages are returning incorrect <em>Content-Type</em> headers. For example,
- xx.php.net/manual/en/faq.html.php should be returning <em>text/html</em> 
- instead of <em>application/x-httpd-php</em>. See also the Apache 
+ Some pages are returning incorrect <code>Content-Type</code> headers. For example,
+ xx.php.net/manual/en/faq.html.php should be returning <code>text/html</code> 
+ instead of <code>application/x-httpd-php</code>. See also the Apache 
  documentation describing 
  <a href="http://httpd.apache.org/docs/content-negotiation.html">Content 
  Negotiation</a>. This problem might be specific to 
@@ -65,7 +65,7 @@ site_header("The PHP mirrors problem and troubleshooting guide", array("current"
 <a name="manual-redirect"></a>
 <h3>Manual redirects [<a href="/manual/">?</a>]</h3>
 <p>
- By default, Apache inserts an alias for <em>/manual/</em> in the configuration 
+ By default, Apache inserts an alias for <code>/manual/</code> 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"
 <h3>Broken manual shortcuts [<a href="/echo">?</a>]</h3>
 <p>
  If the shortcut features [e.g. xx.php.net/echo] are not working, be sure 
- the manual files are really under <em>DOCUMENT_ROOT</em> and that the English 
+ the manual files are really under <code>DOCUMENT_ROOT</code> and that the English 
  manual files are present. Also make sure that you have a correct 
  ErrorDocument setting.
 </p>
@@ -94,7 +94,7 @@ site_header("The PHP mirrors problem and troubleshooting guide", array("current"
 <p>
  The <a href="mirroring.php">mirroring guidelines</a> mention that Apache2
  enables a 'var' handler by default and this may be disabled by using
- <em>RemoveHandler var</em> in the configuration file.
+ <code>RemoveHandler var</code> in the configuration file.
 </p>
 
 <a name="msi"></a>
@@ -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: 
- <em>AddType application/octet-stream .msi</em>
+ <code>AddType application/octet-stream .msi</code>
 </p>
 
 <a name="unlisted"></a>

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);
 
 <p>
  If you are not an official mirror (e.g. you mirror the site for your company's
- internal use), you should not rsync from <tt>rsync.php.net</tt> more frequently
+ internal use), you should not rsync from <code>rsync.php.net</code> 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, <a href="#exclude">exclude the manual in all languages that you
@@ -134,22 +134,22 @@ europe.rsync.php.net
 </pre>
 
 <p>
- after <tt>"--delete-after"</tt> in the command line above (substituting your
- prefered language code in place of <tt>'en'</tt>). You can also exclude the
+ after <code>"--delete-after"</code> in the command line above (substituting your
+ prefered language code in place of <code>'en'</code>). You can also exclude the
  whole distributions directory (and the related extra folder) by replacing
- <tt>"--exclude='distributions/manual/**'"</tt> with
- <tt>"--exclude='distributions/**' --exclude='extra/**'"</tt>.
+ <code>"--exclude='distributions/manual/**'"</code> with
+ <code>"--exclude='distributions/**' --exclude='extra/**'"</code>.
 </p>
 
 <p>
- If <tt>/your/local/path</tt> isn't in your web document tree (why isn't it?),
- then symlink the <tt>phpweb/</tt> directory to the correct place on your
+ If <code>/your/local/path</code> isn't in your web document tree (why isn't it?),
+ then symlink the <code>phpweb/</code> directory to the correct place on your
  server.
 </p>
 
 <p>
  Official PHP mirror sites should provide the exact content coming from
- <tt>rsync.php.net</tt>, and should not be altered in any way not described
+ <code>rsync.php.net</code>, 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.
 </p>
@@ -177,7 +177,7 @@ europe.rsync.php.net
 <h2>Setup Apache VirtualHost</h2>
 
 <p>
- Make sure your web server is set up to serve up <tt>.php</tt> files
+ Make sure your web server is set up to serve up <code>.php</code> files
  as PHP parsed files. If it isn't, add the mime-type to your config.
 </p>
 <p class="warn">
@@ -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 <a href="#rule">contacted us first</a>, and asked
  for a possible name for your mirror. The official names for PHP mirrors
- are in the convention: <tt>"xx.php.net"</tt>, where <tt>"xx"</tt> is
+ are in the convention: <code>"xx.php.net"</code>, where <code>"xx"</code> is
  replaced by the 2-letter ISO country code of your mirror's location. If
- there already is a <tt>"xx.php.net"</tt>, then you will probably get
- <tt>"xx2.php.net"</tt>.  Do not assume that you know the code you will
+ there already is a <code>"xx.php.net"</code>, then you will probably get
+ <code>"xx2.php.net"</code>.  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
 <p>
  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 (<tt>the.cname.you.set.up.example.com</tt> in the above
+ This subdomain (<code>the.cname.you.set.up.example.com</code> 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 <tt>(www.)xx.php.net</tt> address provided by the
+ for this name and the <code>(www.)xx.php.net</code> address provided by the
  mirror administrators.
 </p>
 
@@ -281,7 +281,7 @@ europe.rsync.php.net
  or just a specific hostname/IP address. Consult
  <a href="http://httpd.apache.org/docs/vhosts/index.html">the Apache
  documentation</a> for the differences of the two methods. It is very
- important to use your <tt>xx.php.net</tt> address as the ServerName, so
+ important to use your <code>xx.php.net</code> 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.
 </p>
@@ -319,7 +319,7 @@ europe.rsync.php.net
 <p>
  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 <tt>rsync.php.net</tt> server.
+ example to help spread the load on the <code>rsync.php.net</code> server.
 </p>
 
 <h2>Sponsor Logo</h2>
@@ -332,7 +332,7 @@ europe.rsync.php.net
 
 <ul>
  <li>Create a 120 x 60 pixel sized logo button.</li>
- <li>Copy it to your <tt>/www/htdocs/phpweb/backend</tt> folder as <tt>mirror.gif</tt>, <tt>mirror.jpg</tt> or <tt>mirror.png</tt>.</li>
+ <li>Copy it to your <code>/www/htdocs/phpweb/backend</code> folder as <code>mirror.gif</code>, <code>mirror.jpg</code> or <code>mirror.png</code>.</li>
  <li>Go visit your mirror URL and check if it is there.</li>
 </ul>
 
@@ -389,7 +389,7 @@ europe.rsync.php.net
  </li>
  <li>
   A hostname that we can use as a CNAME for the country-code-based
-  name of the mirror (<tt>the.cname.you.set.up.example.com</tt> in the
+  name of the mirror (<code>the.cname.you.set.up.example.com</code> in the
   above setup example). Using a name means you can move the mirror to
   another IP address without coordinating with us at all.
  </li>
@@ -407,8 +407,8 @@ europe.rsync.php.net
 </ul>
 
 <p>
- There is a mailing list named <tt>"php-mirrors"</tt> at
- <tt>lists.php.net</tt> which we would appreciate if you could sign up to.
+ There is a mailing list named <code>"php-mirrors"</code> at
+ <code>lists.php.net</code> 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.
 </p>

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"));
 ?>
 <p>
  The autocompleting search feature is accessible via the form elements at the top

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"));
 ?>
 
 <h1>A Note on Security in PHP</h1>

source.php

@@ -32,7 +32,7 @@ $SIDEBAR_DATA = '
  <a href="http://git.php.net/?p=web/php.git;a=summary">git.php.net</a>.
 </p>
 ';
-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']))) {

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();

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"));
 ?>
 
 <h1>Thanks</h1>

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"));
 ?>
 
 <h1>Usage Stats for April 2007</h1>