variables.php: remove lbProjectName and lbProjectNameCapitalized

5 files changed, 33 insertions, 44 deletions

diff --git a/site/download/index.php b/site/download/index.php
index f0fb84b..d3fd58f 100644
--- a/site/download/index.php
+++ b/site/download/index.php
@@ -29,7 +29,7 @@
 
 	<link rel="stylesheet" type="text/css" href="../css/main.css" />
 
-	<title>Download <?php echo $lbProjectName; ?></title>
+	<title>Download libreboot</title>
 
 </head>
 
@@ -39,7 +39,7 @@
 
 		<div id="libreboot" class="section intro">
 				
-			<h1>Download <?php echo $lbProjectName; ?></h1>
+			<h1>Download libreboot</h1>
 
 				<p>Links to HTTP mirrors, rsync mirrors and git repositories. Download libreboot here.</p>
 
@@ -99,7 +99,7 @@
 				</p>
 
 				<p>
-					Download <?php echo $lbProjectName; ?> from one of these mirrors.
+					Download libreboot from one of these mirrors.
 				</p>
 				
 				<p>
@@ -120,9 +120,9 @@
 ?>
 				
 
-				<h2 id="mirror">Rsync mirrors (for mirroring <?php echo $lbProjectName; ?>)</h2>
+				<h2 id="mirror">Rsync mirrors (for mirroring libreboot)</h2>
 					<p>
-						Create a directory in your web server document root (e.g. <?php echo $lbProjectName; ?>/),
+						Create a directory in your web server document root (e.g. libreboot/),
 						and add one of these to your crontab:
 					</p>
 <?php
@@ -131,7 +131,7 @@
 ?>
 					<h3>Main rsync mirror:</h3>
 						<p>
-							$ <b>rsync -avxP --delete --stats <?php echo $lbRsyncServer[0]; ?> /path/to/docroot/<?php echo $lbProjectName; ?>/</b>
+							$ <b>rsync -avxP --delete --stats <?php echo $lbRsyncServer[0]; ?> /path/to/docroot/libreboot/</b>
 						</p>
 <?php
 		if(count($lbRsyncServer)>1) {
@@ -141,7 +141,7 @@
 <?php
 			for ($server=1; $server<count($lbRsyncServer); $server++) {
 ?>
-							$ <b>rsync -avxP --delete --stats <?php echo $lbRsyncServer[$server]; ?> /path/to/docroot/<?php echo $lbProjectName; ?>/</b><br/>
+							$ <b>rsync -avxP --delete --stats <?php echo $lbRsyncServer[$server]; ?> /path/to/docroot/libreboot/</b><br/>
 <?php
 			}
 ?>
@@ -158,7 +158,7 @@
 ?>
 
 					<p>
-						Are you running a mirror? Contact the <?php echo $lbProjectName; ?> project
+						Are you running a mirror? Contact the libreboot project
 						(details are on the <a href="../">home page</a>), and the link will be added here.
 					</p>
 	
@@ -169,12 +169,12 @@
 			<h1>Git repositories (development)</h1>
 			
 				<p>
-					The git repositories are intended for developing <?php echo $lbProjectName; ?>.
-					For a list of current tasks in <?php echo $lbProjectName; ?>, see <a href="../docs/tasks.html">../docs/tasks.html</a>.
+					The git repositories are intended for developing libreboot.
+					For a list of current tasks in libreboot, see <a href="../docs/tasks.html">../docs/tasks.html</a>.
 				</p>
 				
 				<p>
-					Maintenance guides for <?php echo $lbProjectName; ?></php></php> can be found at
+					Maintenance guides for libreboot</php></php> can be found at
 					<a href="../docs/maintain/index.html">../docs/maintain/index.html</a>
 					and <a href="../docs/git/index.html">../docs/git/index.html</a>.
 				</p>
@@ -197,7 +197,7 @@
 						<li><a href="http://projects.mtjm.eu/projects/libreboot">Bug tracker</a></li>
 					</ul>
 					
-				<h2 id="contrib">Submitting patches to <?php echo $lbProjectName; ?></h3>
+				<h2 id="contrib">Submitting patches to libreboot</h3>
 					<p>
 						The <a href="http://git-scm.com/doc">git documentation</a> describes how to use git.
 					</p>
@@ -242,7 +242,7 @@
 						</p>
 						<p>
 							<i>
-								The <?php echo $lbProjectName; ?> project will not accept
+								The libreboot project will not accept
 								documentation released under the <u>GNU Free Documentation License</u>, because we do not want to endorse
 								or support the Invariant clauses that this license allows. Changes submitted under this
 								license will be rejected, even if it contains no Invariant sections
@@ -280,16 +280,16 @@
 					<h3>Method 1: host a repository</h3>
 						<p>
 							One way of contribiting a patch for review is to host a repository containing your modified branch. 
-							Give the checkout details to the <?php echo $lbProjectName; ?> project, along with information
+							Give the checkout details to the libreboot project, along with information
 							on which commits in what branch contain your changes.
-							Contact the <?php echo $lbProjectName; ?> project using the details on the <a href="../">home page</a>.
+							Contact the libreboot project using the details on the <a href="../">home page</a>.
 						</p>
 					<h3>Method 2: git format-patch -N</h3>
 						<p>
 							Use this method (replace N with the number of commits that you made) and send the .patch files to the
-							<?php echo $lbProjectName; ?> project, along with details on what branch and revision these were
+							libreboot project, along with details on what branch and revision these were
 							made on top of.
-							Contact the <?php echo $lbProjectName; ?> project using the details on the <a href="../">home page</a>.
+							Contact the libreboot project using the details on the <a href="../">home page</a>.
 						</p>
 					
 				<h2 id="gitbackup">Backup repositories</h2>
@@ -310,7 +310,7 @@
 ?>
 						</p>
 
-					<h3><?php echo $lbProjectNameCapitalized; ?> website</h3>
+					<h3>Libreboot website</h3>
 						<p>
 <?php
 	for ($server=0; $server<count($lbWebsiteBackupGitRepoAddress); $server++) {
diff --git a/site/github/index.php b/site/github/index.php
index bc6ce54..560aac7 100644
--- a/site/github/index.php
+++ b/site/github/index.php
@@ -41,8 +41,8 @@
 			<h1>Please do not use GitHub!</h1>
 
 			<p>
-				Please do not use GitHub to host <?php echo $lbProjectName; ?>. 
-				<?php echo $lbProjectNameCapitalized; ?> is a free software project, so this is only a request, and not a restriction on the software.
+				Please do not use GitHub to host libreboot. 
+				Libreboot is a free software project, so this is only a request, and not a restriction on the software.
 			</p>
 			
 			<p>
@@ -89,13 +89,13 @@
 			</p>
 				
 			<p>
-				By contrast, the <?php echo $lbProjectName; ?> project adheres strictly to the goals of the Free Software movement, which
+				By contrast, the libreboot project adheres strictly to the goals of the Free Software movement, which
 				seeks to eliminate proprietary software to the point where all software is free.
 			</p>
 
 			<p>
 				The opinions expressed by Tom Preston-Werner of GitHub are incompatible with those of 
-				the <?php echo $lbProjectName; ?> project. Users and developers of 
+				the libreboot project. Users and developers of 
 				<em><a href="http://www.gnu.org/philosophy/free-sw.html">free software</a></em>
 				are strongly advised not to use GitHub, for any of their projects. 
 			</p>
diff --git a/site/gitorious/index.php b/site/gitorious/index.php
index c2651d1..f5d337b 100644
--- a/site/gitorious/index.php
+++ b/site/gitorious/index.php
@@ -41,8 +41,8 @@
 			<h1>Please do not use Gitorious or GitLab!</h1>
 
 			<p>
-				Please do not use Gitorious or GitLab to host <?php echo $lbProjectName; ?>. 
-				<?php echo $lbProjectNameCapitalized; ?> is a free software project, so this is only a request, and not a restriction on the software.
+				Please do not use Gitorious or GitLab to host libreboot. 
+				Libreboot is a free software project, so this is only a request, and not a restriction on the software.
 			</p>
 			
 			<p>
@@ -93,13 +93,13 @@
 			</p>
 				
 			<p>
-				By contrast, the <?php echo $lbProjectName; ?> project adheres strictly to the goals of the Free Software movement, which
+				By contrast, the libreboot project adheres strictly to the goals of the Free Software movement, which
 				seeks to eliminate proprietary software to the point where all software is free.
 			</p>
 
 			<p>
 				The proprietary developments in GitLab are unacceptable to
-				the <?php echo $lbProjectName; ?> project. Users and developers of 
+				the libreboot project. Users and developers of 
 				<em><a href="http://www.gnu.org/philosophy/free-sw.html">free software</a></em>
 				are strongly advised not to use GitLab or Gitorious, for any of their projects. 
 			</p>
diff --git a/site/index.php b/site/index.php
index 36af89c..0472174 100644
--- a/site/index.php
+++ b/site/index.php
@@ -28,7 +28,7 @@
 
 	<link rel="stylesheet" type="text/css" href="css/main.css" />
 
-	<title><?php echo $lbProjectNameCapitalized; ?> project</title>
+	<title>Libreboot project</title>
 
 </head>
 
@@ -40,22 +40,22 @@
 				<p>
 					<img src="logo/logo-small.jpg" alt="" title="<?php include "logo/license.txt"; ?>" />
 				</p>
-			<h1><?php echo $lbProjectNameCapitalized; ?> project</h1>
+			<h1>Libreboot project</h1>
 				<p>
-					<?php echo $lbProjectNameCapitalized; ?> is a <a href="https://www.fsf.org/about/what-is-free-software">free</a> (libre)
+					Libreboot is a <a href="https://www.fsf.org/about/what-is-free-software">free</a> (libre)
 					BIOS/UEFI replacement for your computer. Based on <a href="http://coreboot.org/">coreboot</a>, the aim is to distribute
 					low-level boot firmware that is 100% free software, and to make coreboot easy to use.
 				</p>
 				<ul class="ulnav">
-					<li><a href="docs/index.html#why">Why should I use <?php echo $lbProjectName; ?>?</a></li>
+					<li><a href="docs/index.html#why">Why should I use libreboot?</a></li>
 					<li><a href="download/#git">How to contribute</a></li>
 					<li><a href="docs/tasks.html">List of tasks</a></li>
-					<li><a href="download/#mirror">Mirroring <?php echo $lbProjectName; ?></a></li>
+					<li><a href="download/#mirror">Mirroring libreboot</a></li>
 				</ul>
 		</div>
 		
 		<div class="section">
-			<h1>Download <?php echo $lbProjectName; ?></h1>
+			<h1>Download libreboot</h1>
 				<ul class="ulnav">
 					<li><a href="git/rom">ROM images</a></li>
 					<li><a href="git/libreboot_util.tar.xz">Utilities</a></li>
@@ -83,7 +83,7 @@
 				<ul class="ulnav">					
 					<li><a href="docs/index.html">Documentation</a></li>
 					<li><a href="docs/hcl/index.html#supported_list">List of supported systems</a></li>
-					<li><a href="docs/install/index.html">How to install <?php echo $lbProjectName; ?></a></li>
+					<li><a href="docs/install/index.html">How to install libreboot</a></li>
 					<li><a href="docs/gnulinux/index.html">How to install GNU/Linux</a></li>
 				</ul>
 			<h2>Contact information</h2>
diff --git a/site/variables.php b/site/variables.php
index 5726e1d..a78b74e 100644
--- a/site/variables.php
+++ b/site/variables.php
@@ -18,17 +18,6 @@
 */
 ?>
 <?php
-	/* Copy this to variables.php, and adapt for your needs */
-
-	/* Project name
-	 * NOTE: Not all parts of the site use this, because
-	 *       parts of the site talking about things that are very
-	 *       specific to the libreboot project. Changing these
-	 *       variables is only the first step.
-	 */
-	$lbProjectName = "libreboot"; /* use all lower-case */
-	$lbProjectNameCapitalized = "Libreboot"; /* Capitalized */
-
 	/* Project home page */
 	$lbHomepage = "http://libreboot.org/";