aboutsummaryrefslogtreecommitdiffhomepage
path: root/doc_src/eval.txt
diff options
context:
space:
mode:
authorGravatar ridiculousfish <corydoras@ridiculousfish.com>2013-12-20 17:44:37 -0800
committerGravatar ridiculousfish <corydoras@ridiculousfish.com>2013-12-20 17:44:37 -0800
commited70195c7eda1040e596c3f7a1a417d4ec888242 (patch)
tree9bcbcddd51fde2a75aaa3aa5cb1cb61a5a5fc4e5 /doc_src/eval.txt
parent739e529416c3917d1e75d1a41850762a327e6ea9 (diff)
parente38217683c65f53fcaa3b6a5daedb6b23b408a90 (diff)
Merge branch 'master' into ast
Conflicts: function.cpp parser.cpp parser.h
Diffstat (limited to 'doc_src/eval.txt')
-rw-r--r--doc_src/eval.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc_src/eval.txt b/doc_src/eval.txt
index 0227255a..f8af8f66 100644
--- a/doc_src/eval.txt
+++ b/doc_src/eval.txt
@@ -8,7 +8,7 @@
\subsection eval-example Example
-The folloing code will call the ls command. Note that \c fish does not
+The following code will call the ls command. Note that \c fish does not
support the use of environment variables as direct commands; \c eval can
be used to work around this.