diff --git a/init/completions/apropos.fish b/init/completions/apropos.fish
index e0332dbc1..18c3ab57a 100644
--- a/init/completions/apropos.fish
+++ b/init/completions/apropos.fish
@@ -12,7 +12,7 @@ complete -c apropos -s h -l help -d (_ "Display help and exit")
 complete -f -c apropos -s d -l debug -d (_ "Print debugging info")
 complete -f -c apropos -s v -l verbose -d (_ "Verbose mode")
 complete -f -c apropos -s r -l regex -d (_ "Keyword as regex")
-complete -f -c apropos -s w -l wildcard -d (_ "Keyword as wildwards")
+complete -f -c apropos -s w -l wildcard -d (_ "Keyword as wildcards")
 complete -f -c apropos -s e -l exact -d (_ "Keyword as exactly match")
 complete -x -c apropos -s m -l system -d (_ "Search for other system")
 complete -x -c apropos -s M -l manpath -a '(echo $MANPATH)' -d (_ "Specify man path")
diff --git a/parser.c b/parser.c
index 878e17cc2..4cd9b3930 100644
--- a/parser.c
+++ b/parser.c
@@ -71,9 +71,9 @@ The fish parser. Contains functions for parsing code.
 #define TOK_ERR_MSG _( L"Tokenizer error: '%ls'")
 
 /**
-   Error message for short circut command error.
+   Error message for short circuit command error.
 */
-#define COND_ERR_MSG _( L"Short circut command requires additional command")
+#define COND_ERR_MSG _( L"Short circuit command requires additional command")
 
 /**
    Error message on reaching maximum recusrion depth
@@ -2554,7 +2554,7 @@ int parser_test( wchar_t * buff,
 					}
 
 					/*
-					  The short circut commands requires _two_ additional commands.
+					  The short circuit commands requires _two_ additional commands.
 					*/
 					if( contains_str( tok_last( &tok ),
 									  L"or",