From 24afe544a3410b83ca5139bbbe5229fd390ffd29 Mon Sep 17 00:00:00 2001 From: nmeum Date: Sat, 13 Apr 2013 23:17:19 +0200 Subject: [PATCH] Typos --- doc_src/bind.txt | 2 +- doc_src/contains.txt | 2 +- doc_src/design.hdr | 4 ++-- doc_src/faq.hdr | 6 +++--- doc_src/fish_prompt.txt | 2 +- doc_src/fish_right_prompt.txt | 2 +- doc_src/pushd.txt | 2 +- doc_src/test.txt | 2 +- mimedb.cpp | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/doc_src/bind.txt b/doc_src/bind.txt index b5c81d229..3bf9fb453 100644 --- a/doc_src/bind.txt +++ b/doc_src/bind.txt @@ -22,7 +22,7 @@ If SEQUENCE is the empty string, i.e. an empty set of quotes, this is interpreted as the default keybinding. It will be used whenever no other binding matches. For most key bindings, it makes sense to use the \c self-insert function (i.e. bind '' self-insert as the -default keybining. This will insert any keystrokes not specifically +default keybinding. This will insert any keystrokes not specifically bound to into the editor. Non-printable characters are ignored by the editor, so this will not result in e.g. control sequences being printable. diff --git a/doc_src/contains.txt b/doc_src/contains.txt index d8ce13a90..1a08a2ac1 100644 --- a/doc_src/contains.txt +++ b/doc_src/contains.txt @@ -5,7 +5,7 @@ \subsection contains-description Description -- \c -i or \c --index print the the word index +- \c -i or \c --index print the word index - \c -h or \c --help display this message Test if the set VALUES contains the string KEY. Return status is 0 if diff --git a/doc_src/design.hdr b/doc_src/design.hdr index 2edfefd0d..572a95d76 100644 --- a/doc_src/design.hdr +++ b/doc_src/design.hdr @@ -13,7 +13,7 @@ Most tradeoffs between power and ease of use can be avoided with careful design. -# Whenever possible without breaking the above goals, fish should follow the Posix syntax. -To achive these high-level goals, the fish design relies on a number +To achieve these high-level goals, the fish design relies on a number of more specific design principles. These are presented below, together with a rationale and a few examples for each. @@ -33,7 +33,7 @@ program harder to maintain and update. Examples: - Here documents are too similar to using echo inside of a pipeline. -- Subshells, command substitution and process substitution are strongly related. \c fish only supports command substitution, the others can be achived either using a block or the psub shellscript function. +- Subshells, command substitution and process substitution are strongly related. \c fish only supports command substitution, the others can be achieved either using a block or the psub shellscript function. - Having both aliases and functions is confusing, especially since both of them have limitations and problems. \c fish functions have none of the drawbacks of either syntax. - The many Posix quoting styles are silly, especially \$''. diff --git a/doc_src/faq.hdr b/doc_src/faq.hdr index 9184463ca..23bfa00d9 100644 --- a/doc_src/faq.hdr +++ b/doc_src/faq.hdr @@ -28,7 +28,7 @@ Writing cd images; ls .. given the above directory structure would list the contents of ~/Documents, not of ~, even though using cd .. changes the current directory to ~, and the prompt, the pwd builtin and many other directory information -sources suggest that the the current directory is ~/images and it's +sources suggest that the current directory is ~/images and it's parent is ~. This issue is not possible to fix without either making every single command into a builtin, breaking Unix semantics or implementing kludges in every single command. @@ -93,7 +93,7 @@ In order to change your default shell, type: You may need to adjust the above path to e.g. /usr/bin/fish. Use the command which fish if you are unsure of where fish is installed. -Unfortunatly, there is no way to make the changes take effect at once, +Unfortunately, there is no way to make the changes take effect at once, you will need to log out and back in again.
@@ -114,7 +114,7 @@ The long answer: Fish is trying to set the titlebar message of your terminal. While screen itself supports this feature, your terminal does -not. Unfortuntaly, when the underlying terminal doesn't support +not. Unfortunately, when the underlying terminal doesn't support setting the titlebar, screen simply passes through the escape codes and text to the underlying terminal instead of ignoring them. It is impossible detect and resolve this problem from inside fish since fish diff --git a/doc_src/fish_prompt.txt b/doc_src/fish_prompt.txt index 2ddc8e55b..d400619c8 100644 --- a/doc_src/fish_prompt.txt +++ b/doc_src/fish_prompt.txt @@ -1,4 +1,4 @@ -\section fish_prompt fish_prompt - define the apperance of the command line prompt +\section fish_prompt fish_prompt - define the appearance of the command line prompt \subsection fish_prompt-synopsis Synopsis 
function fish_prompt
diff --git a/doc_src/fish_right_prompt.txt b/doc_src/fish_right_prompt.txt
index b85748511..afe0750a7 100644
--- a/doc_src/fish_right_prompt.txt
+++ b/doc_src/fish_right_prompt.txt
@@ -1,4 +1,4 @@
-\section fish_right_prompt fish_right_prompt - define the apperance of the right-side command line prompt
+\section fish_right_prompt fish_right_prompt - define the appearance of the right-side command line prompt
 
 \subsection fish_right_prompt-synopsis Synopsis
 
function fish_right_prompt
diff --git a/doc_src/pushd.txt b/doc_src/pushd.txt
index 525690720..3093cbaa0 100644
--- a/doc_src/pushd.txt
+++ b/doc_src/pushd.txt
@@ -5,5 +5,5 @@
 
 \subsection pushd-description Description
 The pushd function adds DIRECTORY to the top of the directory stack
-and makes it the current directory. Use popd to pop it off and and
+and makes it the current directory. Use popd to pop it off and
 return to the original directory.
diff --git a/doc_src/test.txt b/doc_src/test.txt
index f778908f1..b48790573 100644
--- a/doc_src/test.txt
+++ b/doc_src/test.txt
@@ -9,7 +9,7 @@ Tests the expression given and returns true or false.
 
 - \c -h, \c Display this help
 - \c -G, \c File owned by effective group ID
-- \c -L, \c File is syslink
+- \c -L, \c File is symlink
 - \c -O, \c File owned by effective user ID
 - \c -S, \c File is socket
 - \c -a, \c Logical and 
diff --git a/mimedb.cpp b/mimedb.cpp
index cf02c70c5..9b66bb0a2 100644
--- a/mimedb.cpp
+++ b/mimedb.cpp
@@ -297,7 +297,7 @@ static char *file_exists(const char *dir, const char *in)
    from xdg_run_command_on_dirs.
 
    \param list Full file paths will be appended to this list.
-   \param f The relative filename search for the the data directories.
+   \param f The relative filename search for the data directories.
    \param all If zero, then stop after the first filename.
    \return The number of filenames added to the list.
 */