diff --git a/doc_src/faq.hdr b/doc_src/faq.hdr index 23bfa00d9..07c763ab5 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 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. @@ -91,10 +91,10 @@ In order to change your default shell, type: chsh -s /usr/local/bin/fish -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. +You may need to adjust the above path to e.g. \c /usr/bin/fish. Use the command which fish if you are unsure of where fish is installed. -Unfortunately, there is no way to make the changes take effect at once, -you will need to log out and back in again. +Unfortunately, there is no way to make the changes take effect at once. +You will need to log out and back in again.
diff --git a/doc_src/index.hdr.in b/doc_src/index.hdr.in index 6705aa411..62bde6b25 100644 --- a/doc_src/index.hdr.in +++ b/doc_src/index.hdr.in @@ -163,7 +163,7 @@ Any file descriptor can be directed to a different output than its default through a simple mechanism called a redirection. An example of a file redirection is echo hello \>output.txt, -which directs the output of the echo command to the file error.txt. +which directs the output of the echo command to the file output.txt. - To redirect standard input, write \ - To redirect standard output, write \>DESTINATION @@ -398,7 +398,7 @@ These are the general purpose tab completions that \c fish provides: - Completion of environment variable names. - Completion of usernames for tilde expansion. - Completion of filenames, even on strings with wildcards such as '*', '**' and '?'. -- Completion of job id, job name and process names for process expansion. +- Completion of job ID, job name and process names for process expansion. \c fish provides a large number of program specific completions. Most of these completions are simple options like the \c -l option for \c @@ -1186,7 +1186,7 @@ History searches can be aborted by pressing the escape key. Prefixing the commandline with a space will prevent the entire line from being stored in the history. -The history is stored in the file . +The history is stored in the file ~/.config/fish/fish_history. Examples: @@ -1221,7 +1221,7 @@ continue using the shell. In such cases, there are several ways in which the user can change fish's behavior. -# By ending a command with the \& (ampersand) symbol, the user tells \c fish to put the specified command into the background. A background process will be run simultaneous with \c fish. \c fish will retain control of the terminal, so the program will not be able to read from the keyboard. --# By pressing ^Z, the user stops a currently running foreground program and returns control to \c fish. Some programs do not support this feature, or remap it to another key. Gnu emacs uses ^X z to stop running. +-# By pressing ^Z, the user stops a currently running foreground program and returns control to \c fish. Some programs do not support this feature, or remap it to another key. GNU Emacs uses ^X z to stop running. -# By using the fg and bg builtin commands, the user can send any currently running job into the foreground or background. \section initialization Initialization files