diff --git a/src/abi/pacemaker/index.php b/src/abi/pacemaker/index.php
index c9946cd..af36811 100644
--- a/src/abi/pacemaker/index.php
+++ b/src/abi/pacemaker/index.php
@@ -1,82 +1,82 @@
 ---
 layout: pacemaker
-title: ClusterLabs - Pacemaker ABI Compatibility
+title: Pacemaker ABI Compatibility
 ---
 
      <section id="main">
 <p>
 This page details the ABI compatability between the listed
 <a href="http://wiki.clusterlabs.org/wiki/Pacemaker">Pacemaker</a> versions.
 The reports are generated with the
 <a href="http://forge.ispras.ru/projects/abi-compliance-checker">ABI Compliance
 Checker</a> that ships with <a href="http://fedoraproject.org">Fedora</a>
 </p>
 
 <table align=center style="width:75%;" cellpadding=1>
 <caption>
   <a name="ABI_table" id="ABI_table"></a><h3>ABI Compatability Table</h3>
 </caption>
  <tr>
   <th>Version</th>
   <th>Reference Version</th>
   <th>Status</th>
   <th>Report</th>
  </tr>
 
 <?php
   function sorter($a, $b) {
     return version_compare($b["from"], $a["from"]);
   }
 
   $i = 0;
   $compat_reports = array();
 
   foreach (glob("*/compat_report.html") as $item) {
     $report = dirname($item);
     $v = explode("_", $report);
     if ((count($v) != 3) || ($v[1] != "to")) {
       continue;
     }
 
     $compat_reports[$i] = array();
     $compat_reports[$i]["filename"] = $item;
     $compat_reports[$i]["report"] = $report;
     $compat_reports[$i]["from"] = $v[0];
     $compat_reports[$i]["to"] = $v[2];
 
     $compat_reports[$i]["status"] = "unknown";
     $file_handle = fopen($compat_reports[$i]["filename"], "r");
     while (!feof($file_handle)) {
 	$line = fgets($file_handle);
 	if (strstr($line, "Verdict")) {
 	    $compat_reports[$i]["status"] = preg_replace("/.*<td>/", "", $line);
 	    $compat_reports[$i]["status"] = preg_replace("/<\/td>.*/", "", $compat_reports[$i]["status"]);
 	    break;
 	}
     }
     fclose($file_handle);    
 
     ++$i;
   }
 
   usort($compat_reports, "sorter");
 
   foreach ($compat_reports as $item) {
     $report = $item["report"];
     $filename = $item["filename"];
     $from = $item["from"];
     $to = $item["to"];
     $status = $item["status"];
 
     echo " <tr align=center>";
     echo "  <td> $to </td>";
     echo "  <td> $from </td>";
     echo "  <td> $status </td>";
     echo "  <td><a href=\"$filename\">report</a></td>";
     echo " </tr>";
   }
 ?>
 
 </table>
 
      </section>  <!-- id="main" -->
diff --git a/src/doc/index.php b/src/doc/index.php
index cddaabe..cc48444 100644
--- a/src/doc/index.php
+++ b/src/doc/index.php
@@ -1,165 +1,165 @@
 ---
 layout: pacemaker
-title: ClusterLabs - Pacemaker Documentation
+title: Documentation
 ---
 		<section id="main">
 <p>
 The following <a href="http://wiki.clusterlabs.org/wiki/Pacemaker">Pacemaker</a> documentation was generated from the upstream sources.
 </p>
      
 <h1>Where to Start</h1>
 <p>
 
     If you're new to Pacemaker or clustering in general, the best
     place to start is the <b>Clusters from Scratch</b> guide.  This
     document walks you step-by-step through the installation and
     configuration of a High Availability cluster with Pacemaker.
     It even makes the common configuration mistakes so that it can
     demonstrate how to fix them.
 
 </p>
 
 <p>
 
     On the otherhand, if you're looking for an exhaustive reference of
     all Pacemaker's options and features, try <b>Pacemaker
     Explained</b>.  It's dry, but should have the answers you're
     looking for.
 
 </p>
 
 <p>
     There is also a <a href="http://wiki.clusterlabs.org/wiki">project wiki</a> with plenty of
     <a href="http://wiki.clusterlabs.org/wiki/Category:Help:Examples">examples</a> and 
     <a href="http://wiki.clusterlabs.org/wiki/Category:Help:Howto">howto guides</a> which
     the wider community is encouraged to update and add to.
 </p>
 
 <h1>Unversioned documentation</h1>
 <section class="docset">
   <h3 class='docversion'>General Concepts</h3>
   <table class="publican-doc">
     <tr>
       <td>Ordering Explained</td>
       <td>[<a class="doclink" href="Ordering_Explained.pdf">pdf</a>]</td>
       <td>[<a class="doclink" href="Ordering_Explained_White.pdf">print</a>]</td>
     </tr>
     <tr>
       <td>Colocation Explained</td>
       <td>[<a class="doclink" href="Colocation_Explained.pdf">pdf</a>]</td>
       <td>[<a class="doclink" href="Colocation_Explained_White.pdf">print</a>]</td>
     </tr>
     <tr>
       <td>Configuring Fencing with crmsh</td>
       <td>[<a class="doclink" href="crm_fencing.html">html</a>]</td>
     </tr>
     <tr>
       <td>ACL Guide</td>
       <td>[<a class="doclink" href="acls.html">html</a>]</td>
     </tr>
   </table>
 </section>
 
 <?php
 
  function get_versions($base) {
    $versions = array();
    foreach (glob("$base/*/Pacemaker/*") as $item)
       if ($item != '.' && $item != '..' && is_dir($item) && !is_link($item))
          $versions[] = basename($item);
 
    return array_unique($versions);
  }
 
  function docs_for_version($base, $version) {
    echo "<section class='docset'>";
    echo "<h3 class='docversion'>";
    foreach (glob("title-$version.txt") as $filename) {
       readfile($filename);
    }
    echo "</h3>";
    foreach (glob("desc-$version.txt") as $filename) {
       readfile($filename);
    }
    echo "<br/>";
    foreach (glob("build-$version.txt") as $filename) {
       readfile($filename);
    }
    echo "<br/>";
 
    $langs = array();
    // for now, show only US English; other translations haven't been maintained
    foreach (glob("$base/en-US/Pacemaker/$version") as $item) {
        $langs[] = basename(dirname(dirname($item)));
    }
    
    $books = array();
    foreach (glob("$base/en-US/Pacemaker/$version/pdf/*") as $filename) {
        $books[] = basename($filename);
    }
 
    echo '<table class="publican-doc">';
    foreach ($books as $b) {
        foreach ($langs as $lang) {
            if (glob("$base/$lang/Pacemaker/$version/pdf/$b/*-$lang.pdf")) {
                echo '<tr><td>'.str_replace("_", " ", $b)." ($lang)</td>";
 
                echo '<td>';
                foreach (glob("$base/$lang/Pacemaker/$version/epub/$b/*.epub") as $filename) {
                    echo " [<a class='doclink' href=$filename>epub</a>]";
                }
                foreach (glob("$base/$lang/Pacemaker/$version/pdf/$b/*.pdf") as $filename) {
                    echo " [<a class='doclink' href=$filename>pdf</a>]";
                }
                foreach (glob("$base/$lang/Pacemaker/$version/html/$b/index.html") as $filename) {
                    echo " [<a class='doclink' href=$filename>html</a>]";
                }
                foreach (glob("$base/$lang/Pacemaker/$version/html-single/$b/index.html") as $filename) {
                    echo " [<a class='doclink' href=$filename>html-single</a>]";
                }
                foreach (glob("$base/$lang/Pacemaker/$version/txt/$b/*.txt") as $filename) {
                    echo " [<a class='doclink' href=$filename>txt</a>]";
                }
                echo "</td></tr>";
            }
        }
    }
    echo "</table>";
    echo "</section>";
  }
 
 $docs = array();
 
 foreach (glob("*.html") as $file) {
   $fields = explode(".", $file, -1);
   $docs[] = implode(".", $fields);
 }
 
 foreach (glob("*.pdf") as $file) {
   $fields = explode(".", $file, -1);
   $docs[] = implode(".", $fields);
 }
 
 
 echo "<h1>Versioned documentation</h1>";
 foreach(get_versions(".") as $v) {
   docs_for_version(".", $v);
 }
 
 ?>
 
 <h1>Deprecated Documentation</h1>
 <section class="docset">
   <h3 class='docversion'>Pacemaker 1.0 with OpenAIS</h3>
   <table class="publican-doc">
     <tr>
       <td>Clusters from Scratch - Pacemaker 1.0 & GFS2</td>
       <td>[<a class="doclink" href="Clusters_from_Scratch-1.0-GFS2.pdf">pdf</a>]</td>
     </tr>
     <tr>
       <td>Clusters from Scratch - Pacemaker 1.0 & OCFS2</td>
       <td>[<a class="doclink" href="Clusters_from_Scratch-1.0-OCFS2.pdf">pdf</a>]</td>
     </tr>
   </table>
 </section>
 		</section>	
diff --git a/src/doxygen/pacemaker/index.php b/src/doxygen/pacemaker/index.php
index a81d1b0..b238f68 100644
--- a/src/doxygen/pacemaker/index.php
+++ b/src/doxygen/pacemaker/index.php
@@ -1,35 +1,35 @@
 ---
 layout: pacemaker
-title: ClusterLabs - Pacemaker API Documentation
+title: Pacemaker API Documentation
 ---
      <section id="main">
         <h2>Pacemaker API Documentation</h2>
         <?php
 
 echo "<ul>";
 
 $runs = glob("*");
 array_multisort(array_map('filemtime', $runs), /*SORT_ASC*/SORT_DESC, $runs);
 
 foreach ($runs as $hash) {
     if (strstr($hash, "index")) {
         continue;
     }
     if (strstr($hash, "-")) {
         $title = "Version";
         $path = "releases/tag";
     } else {
         $title = "Commit";
         $path = "commit";
     }
 
     echo "<li>$title $hash";
     echo " [<a href=$hash/index.html>Main Page</a>]";
     echo " [<a href=$hash/modules.html>API List</a>]";
     echo " [<a href=https://github.com/ClusterLabs/pacemaker/$path/$hash>Source</a>]";
     echo "</li>";
 }
 
 echo "</ul>";
 ?>
      </section>
diff --git a/src/global/pacemaker/index.php b/src/global/pacemaker/index.php
index d4be8d0..4178f88 100644
--- a/src/global/pacemaker/index.php
+++ b/src/global/pacemaker/index.php
@@ -1,35 +1,35 @@
 ---
 layout: pacemaker
-title: ClusterLabs - Annotated Pacemaker Sources
+title: Annotated Pacemaker Sources
 ---
 
      <section id="main">
         <h2>Annotated Pacemaker Sources</h2>
         <?php
 
 echo "<ul>";
 
 $runs = glob("*");
 array_multisort(array_map('filemtime', $runs), /*SORT_ASC*/SORT_DESC, $runs);
 
 foreach ($runs as $hash) {
     if (strstr($hash, "index")) {
         continue;
     }
     if (strstr($hash, "-")) {
         $title = "Version";
         $path = "releases/tag";
     } else {
         $title = "Commit";
         $path = "commit";
     }
 
     echo "<li>$title $hash";
     echo " [<a href=$hash/index.html>Annotated</a>]";
     echo " [<a href=https://github.com/ClusterLabs/pacemaker/$path/$hash>Download</a>]";
     echo "</li>";
 }
 
 echo "</ul>";
 ?>
      </section>
diff --git a/src/man/pacemaker/index.php b/src/man/pacemaker/index.php
index cc269c4..3fe3142 100644
--- a/src/man/pacemaker/index.php
+++ b/src/man/pacemaker/index.php
@@ -1,230 +1,230 @@
 ---
 layout: pacemaker
-title: ClusterLabs - Pacemaker Manual Pages
+title: Pacemaker Manual Pages
 ---
      <section id="main">
      <h1>Pacemaker Command Line Tools</h1>
      <h2>Tool Summary</h2>
 
 <?php
      function get_desc($man) 
 {
     
 $file_handle = fopen($man, "r");
 $done = 0;
 
 while (!feof($file_handle)) {
     $line = fgets($file_handle);
     if(strstr($line, 'h2>DESCRIPTION')) {
 	$line = fgets($file_handle);
 	$line = fgets($file_handle);
 	while (!feof($file_handle)) {
 	    $line = fgets($file_handle);
 	    if(strstr($line, 'OPTIONS')) {
 		$done = 1;
 		break;
 		
 	    } else {
 		echo $line;
 	    }
 	}
 	if($done) {
 	    break;
 	}
     }
 }
 fclose($file_handle);
 }
 
  $mans = glob("*.8.html");
 foreach ($mans as $m) {
     $fields = explode(".", $m, 3);
     $base = $fields[0];
     
     echo '<dt>';
     echo '<span class="refentrytitle">';
     echo "<a href=$m>$base</a>";
     echo '</span>';
     echo '<span class="refpurpose">';
     get_desc($m);
     echo '</span>';
     echo '</dt>';
 }
 
 ?>
 
      <h2>The Right Tool for the Job</h2>
      <p>
      Pacemaker ships with a comprehensive set of tools that assist you
      in managing your cluster from the command line. Here we introduce
      the tools needed for managing the cluster configuration in the
      CIB and the cluster resources.
      </p>
      <p>
        The following list presents several tasks related to cluster
        management and briefly introduces the tools to use to
        accomplish these tasks:
      </p>
      <div class="variablelist">
        <dl>
 	 <dt>
 	   <span class="term">Monitoring the Cluster's Status</span>
 	 </dt>
 	 <dd>
 	   <p>The <strong class="inline-command">crm_mon</strong> command
 	      allows you to monitor your cluster's status and
 	      configuration. Its output includes the number of nodes,
 	      uname, uuid, status, the resources configured in your
 	      cluster, and the current status of each. The output of
 	     
 	     <strong class="inline-command">crm_mon</strong> 
 
 	     can be displayed at the console or printed into an HTML
 	     file. When provided with a cluster configuration file
 	     without the status section,
 
 	     <strong class="inline-command">crm_mon</strong>
 	     
 	     creates an overview of nodes and resources as specified
 	     in the file. See <a href="crm_mon.8.html"
 	     title="crm_mon"><span class="refentrytitle">crm_mon</span>(8)</a>
 	     for a detailed introduction to this tool's usage and
 	     command syntax.
 	   </p>
 	 </dd>
 	 <dt>
 	   <span class="term">Managing the CIB</span>
 	 </dt>
 	 <dd>
 	   <p>The <strong class="inline-command">cibadmin</strong> command is
 	      the low-level administrative command for manipulating
 	      the Pacemaker CIB. It can be used to dump all or part of
 	      the CIB, update all or part of it, modify all or part of
 	      it, delete the entire CIB, or perform miscellaneous CIB
 	      administrative operations. See <a href="cibadmin.8.html"
 	      title="cibadmin">
 	       <span class="refentrytitle">cibadmin(8)</a> for a
 	     detailed introduction
 	     to this tool's usage and command syntax.
 	   </p>
 	 </dd>
 	 <dt>
 	   <span class="term">Managing Configuration Changes</span>
 	 </dt>
 	 <dd>
 	   <p>The <strong class="inline-command">crm_diff</strong> command
 	      assists you in creating and applying XML patches.  This
 	      can be useful for visualizing the changes between two
 	      versions of the cluster configuration or saving changes
 	      so they can be applied at a later time
 	      using <a href="cibadmin.8.html" title="cibadmin">
 	      <span class="refentrytitle">cibadmin</span>(8)</a>.
 	      See <a href="crm_diff.8.html" title="crm_diff">
 	      <span class="refentrytitle">crm_diff</span>(8)</a> for a
 	     detailed introduction to this tool's usage and command
 	     syntax.
 	   </p>
 	 </dd>
 	 <dt>
 	   <span class="term">Manipulating CIB Attributes</span>
 	 </dt>
 	 <dd>
 	   <p>The <strong class="inline-command">crm_attribute</strong>
 	      command lets you query and manipulate node attributes
 	      and cluster configuration options that are used in the
 	      CIB. See <a href="crm_attribute.8.html"
 	      title="crm_attribute"> <span class="refentrytitle">crm_attribute</span>(8)</a>
 	      for a detailed introduction to this tool's usage and
 	      command syntax.</p>
 	 </dd>
 	 <dt>
 	   <span class="term">Validating the Cluster Configuration</span>
 	 </dt>
 	 <dd>
 	   <p>The <strong class="inline-command">crm_verify</strong> command
 	      checks the configuration database (CIB) for consistency
 	      and other problems. It can check a file containing the
 	      configuration or connect to a running cluster. It
 	      reports two classes of problems. Errors must be fixed
 	      before Pacemaker can work properly while warning
 	      resolution is up to the administrator.
 	       <strong class="inline-command">crm_verify</strong> assists in
 	      creating new or modified configurations. You can take a
 	      local copy of a CIB in the running cluster, edit it,
 	      validate it
 	      using <strong class="inline-command">crm_verify</strong> , then
 	      put the new configuration into effect using
 	       <strong class="inline-command">cibadmin</strong>
 	     . See <a href="crm_verify.8.html" title="crm_verify">
 	       <span class="refentrytitle">crm_verify</span>(8)</a>
 	     for a detailed introduction to this tool's usage and
 	     command syntax.
 	   </p>
 	 </dd>
 	 <dt>
 	   <span class="term">Managing Resource Configurations</span>
 	 </dt>
 	 <dd>
 	   <p>The <strong class="inline-command">crm_resource</strong>
 	      command performs various resource-related actions on the
 	      cluster. It lets you modify the definition of configured
 	      resources, start and stop resources, or delete and
 	      migrate resources between
 	      nodes. See <a href="crm_resource.8.html"
 	      title="crm_resource">
 	       <span class="refentrytitle">crm_resource</span>(8)</a>
 	     for a detailed introduction to this tool's usage and
 	     command syntax.</p>
 	 </dd>
 	 <dt>
 	   <span class="term">Managing Resource Fail Counts</span>
 	 </dt>
 	 <dd>
 	   <p>The <strong class="inline-command">crm_failcount</strong>
 	      command queries the number of failures per resource on a
 	      given node. This tool can also be used to reset the
 	      failcount, allowing the resource to again run on nodes
 	      where it had failed too often.
 	      See <a href="crm_failcount.8.html"
 	      title="crm_failcount">
 	       <span class="refentrytitle">crm_failcount</span>(8)</a>
 	     for a detailed introduction to this tool's usage and
 	     command syntax.</p>
 	 </dd>
 	 <dt>
 	   <span class="term">Generate and Retrieve Node UUIDs</span>
 	 </dt>
 	 <dd>
 	   <p>UUIDs are used to identify cluster nodes to ensure that
 	     they can always be uniquely identified. The command
 	       <strong class="inline-command">crm_uuid</strong> displays the
 	     UUID of the node on which it is run. In very rare
 	     circumstances, it may be necessary to set a node's UUID
 	     to a known value.  This can also be achieved with
 	       <strong class="inline-command">crm_uuid</strong> , but you
 	     should use this command with extreme caution. For more
 	     information, refer to <a href="crm_uuid.8.html"
 	     title="crm_uuid">
 	       <span class="refentrytitle">crm_uuid</span>(8)</a>.</p>
 	 </dd>
 	 <dt>
 	   <span class="term">Managing a Node's Standby Status</span>
 	 </dt>
 	 <dd>
 	   <p>The <strong class="inline-command">crm_standby</strong> command
 	     can manipulate a node's standby attribute. Any node in
 	     standby mode is no longer eligible to host resources and
 	     any resources that are there must be moved.  Standby mode
 	     can be useful for performing maintenance tasks, such as
 	     kernel updates. Remove the standby attribute from the
 	     node as it should become a fully active member of the
 	     cluster again. See <a href="crm_standby.8.html"
 	     title="crm_standby">
 	       <span class="refentrytitle">crm_standby</span>(8)</a>
 	     for a detailed introduction to this tool's usage and
 	     command syntax.
 	   </p>
 	 </dd>
        </dl>
      </div>
      </section>	
diff --git a/src/polls/index.html b/src/polls/index.html
index a245d20..4a83c92 100644
--- a/src/polls/index.html
+++ b/src/polls/index.html
@@ -1,42 +1,42 @@
 ---
 layout: pacemaker
-title: ClusterLabs - Polls
+title: Polls
 ---
 	<section id="main">
 
 	  <h1>Polls</h1>
 	  <p>
 	    <!-- http://poll.fm/4ar85 -->
 	    <table>
 	      <tr>
 		<td>
 		  <script type="text/javascript" charset="utf-8" src="http://static.polldaddy.com/p/7220309.js"></script>
 		  <noscript><a href="http://polldaddy.com/poll/7220309/">How important is support for redundant fencing devices?</a></noscript>
 		</td>
 		<td>
 		  <script type="text/javascript" charset="utf-8" src="http://static.polldaddy.com/p/1866622.js"></script>
 		  <noscript><a href="http://polldaddy.com/poll/1866622/">What sized clusters do you have?</a></noscript>
 		</td>
 		<td>
 		  <script type="text/javascript" charset="utf-8" src="http://static.polldaddy.com/p/4074807.js"></script>
 		  <noscript><a href="http://polldaddy.com/poll/4074807/">Which Distribution do you use for Pacemaker?</a></noscript>
 		</td>
 	      </tr>
 	    </table>
 	  </p>
 
 	  <h1>Surveys</h1>
 	  <p>
 	    <script type="text/javascript" src="http://i0.poll.fm/survey.js" charset="UTF-8"></script>
 	    <noscript><a href="http://polldaddy.com/s/rhel-versions">RHEL Version Survey</a></noscript>
 	    <script type="text/javascript">
 	      polldaddy.add( {
 	      type: 'button',
 	      title: 'RHEL Version Survey!',
 	      style: 'inline',
 	      id: '2C6035B0C2C00CF1'
 	      } );
 	    </script>
 	  </p>
 
 	</section>