summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoël Cox <joel@joelcox.nl>2011-08-23 14:54:42 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-10-27 00:43:45 +0200
commitb430ecd00aaa80c63734b508c82501bec3a0b703 (patch)
treeba68b391890b86e487c44ecc628d5e4be314f0ee
parentf27bcf350d18048d91d8a607520d19f0c8e11f41 (diff)
Bumped the version number, corrected spelling mistakes (thanks @chrisberthe) and added links to the tutorial pages in the introduction.
-rw-r--r--user_guide/tutorial/conclusion.html4
-rw-r--r--user_guide/tutorial/create_news_items.html6
-rw-r--r--user_guide/tutorial/introduction.html17
-rw-r--r--user_guide/tutorial/news_section.html4
-rw-r--r--user_guide/tutorial/static_pages.html2
5 files changed, 21 insertions, 12 deletions
diff --git a/user_guide/tutorial/conclusion.html b/user_guide/tutorial/conclusion.html
index f0a22956d..f3bdaad1d 100644
--- a/user_guide/tutorial/conclusion.html
+++ b/user_guide/tutorial/conclusion.html
@@ -28,7 +28,7 @@
<div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>CodeIgniter User Guide Version 2.0.2</h1></td>
+<td><h1>CodeIgniter User Guide Version 2.0.3</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>
</tr>
</table>
@@ -43,7 +43,7 @@
<a href="http://codeigniter.com/">CodeIgniter Home</a> &nbsp;&#8250;&nbsp;
<a href="../index.html">User Guide Home</a> &nbsp;&#8250;&nbsp;
<a href="introduction.html">Tutorial</a> &nbsp;&#8250;&nbsp;
-Features
+Conclusion
</td>
<td id="searchbox"><form method="get" action="http://www.google.com/search"><input type="hidden" name="as_sitesearch" id="as_sitesearch" value="codeigniter.com/user_guide/" />Search User Guide&nbsp; <input type="text" class="input" style="width:200px;" name="q" id="q" size="31" maxlength="255" value="" />&nbsp;<input type="submit" class="submit" name="sa" value="Go" /></form></td>
</tr>
diff --git a/user_guide/tutorial/create_news_items.html b/user_guide/tutorial/create_news_items.html
index 66cfc6fdd..a25917930 100644
--- a/user_guide/tutorial/create_news_items.html
+++ b/user_guide/tutorial/create_news_items.html
@@ -28,7 +28,7 @@
<div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>CodeIgniter User Guide Version 2.0.2</h1></td>
+<td><h1>CodeIgniter User Guide Version 2.0.3</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>
</tr>
</table>
@@ -85,7 +85,7 @@ Create news items
<p>There are only two things here that probably look unfamiliar to you: the <dfn>form_open()</dfn> function and the <dfn>validation_errors()</dfn> function.</p>
-<p>The first function is provided by the <a href="../helpers/form_helper.html">form helper</a> and renders the form element and adds extra functionality, like adding a hidden <a href="../ibraries/security.html">CSFR prevention field</a>. The latter is used to report errors related to from validation.</p>
+<p>The first function is provided by the <a href="../helpers/form_helper.html">form helper</a> and renders the form element and adds extra functionality, like adding a hidden <a href="../libraries/security.html">CSFR prevention field</a>. The latter is used to report errors related to form validation.</p>
<p>Go back to your news controller. You're going to do two things here, check whether the form was submitted and whether the submitted data passed the validation rules. You'll use the <a href="../libraries/form_validation.html">form validation</a> library to do this.</p>
@@ -150,7 +150,7 @@ function set_news()
<h2>Routing</h2>
-<p>Before you can start adding news items into your CodeIgniter application you have to add an extra rule to <dfn>config/routes.php</dfn> file. Make sure your file contains the following. This makes sure CodeIgniter sees 'update' as a method instead of a news item's slug.</p>
+<p>Before you can start adding news items into your CodeIgniter application you have to add an extra rule to <dfn>config/routes.php</dfn> file. Make sure your file contains the following. This makes sure CodeIgniter sees 'create' as a method instead of a news item's slug.</p>
<pre>
$route['news/create'] = 'news/create';
diff --git a/user_guide/tutorial/introduction.html b/user_guide/tutorial/introduction.html
index cb91f4856..78fd00b61 100644
--- a/user_guide/tutorial/introduction.html
+++ b/user_guide/tutorial/introduction.html
@@ -28,7 +28,7 @@
<div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>CodeIgniter User Guide Version 2.0.2</h1></td>
+<td><h1>CodeIgniter User Guide Version 2.0.3</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>
</tr>
</table>
@@ -59,9 +59,7 @@ Introduction
<h1>Tutorial &minus; Introduction</h1>
-<p>This tutorial is intended to introduce you to the CodeIgniter framework and the basic principles of MVC architecture.
- It will show you how a basic CodeIgniter application is constructed in step-by-step fashion.
-</p>
+<p>This tutorial is intended to introduce you to the CodeIgniter framework and the basic principles of MVC architecture. It will show you how a basic CodeIgniter application is constructed in step-by-step fashion.</p>
<p>In this tutorial, you will be creating a <strong>basic news application</strong>. You will begin by writing the code that can load static pages. Next, you will create a news section that reads news items from a database. Finally, you'll add a form to create news items in the database.</p>
@@ -73,6 +71,17 @@ Introduction
<li>Performing basic database queries using &quot;Active Record&quot;</li>
</ul>
+<p>The entire tutorial is split up over several pages, each explaining a small part of the functionality of the CodeIgniter framework. You'll go through the following pages:</p>
+<ul>
+<li>Introduction, this page, which gives you an overview of what to expect.</li>
+<li><a href="static_pages.html">Static pages</a>, which will teach you the basics of controllers, views and routing.</li>
+<li><a href="news_section.html">News section</a>, where you'll start using models and will be doing some basic database operations.</li>
+<li><a href="create_news_items.html">Create news items</a>, which will introduce more advanced database operations and form validation.</li>
+<li><a href="conclusion.html">Conclusion</a>, which will give you some pointers on further reading and other resources.</li>
+</ul>
+
+<p>Enjoy your exploration of the CodeIgniter framework.</p>
+
</div>
<!-- END CONTENT -->
diff --git a/user_guide/tutorial/news_section.html b/user_guide/tutorial/news_section.html
index d0f64e0c9..8d8899968 100644
--- a/user_guide/tutorial/news_section.html
+++ b/user_guide/tutorial/news_section.html
@@ -28,7 +28,7 @@
<div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>CodeIgniter User Guide Version 2.0.2</h1></td>
+<td><h1>CodeIgniter User Guide Version 2.0.3</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>
</tr>
</table>
@@ -94,7 +94,7 @@ CREATE TABLE news (
);
</pre>
-<p>Now that the database and a model have been set up, you'll need a method to get all of our posts from our database. To do this, the database abstraction layer that is included with CodeIgniter — <a href="../database/active_record.html">ActiveRecord</a> — is used. This makes it possible to write your 'queries' once and make them work on <a href="../general/requirements.html">all supported database systems</a>. Add the following code to your model.</p>
+<p>Now that the database and a model have been set up, you'll need a method to get all of our posts from our database. To do this, the database abstraction layer that is included with CodeIgniter — <a href="../database/active_record.html">Active Record</a> — is used. This makes it possible to write your 'queries' once and make them work on <a href="../general/requirements.html">all supported database systems</a>. Add the following code to your model.</p>
<pre>
function get_news($slug = FALSE)
diff --git a/user_guide/tutorial/static_pages.html b/user_guide/tutorial/static_pages.html
index 69e5b7446..d5eec43da 100644
--- a/user_guide/tutorial/static_pages.html
+++ b/user_guide/tutorial/static_pages.html
@@ -28,7 +28,7 @@
<div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>CodeIgniter User Guide Version 2.0.2</h1></td>
+<td><h1>CodeIgniter User Guide Version 2.0.3</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>
</tr>
</table>