Merge branch 'master' into powerpencil

2 files changed, 3 insertions, 3 deletions

diff --git a/src/io/base64stream.cpp b/src/io/base64stream.cpp
index 28c819347..c0c5e1a02 100644
--- a/src/io/base64stream.cpp
+++ b/src/io/base64stream.cpp
@@ -268,7 +268,7 @@ void Base64OutputStream::flush()
 {
     if (closed)
         return;
-    //dont flush here.  do it on close()    
+    //don't flush here.  do it on close()    
     destination.flush();
 }
 
diff --git a/src/io/resource.cpp b/src/io/resource.cpp
index 3f970dfa1..13da37d7a 100644
--- a/src/io/resource.cpp
+++ b/src/io/resource.cpp
@@ -134,7 +134,7 @@ Glib::ustring get_path_ustring(Domain domain, Type type, char const *filename)
 }
 
 /*
- * Same as get_path, but checks for file's existance and falls back
+ * Same as get_path, but checks for file's existence and falls back
  * from USER to SYSTEM modes.
  *
  *  type - The type of file to get, such as extension, template, ui etc
@@ -214,7 +214,7 @@ Glib::ustring get_filename(Glib::ustring path, Glib::ustring filename)
  *  domain - Optional domain (overload), will check return domains if not.
  *  type - The type of files, e.g. TEMPLATES
  *  path - Instead of Domain and Type, specify the path to get the files from.
- *  extentions - A list of extensions to return, e.g. xml, svg
+ *  extensions - A list of extensions to return, e.g. xml, svg
  *  exclusions - A list of names to exclude e.g. default.xml
  */
 std::vector<Glib::ustring> get_filenames(Type type, std::vector<const char *> extensions, std::vector<const char *> exclusions)