From 4421ad07d7abf3d1f7e3ccc79a0e7f694ba0d30c Mon Sep 17 00:00:00 2001
From: Bo-Yi Wu <appleboy.tw@gmail.com>
Date: Tue, 29 Jan 2013 22:51:01 +0800
Subject: fixed #2207 user guide error

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
---
 user_guide_src/source/tutorial/news_section.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'user_guide_src/source/tutorial/news_section.rst')

diff --git a/user_guide_src/source/tutorial/news_section.rst b/user_guide_src/source/tutorial/news_section.rst
index b64ea2aae..833e34ead 100644
--- a/user_guide_src/source/tutorial/news_section.rst
+++ b/user_guide_src/source/tutorial/news_section.rst
@@ -68,7 +68,7 @@ following code to your model.
 			$query = $this->db->get('news');
 			return $query->result_array();
 		}
-        
+
 		$query = $this->db->get_where('news', array('slug' => $slug));
 		return $query->row_array();
 	}
@@ -146,7 +146,7 @@ and add the next piece of code.
 	<?php foreach ($news as $news_item): ?>
 
 		<h2><?php echo $news_item['title'] ?></h2>
-		<div id="main">
+		<div class="main">
 			<?php echo $news_item['text'] ?>
 		</div>
 		<p><a href="<?php echo $news_item['slug'] ?>">View article</a></p>
-- 
cgit v1.2.3-24-g4f1b


From 4796cebc4a2c2028134bd59257ddce4f1387c8ff Mon Sep 17 00:00:00 2001
From: Kevin Smith <kevin@gohearsay.com>
Date: Wed, 20 Feb 2013 14:20:54 -0600
Subject: Update user_guide_src/source/tutorial/news_section.rst

Clarified a part of the tutorial so it's obvious the code should be replaced/update rather than added.
---
 user_guide_src/source/tutorial/news_section.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'user_guide_src/source/tutorial/news_section.rst')

diff --git a/user_guide_src/source/tutorial/news_section.rst b/user_guide_src/source/tutorial/news_section.rst
index 833e34ead..d7754e9f3 100644
--- a/user_guide_src/source/tutorial/news_section.rst
+++ b/user_guide_src/source/tutorial/news_section.rst
@@ -162,7 +162,7 @@ The news overview page is now done, but a page to display individual
 news items is still absent. The model created earlier is made in such
 way that it can easily be used for this functionality. You only need to
 add some code to the controller and create a new view. Go back to the
-news controller and add the following lines to the file.
+news controller and update ``view()`` with the following:
 
 ::
 
@@ -211,4 +211,4 @@ a slug to the view method in the news controller.
 	$route['default_controller'] = 'pages/view';
 
 Point your browser to your document root, followed by index.php/news and
-watch your news page.
\ No newline at end of file
+watch your news page.
-- 
cgit v1.2.3-24-g4f1b