summaryrefslogtreecommitdiff
path: root/install.php
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2009-11-08 23:28:51 +0100
committerBrion Vibber <brion@pobox.com>2009-11-08 23:28:51 +0100
commitfc5002015b2a9e16a3c6b9992d55b45c73a8d2fb (patch)
tree15174fb81ee17b7d9117d009fd3cc5572168bf51 /install.php
parentec6a38a62786c85e8ee30c5726ea81f82465b39d (diff)
Revert "* [Cc]an't -> [Cc]annot"
This reverts commit 0ab17f382b9993ada3d12d4cdace72cca53fb545.
Diffstat (limited to 'install.php')
-rw-r--r--install.php16
1 files changed, 8 insertions, 8 deletions
diff --git a/install.php b/install.php
index 78a4b8763..e7f7cf318 100644
--- a/install.php
+++ b/install.php
@@ -391,7 +391,7 @@ function showLibs()
libraries instead, as they tend to provide security updates faster, and may offer improved performance.</p>
<p>On Debian based distributions, such as Ubuntu, use a package manager (such as &quot;aptitude&quot;, &quot;apt-get&quot;, and &quot;synaptic&quot;) to install the package listed.</p>
<p>On RPM based distributions, such as Red Hat, Fedora, CentOS, Scientific Linux, Yellow Dog Linux and Oracle Enterprise Linux, use a package manager (such as &quot;yum&quot;, &quot;apt-rpm&quot;, and &quot;up2date&quot;) to install the package listed.</p>
- <p>On servers without a package manager (such as Windows), or if the library is not packaged for your distribution, you can use PHP PEAR to install the library. Simply run &quot;pear install &lt;name&gt;&quot;.</p>
+ <p>On servers without a package manager (such as Windows), or if the library is not packaged for your distribution, you can use PHP's PEAR to install the library. Simply run &quot;pear install &lt;name&gt;&quot;.</p>
</div>
<h2>Absent Libraries</h2>
<ul id="absent_libraries">
@@ -570,7 +570,7 @@ STR;
$res = writeConf($sitename, $server, $path, $fancy, $db);
if (!$res) {
- updateStatus("Cannot write config file.", true);
+ updateStatus("Can't write config file.", true);
showForm();
return;
}
@@ -616,7 +616,7 @@ function Pgsql_Db_installer($host, $database, $username, $password)
$res = runDbScript(INSTALLDIR.'/db/statusnet_pg.sql', $conn, 'pgsql');
if ($res === false) {
- updateStatus("Cannot run database script.", true);
+ updateStatus("Can't run database script.", true);
showForm();
return false;
}
@@ -627,7 +627,7 @@ function Pgsql_Db_installer($host, $database, $username, $password)
updateStatus(sprintf("Adding %s data to database...", $name));
$res = runDbScript(INSTALLDIR.'/db/'.$scr.'.sql', $conn, 'pgsql');
if ($res === false) {
- updateStatus(sprintf("Cannot run %d script.", $name), true);
+ updateStatus(sprintf("Can't run %d script.", $name), true);
showForm();
return false;
}
@@ -652,21 +652,21 @@ function Mysql_Db_installer($host, $database, $username, $password)
$conn = mysql_connect($host, $username, $password);
if (!$conn) {
- updateStatus("Cannot connect to server '$host' as '$username'.", true);
+ updateStatus("Can't connect to server '$host' as '$username'.", true);
showForm();
return false;
}
updateStatus("Changing to database...");
$res = mysql_select_db($database, $conn);
if (!$res) {
- updateStatus("Cannot change to database.", true);
+ updateStatus("Can't change to database.", true);
showForm();
return false;
}
updateStatus("Running database script...");
$res = runDbScript(INSTALLDIR.'/db/statusnet.sql', $conn);
if ($res === false) {
- updateStatus("Cannot run database script.", true);
+ updateStatus("Can't run database script.", true);
showForm();
return false;
}
@@ -677,7 +677,7 @@ function Mysql_Db_installer($host, $database, $username, $password)
updateStatus(sprintf("Adding %s data to database...", $name));
$res = runDbScript(INSTALLDIR.'/db/'.$scr.'.sql', $conn);
if ($res === false) {
- updateStatus(sprintf("Cannot run %d script.", $name), true);
+ updateStatus(sprintf("Can't run %d script.", $name), true);
showForm();
return false;
}