From 4b9c62980599228f070b401c7673dce8085b0c61 Mon Sep 17 00:00:00 2001
From: Derek Jones
Date: Fri, 1 Jul 2011 17:40:48 -0500
Subject: backed out 648b42a75739, which was a NON-trivial whitespace commit.
It broke the Typography class's string replacements, for instance
---
user_guide/helpers/language_helper.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'user_guide/helpers/language_helper.html')
diff --git a/user_guide/helpers/language_helper.html b/user_guide/helpers/language_helper.html
index e10733baf..3b3b87da9 100644
--- a/user_guide/helpers/language_helper.html
+++ b/user_guide/helpers/language_helper.html
@@ -73,7 +73,7 @@ Language Helper
This function returns a line of text from a loaded language file with simplified syntax
that may be more desirable for view files than calling $this->lang->line().
- The optional second parameter will also output a form label for you. Example:
+ The optional second parameter will also output a form label for you. Example:
echo lang('language_key', 'form_item_id');
// becomes <label for="form_item_id">language_key</label>
--
cgit v1.2.3-24-g4f1b
From b8c038a3e7742f32915d7f1ab69627075e8d0c39 Mon Sep 17 00:00:00 2001
From: Derek Jones
Date: Sat, 20 Aug 2011 08:57:14 -0500
Subject: updated version number in user guide, removed some stray merge
markers found in the change log
---
user_guide/helpers/language_helper.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'user_guide/helpers/language_helper.html')
diff --git a/user_guide/helpers/language_helper.html b/user_guide/helpers/language_helper.html
index 3b3b87da9..1102d7a3c 100644
--- a/user_guide/helpers/language_helper.html
+++ b/user_guide/helpers/language_helper.html
@@ -28,7 +28,7 @@