aboutsummaryrefslogtreecommitdiffhomepage
path: root/doc_src
diff options
context:
space:
mode:
authorGravatar Ingo Blechschmidt <iblech@web.de>2015-04-25 18:53:15 +0200
committerGravatar Ingo Blechschmidt <iblech@web.de>2015-04-25 18:59:43 +0200
commit6f438f65de2b56e1d12bb0597cc48c83a1607308 (patch)
tree6bb7e73ba70bc6fa979fd7fade0d6a7be5b7161a /doc_src
parent879d03d0fe2173e1100786e39dd0bac0e6f72fa0 (diff)
typo
Diffstat (limited to 'doc_src')
-rw-r--r--doc_src/faq.hdr4
-rw-r--r--doc_src/tutorial.hdr2
2 files changed, 3 insertions, 3 deletions
diff --git a/doc_src/faq.hdr b/doc_src/faq.hdr
index fbc6787d..692e93b2 100644
--- a/doc_src/faq.hdr
+++ b/doc_src/faq.hdr
@@ -115,7 +115,7 @@ Use the <a href="commands.html#fish_update_completions">`fish_update_completions
<hr>
\section faq-cwd-symlink Why does cd, $PWD and and various fish commands always resolve symlinked directories to their canonical path?
-<i>For example if `~/images` is a symlink to `~/Documents/Images`, if I write '`cd images`', my prompt will say `~/D/Images`, not `~/images`.</i>
+<i>For example if `~/images` is a symlink to `~/Documents/Images`, if I write '`cd images`', my prompt will say `~/Documents/Images`, not `~/images`.</i>
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:
@@ -169,7 +169,7 @@ Problem solved!
The long answer:
-Fish is trying to set the titlebar message of your terminal. While screen itself supports this feature, your terminal does 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 has no way of knowing what the underlying terminal type is. For now, the only way to fix this is to unset the titlebar message, as suggested above.
+Fish is trying to set the titlebar message of your terminal. While screen itself supports this feature, your terminal does 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 to detect and resolve this problem from inside fish since fish has no way of knowing what the underlying terminal type is. For now, the only way to fix this is to unset the titlebar message, as suggested above.
Note that fish has a default titlebar message, which will be used if the fish_title function is undefined. So simply unsetting the fish_title function will not work.
diff --git a/doc_src/tutorial.hdr b/doc_src/tutorial.hdr
index 505adc7c..fe624d95 100644
--- a/doc_src/tutorial.hdr
+++ b/doc_src/tutorial.hdr
@@ -567,7 +567,7 @@ See the documentation for <a href="commands.html#funced">funced</a> and <a href=
\section tut-universal Universal Variables
-A universal variable is a variable whose value is shared across all instances of `fish`, now and in the future - even after a reboot. You can make a variable universal with `set -U`:
+A universal variable is a variable whose value is shared across all instances of `fish`, now and in the future – even after a reboot. You can make a variable universal with `set -U`:
\fish{cli-dark}
>_ set -U EDITOR vim