diff --git a/.gitignore b/.gitignore
index d2cff7ca9..c0d51835a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 cscope.*
 *.swp
 *.patch
+*~
 .project
 .cproject
 
diff --git a/docs/porting-guide.md b/docs/porting-guide.md
index 1247baf59..aa014f159 100644
--- a/docs/porting-guide.md
+++ b/docs/porting-guide.md
@@ -558,7 +558,7 @@ reset vector code to perform the above tasks.
     Argument : void
     Return   : uintptr_t
 
-This function is called with the called with the MMU and caches disabled
+This function is called with the MMU and caches disabled
 (`SCTLR_EL3.M` = 0 and `SCTLR_EL3.C` = 0). The function is responsible for
 distinguishing between a warm and cold reset for the current CPU using
 platform-specific means. If it's a warm reset, then it returns the warm
diff --git a/plat/common/aarch64/platform_helpers.S b/plat/common/aarch64/platform_helpers.S
index a134ded02..68bda2233 100644
--- a/plat/common/aarch64/platform_helpers.S
+++ b/plat/common/aarch64/platform_helpers.S
@@ -98,7 +98,7 @@ endfunc plat_crash_console_putc
 
 	/* -----------------------------------------------------
 	 * Placeholder function which should be redefined by
-	 * each platform. This function should preserve x10.
+	 * each platform. This function should preserve x19 - x29.
 	 * -----------------------------------------------------
 	 */
 func plat_reset_handler