Merge branch '0.8.x' of gitorious.org:statusnet/mainline into 0.8.x
This commit is contained in:
commit
0b4b8079d8
@ -305,7 +305,7 @@ function showLibs()
|
|||||||
}
|
}
|
||||||
echo<<<E_O_T
|
echo<<<E_O_T
|
||||||
<div class="instructions">
|
<div class="instructions">
|
||||||
<p>Laconica comes bundled with a number of libraries required for the application to work. However, it is best that you use PEAR or you distribution to manage
|
<p>StatusNet comes bundled with a number of libraries required for the application to work. However, it is best that you use PEAR or you distribution to manage
|
||||||
libraries instead, as they tend to provide security updates faster, and may offer improved performance.</p>
|
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 "aptitude", "apt-get", and "synaptic") to install the package listed.</p>
|
<p>On Debian based distributions, such as Ubuntu, use a package manager (such as "aptitude", "apt-get", and "synaptic") 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 "yum", "apt-rpm", and "up2date") 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 "yum", "apt-rpm", and "up2date") to install the package listed.</p>
|
||||||
@ -318,7 +318,7 @@ E_O_T;
|
|||||||
{
|
{
|
||||||
echo '<li>';
|
echo '<li>';
|
||||||
if(isset($library['url'])){
|
if(isset($library['url'])){
|
||||||
echo '<a href=">'.$library['url'].'">'.htmlentities($library['name']).'</a>';
|
echo '<a href="'.$library['url'].'">'.htmlentities($library['name']).'</a>';
|
||||||
}else{
|
}else{
|
||||||
echo htmlentities($library['name']);
|
echo htmlentities($library['name']);
|
||||||
}
|
}
|
||||||
@ -343,7 +343,7 @@ E_O_T;
|
|||||||
{
|
{
|
||||||
echo '<li>';
|
echo '<li>';
|
||||||
if(isset($library['url'])){
|
if(isset($library['url'])){
|
||||||
echo '<a href=">'.$library['url'].'">'.htmlentities($library['name']).'</a>';
|
echo '<a href="'.$library['url'].'">'.htmlentities($library['name']).'</a>';
|
||||||
}else{
|
}else{
|
||||||
echo htmlentities($library['name']);
|
echo htmlentities($library['name']);
|
||||||
}
|
}
|
||||||
@ -365,7 +365,7 @@ function showForm()
|
|||||||
<dd>
|
<dd>
|
||||||
<div class="instructions">
|
<div class="instructions">
|
||||||
<p>Enter your database connection information below to initialize the database.</p>
|
<p>Enter your database connection information below to initialize the database.</p>
|
||||||
<p>Laconica bundles a number of libraries for ease of installation. <a href="?checklibs=true">You can see what bundled libraries you are using, versus what libraries are installed on your server.</a>
|
<p>StatusNet bundles a number of libraries for ease of installation. <a href="?checklibs=true">You can see what bundled libraries you are using, versus what libraries are installed on your server.</a>
|
||||||
</div>
|
</div>
|
||||||
</dd>
|
</dd>
|
||||||
</dl>
|
</dl>
|
||||||
|
Loading…
Reference in New Issue
Block a user