Skip to content

Commit

Permalink
Merge branch 'hotfix-default-app-updates' into release-1.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Josh Lockhart committed Feb 11, 2012
2 parents a012c49 + 8893f82 commit 314e1c8
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions index.php
Expand Up @@ -42,7 +42,7 @@
<html>
<head>
<meta charset="utf-8"/>
<title>Slim Micro PHP 5 Framework</title>
<title>Slim Framework for PHP 5</title>
<style>
html,body,div,span,object,iframe,
h1,h2,h3,h4,h5,h6,p,blockquote,pre,
Expand Down Expand Up @@ -106,10 +106,10 @@
<section>
<h2>Slim Framework Community</h2>
<h3>Support Forum</h3>
<h3>Support Forum and Knowledge Base</h3>
<p>
Join the <a href="http://forum.slimframework.com" target="_blank">Slim Framework forum</a>
to read announcements, chat with fellow Slim users, ask questions, help others, or show off your cool
Visit the <a href="http://help.slimframework.com" target="_blank">Slim support forum and knowledge base</a>
to read announcements, chat with fellow Slim users, ask questions, help others, or show off your cool
Slim Framework apps.
</p>
Expand All @@ -121,7 +121,7 @@
<h3>IRC</h3>
<p>
Find Josh Lockhart in the "##slim" chat room during the day. Say hi, ask questions,
Find Josh Lockhart in the irc.freenode.net "##slim" IRC channel during the day. Say hi, ask questions,
or just hang out with fellow Slim users.
</p>
</section>
Expand Down Expand Up @@ -160,4 +160,4 @@
* This method should be called last. This is responsible for executing
* the Slim application using the settings and routes defined above.
*/
$app->run();
$app->run();

0 comments on commit 314e1c8

Please sign in to comment.