fixed typos

diff --git a/CHANGELOG b/CHANGELOG
index dbd1c96..fcbd919 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,7 +14,7 @@
 
  * fixed a regression when dealing with SimpleXMLElement instances in templates
  * fixed "is_safe" value for the "dump" function when "html_errors" is not defined in php.ini
- * switched to use mbstring whenever possible instead of iconv (you might need to update your encoding as mstring and iconv encoding names sometimes differ)
+ * switched to use mbstring whenever possible instead of iconv (you might need to update your encoding as mbstring and iconv encoding names sometimes differ)
 
 * 1.8.0 (2012-05-08)
 

diff --git a/doc/templates.rst b/doc/templates.rst
index e488ecc..278e56d 100644 (file)
--- a/doc/templates.rst
+++ b/doc/templates.rst
@@ -274,7 +274,7 @@ Sounds complicated but is very basic. It's easier to understand it by
 starting with an example.
 
 Let's define a base template, ``base.html``, which defines a simple HTML
-skeleton document that you might use for a simple two-columns page:
+skeleton document that you might use for a simple two-column page:
 
 .. code-block:: html+jinja