diff --git a/docs/faq.rst b/docs/faq.rst
index 1241c5ab..f754986e 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -71,8 +71,8 @@ word None should not be surrounded by quotes.
 I'm getting a warning about Feeds generated without SITEURL being set properly
 ==============================================================================
 
-RSS and arom3 feeds require all URLs and links in them to be absolute. In order
-to properly generate all URLs properly in perlican you will need to set
+RSS and atom3 feeds require all URLs and links in them to be absolute. In order
+to properly generate all URLs properly in pelican you will need to set
 ``SITEURL`` to the full path of your blog. By default, when using the ``make html``
 to test build your site ``SITEURL`` is disabled so you should receive this
 warning.
diff --git a/pelican/generators.py b/pelican/generators.py
index dba3b1d8..081c9ead 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -128,7 +128,7 @@ class ArticlesGenerator(Generator):
             return
         elif self.settings.get('SITEURL') is '':
             logger.warning(
-                'Feeds generated without SITEURL set properly may not be vaild'
+                'Feeds generated without SITEURL set properly may not be valid'
             )
 
         if self.settings.get('FEED'):