diff --git a/builtin_complete.c b/builtin_complete.c
index 194533666..7f4e89750 100644
--- a/builtin_complete.c
+++ b/builtin_complete.c
@@ -122,7 +122,7 @@ static void builtin_complete_add( array_list_t *cmd,
array_list_t *gnu_opt,
array_list_t *old_opt,
int result_mode,
- int authorative,
+ int authoritative,
const wchar_t *condition,
const wchar_t *comp,
const wchar_t *desc,
@@ -143,11 +143,11 @@ static void builtin_complete_add( array_list_t *cmd,
desc,
flags );
- if( authorative != -1 )
+ if( authoritative != -1 )
{
- complete_set_authorative( al_get( cmd, i ),
+ complete_set_authoritative( al_get( cmd, i ),
COMMAND,
- authorative );
+ authoritative );
}
}
@@ -165,11 +165,11 @@ static void builtin_complete_add( array_list_t *cmd,
desc,
flags );
- if( authorative != -1 )
+ if( authoritative != -1 )
{
- complete_set_authorative( al_get( path, i ),
+ complete_set_authoritative( al_get( path, i ),
PATH,
- authorative );
+ authoritative );
}
}
@@ -294,7 +294,7 @@ static int builtin_complete( wchar_t **argv )
int argc=0;
int result_mode=SHARED;
int remove = 0;
- int authorative = -1;
+ int authoritative = -1;
int flags = COMPLETE_AUTO_SPACE;
string_buffer_t short_opt;
@@ -373,11 +373,11 @@ static int builtin_complete( wchar_t **argv )
}
,
{
- L"unauthorative", no_argument, 0, 'u'
+ L"unauthoritative", no_argument, 0, 'u'
}
,
{
- L"authorative", no_argument, 0, 'A'
+ L"authoritative", no_argument, 0, 'A'
}
,
{
@@ -456,11 +456,11 @@ static int builtin_complete( wchar_t **argv )
break;
case 'u':
- authorative=0;
+ authoritative=0;
break;
case 'A':
- authorative=1;
+ authoritative=1;
break;
case 's':
@@ -628,7 +628,7 @@ static int builtin_complete( wchar_t **argv )
&gnu_opt,
&old_opt,
result_mode,
- authorative,
+ authoritative,
condition,
comp,
desc,
diff --git a/complete.c b/complete.c
index 7d9109009..fd07ea192 100644
--- a/complete.c
+++ b/complete.c
@@ -160,7 +160,7 @@ typedef struct complete_entry
/** Next command completion in the linked list */
struct complete_entry *next;
/** True if no other options than the ones supplied are possible */
- int authorative;
+ int authoritative;
}
complete_entry_t;
@@ -370,22 +370,22 @@ static complete_entry_t *complete_get_exact_entry( const wchar_t *cmd,
c->cmd = intern( cmd );
c->cmd_type = cmd_type;
c->short_opt_str = wcsdup(L"");
- c->authorative = 1;
+ c->authoritative = 1;
}
return c;
}
-void complete_set_authorative( const wchar_t *cmd,
+void complete_set_authoritative( const wchar_t *cmd,
int cmd_type,
- int authorative )
+ int authoritative )
{
complete_entry_t *c;
CHECK( cmd, );
c = complete_get_exact_entry( cmd, cmd_type );
- c->authorative = authorative;
+ c->authoritative = authoritative;
}
@@ -608,7 +608,7 @@ int complete_is_valid_option( const wchar_t *str,
complete_entry_opt_t *o;
wchar_t *cmd, *path;
int found_match = 0;
- int authorative = 1;
+ int authoritative = 1;
int opt_found=0;
hash_table_t gnu_match_hash;
int is_gnu_opt=0;
@@ -702,9 +702,9 @@ int complete_is_valid_option( const wchar_t *str,
found_match = 1;
- if( !i->authorative )
+ if( !i->authoritative )
{
- authorative = 0;
+ authoritative = 0;
break;
}
@@ -783,7 +783,7 @@ int complete_is_valid_option( const wchar_t *str,
}
}
- if( authorative )
+ if( authoritative )
{
if( !is_gnu_opt && !is_old_opt )
@@ -838,7 +838,7 @@ int complete_is_valid_option( const wchar_t *str,
halloc_free( context );
- return (authorative && found_match)?opt_found:1;
+ return (authoritative && found_match)?opt_found:1;
}
int complete_is_valid_argument( const wchar_t *str,
diff --git a/complete.h b/complete.h
index 1fe35d412..6c3bd9315 100644
--- a/complete.h
+++ b/complete.h
@@ -180,9 +180,9 @@ void complete_add( const wchar_t *cmd,
true, any options not matching one of the provided options will be
flagged as an error by syntax highlighting.
*/
-void complete_set_authorative( const wchar_t *cmd,
+void complete_set_authoritative( const wchar_t *cmd,
int cmd_type,
- int authorative );
+ int authoritative );
/**
Remove a previously defined completion
diff --git a/doc_src/and.txt b/doc_src/and.txt
index bf75170e9..4af50bbb5 100644
--- a/doc_src/and.txt
+++ b/doc_src/and.txt
@@ -17,7 +17,7 @@ variable.
\subsection and-example Example
The following code runs the \c make command to build a program, if the
-build succceds, the program is installed. If either step fails,
+build succceeds, the program is installed. If either step fails,
make clean is run, which removes the files created by the
build process
diff --git a/doc_src/bind.txt b/doc_src/bind.txt
index dc2eebf6d..13f22f38a 100644
--- a/doc_src/bind.txt
+++ b/doc_src/bind.txt
@@ -6,7 +6,7 @@
The bind builtin causes fish to add the readline style bindings specified by BINDINGS to the list of key bindings, as if they appeared in your ~/.fish_inputrc file.
For more information on the syntax keyboard bindings, use man
-readline to access the readline documentation. The availiable commands
+readline to access the readline documentation. The available commands
are listed in the Command Line Editor section
of the fish manual - but you may also use any fish command! To write such
commands, see the commandline builtin. It's good
diff --git a/doc_src/case.txt b/doc_src/case.txt
index c83547551..6f1249845 100644
--- a/doc_src/case.txt
+++ b/doc_src/case.txt
@@ -19,7 +19,7 @@ regular wildcard expansion using filenames.
Note that fish does not fall through on case statements. Though the
syntax may look a bit like C switch statements, it behaves more like
-the case stamantes of traditional shells.
+the case statementes of traditional shells.
Also note that command substitutions in a case statement will be
evaluated even if it's body is not taken. This may seem
diff --git a/doc_src/complete.txt b/doc_src/complete.txt
index 20a0ad34a..dfc7cc910 100644
--- a/doc_src/complete.txt
+++ b/doc_src/complete.txt
@@ -21,8 +21,8 @@ the fish manual.
- -o or --old-option implies that the command uses old long style options with only one dash
- -p or --path implies that the string COMMAND is the full path of the command
- -r or --require-parameter specifies that the option specified by this completion always must have an option argument, i.e. may not be followed by another option
-- -u or --unauthorative implies that there may be more options than the ones specified, and that fish should not assume that options not listed are spelling errors
-- -A or --authorative implies that there may be no more options than the ones specified, and that fish should assume that options not listed are spelling errors
+- -u or --unauthoritative implies that there may be more options than the ones specified, and that fish should not assume that options not listed are spelling errors
+- -A or --authoritative implies that there may be no more options than the ones specified, and that fish should assume that options not listed are spelling errors
- -x or --exclusive implies both -r and -f
Command specific tab-completions in \c fish are based on the notion
diff --git a/doc_src/if.txt b/doc_src/if.txt
index ed19fbe0a..dbbd378f4 100644
--- a/doc_src/if.txt
+++ b/doc_src/if.txt
@@ -10,9 +10,9 @@ exit status is 0, the commands COMMANDS_TRUE will execute. If the
exit status is not 0 and else is given, COMMANDS_FALSE will
be executed.
-In order to use the exit status of mutiple commands as the condition
+In order to use the exit status of multiple commands as the condition
of an if block, use begin; ...; end and
-the short circut commands and and and and or.
The exit status of the last foreground command to exit can always be
diff --git a/doc_src/math.txt b/doc_src/math.txt
index b58527f97..0bef1437b 100644
--- a/doc_src/math.txt
+++ b/doc_src/math.txt
@@ -6,7 +6,7 @@
\subsection math-description Description
-math is used to perform mathematical calcualtions. It is only a very
+math is used to perform mathematical calculations. It is only a very
thin wrapper for the bc program, that makes it possible to specify an
expression from the command line without using non-standard extensions
or a pipeline. Simply use a command like math 1+1.
diff --git a/doc_src/mimedb.txt b/doc_src/mimedb.txt
index 202d2aafb..fbfcdf9ee 100644
--- a/doc_src/mimedb.txt
+++ b/doc_src/mimedb.txt
@@ -18,7 +18,7 @@
The mimedb command is used to query the mimetype database and the
.desktop files installed on the system in order to find information on
-a file. The information that mimedb can retrive includes the mimetype
+a file. The information that mimedb can retrieve includes the mimetype
for a file, a description of the type and what its default action
is. mimedb can also be used to launch the default action for this
file.
diff --git a/doc_src/or.txt b/doc_src/or.txt
index 6227170ac..9fc62a6a9 100644
--- a/doc_src/or.txt
+++ b/doc_src/or.txt
@@ -17,7 +17,7 @@ variable.
\subsection or-example Example
The following code runs the \c make command to build a program, if the
-build succceds, the program is installed. If either step fails,
+build succceeds, the program is installed. If either step fails,
make clean is run, which removes the files created by the
build process
diff --git a/doc_src/prevd.txt b/doc_src/prevd.txt
index 8f548254e..57917f105 100644
--- a/doc_src/prevd.txt
+++ b/doc_src/prevd.txt
@@ -1,4 +1,4 @@
-\section prevd prevd - move backward through direcotry history
+\section prevd prevd - move backward through directory history
\subsection prevd-synopsis Synopsis
prevd [-l | --list] [pos]
diff --git a/doc_src/read.txt b/doc_src/read.txt
index 69566e190..564b890a8 100644
--- a/doc_src/read.txt
+++ b/doc_src/read.txt
@@ -11,7 +11,7 @@ input and store the result in one or more environment variables.
- -c CMD or --command=CMD specifies that the initial string in the interactive mode command buffer should be CMD.
- -e or --export specifies that the variables will be exported to subshells.
- -g or --global specifies that the variables will be made global.
-- -m NAME or --mode-name=NAME specifies that the name NAME should be used to save/load the hiustory file. If NAME is fish, the regular fish history will be available.
+- -m NAME or --mode-name=NAME specifies that the name NAME should be used to save/load the history file. If NAME is fish, the regular fish history will be available.
- -p PROMPT_CMD or --prompt=PROMPT_CMD specifies that the output of the shell command PROMPT_CMD should be used as the prompt for the interactive mode prompt. The default prompt command is set_color green; echo read; set_color normal; echo "> ".
- -s or --shell Use syntax highlighting, tab completions and command termination suitable for entering shellscript code
- -u or --unexport causes the specified environment not to be exported to child processes
diff --git a/doc_src/set.txt b/doc_src/set.txt
index a7d72abb3..6d5b0fe86 100644
--- a/doc_src/set.txt
+++ b/doc_src/set.txt
@@ -43,7 +43,7 @@ the last index of an array.
The scoping rules when creating or updating a variable are:
-# If a variable is explicitly set to either universal, global or local, that setting will be honored. If a variable of the same name exists in a different scope, that variable will not be changed.
--# If a variable is not explicitly set to be either universal, global or local, but has been previously defined, the previos variable scope is used.
+-# If a variable is not explicitly set to be either universal, global or local, but has been previously defined, the previous variable scope is used.
-# If a variable is not explicitly set to be either universal, global or local and has never before been defined, the variable will be local to the currently executing functions. If no function is executing, the variable will be global.
The exporting rules when creating or updating a variable are identical
diff --git a/doc_src/switch.txt b/doc_src/switch.txt
index 100e21f06..cbfb4be9a 100644
--- a/doc_src/switch.txt
+++ b/doc_src/switch.txt
@@ -19,7 +19,7 @@ regular wildcard expansion using filenames.
Note that fish does not fall through on case statements. Though the
syntax may look a bit like C switch statements, it behaves more like
-the case stamantes of traditional shells.
+the case statements of traditional shells.
Also note that command substitutions in a case statement will be
evaluated even if it's body is not taken. This may seem
diff --git a/doc_src/ulimit.txt b/doc_src/ulimit.txt
index e8229a9bd..bb95a2a70 100644
--- a/doc_src/ulimit.txt
+++ b/doc_src/ulimit.txt
@@ -35,7 +35,8 @@ except for -t, which is in seconds and -n and -u, which are unscaled
values. The return status is 0 unless an invalid option or argument is
supplied, or an error occurs while setting a new limit.
-ulimit also accepts the following switches that determine what type of limit to set:
+ulimit also accepts the following switches that determine what type of
+limit to set:
- -H or --hard Set hard resource limit
- -S or --soft Set soft resource limit
diff --git a/fish_indent.c b/fish_indent.c
index eb9c2ca57..7fcfb6b77 100644
--- a/fish_indent.c
+++ b/fish_indent.c
@@ -22,7 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "config.h"
-
#include
#include
#include