---
doc_src/design.hdr | 18 +++++++++---------
doc_src/faq.hdr | 12 ++++++------
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/doc_src/design.hdr b/doc_src/design.hdr
index c6fea80..7d3215c 100644
--- a/doc_src/design.hdr
+++ b/doc_src/design.hdr
@@ -9,11 +9,11 @@ design fish. The fish design has three high level goals. These are:
possible to do in fish, though fish may rely on external commands in
doing so.
-# Fish should be user friendly, but not at the expense of expressiveness.
-Most tradeoffs between power and ease of use can be avoided with careful design.
+Most trade offs 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.
+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.
@@ -27,15 +27,15 @@ enough to handle all common use cases of either feature.
Rationale:
Related features make the language larger, which makes it harder to
-learn. It also increases the size of the sourcecode, making the
+learn. It also increases the size of the source code, making the
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 \$''.
+- The many POSIX quoting styles are silly, especially \$''.
\section sep The law of minimalism
@@ -64,7 +64,7 @@ as builtins and can not be implemented as external commands,
including \c type, \c vared, \c pushd and \c popd are implemented as shellscript
functions in fish.
- Mathematical calculations, regex matching, generating lists of numbers
-and many other funtions can easily be done in external programs. They
+and many other functions can easily be done in external programs. They
should not be supported internally by the shell.
The law of minimalism does not imply that a large feature set is
@@ -75,7 +75,7 @@ separate command or at least a shellscript function, bloat is fine.
Every configuration option in a program is a place where the program
is too stupid to figure out for itself what the user really wants, and
-should be considered a failiure of both the program and the programmer
+should be considered a failure of both the program and the programmer
who implemented it.
Rationale:
@@ -150,6 +150,6 @@ Examples:
- Everything should be tab-completable, and every tab completion should have a description.
- Every syntax error and error in a builtin command should contain an error message describing what went wrong and a relevant help page. Whenever possible, errors should be flagged red by the syntax highlighter.
- The help manual should be easy to read, easily available from the shell, complete and contain many examples
-- The language should be uniform, so that once the user understands the command/argument syntax, he will know the whole language, and be able to use tab-completion to discover new featues.
+- The language should be uniform, so that once the user understands the command/argument syntax, he will know the whole language, and be able to use tab-completion to discover new features.
*/
diff --git a/doc_src/faq.hdr b/doc_src/faq.hdr
index 0fc7463..6a7457e 100644
--- a/doc_src/faq.hdr
+++ b/doc_src/faq.hdr
@@ -22,13 +22,13 @@ Because it is impossible to consistently keep symlinked directories
unresolved. It is indeed possible to do this partially, and many other
shells do so. But it was felt there are enough serious corner cases
that this is a bad idea. Most such issues have to do with how '..' is
-handled, and are varitations of the following example:
+handled, and are variations of the following example:
Writing <code>cd images; ls ..</code> given the above directory
structure would list the contents of ~/Documents, not of ~, even
-though using <code>cd ..</code> changes the current direcotry to ~,
+though using <code>cd ..</code> 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 its
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.
@@ -47,7 +47,7 @@ silently fails in shells that don't resolve symlinked paths.
Because they are completions. In fish, if you specify a relative
directory to the cd command, i.e. any path that does not start with
either './' or '/', the environment variable CDPATH will be examined, and any
-directories in this path is used as a base direcotry. To disable this
+directories in this path is used as a base directory. To disable this
feature, write <code>set CDPATH .</code> on the commandline.
<hr>
@@ -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 <code>which fish</code> 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.
<hr>
@@ -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
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Fish-users mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fish-users
