Rebase conflict resolution

2 files changed, 10 insertions, 7 deletions

diff --git a/doc_src/history.txt b/doc_src/history.txt
index f7b873a0..1bdcdf1e 100644
--- a/doc_src/history.txt
+++ b/doc_src/history.txt
@@ -11,11 +11,13 @@ history ( --search | --delete ) [ --prefix "prefix string" | --contains "search
 `history` is used to list, search and delete the history of commands used.
 
 The following options are available:
+- `--merge` immediately incorporates history changes from other sessions. Ordinarily `fish` ignores history changes from sessions started after the current one. This command applies those changes immediately.
+
 - `--save` saves all changes in the history file. The shell automatically saves the history file; this option is provided for internal use.
 
 - `--clear` clears the history file. A prompt is displayed before the history is erased.
 
-- `--merge` immediately incorporates history changes from other sessions. Ordinarily `fish` ignores history changes from sessions started after the current one. This command applies those changes immediately.- `--search` returns history items in keeping with the `--prefix` or `--contains` options.
+- `--search` returns history items in keeping with the `--prefix` or `--contains` options.
 
 - `--delete` deletes history items.
 
diff --git a/doc_src/index.hdr.in b/doc_src/index.hdr.in
index 8b8fbaff..b6af3233 100644
--- a/doc_src/index.hdr.in
+++ b/doc_src/index.hdr.in
@@ -171,13 +171,13 @@ descriptor 2) of the target program to `output.stderr`.
 
 \subsection piping Piping
 
-The user can string together multiple commands into a so called pipeline. This means that the standard output of one command will be read in as standard input into the next command. This is done by separating the commands by the pipe character '`|`'. For example:
+The user can string together multiple commands into a so called pipeline. This means that the standard output of one command will be read in as standard input into the next command. This is done by separating the commands by the pipe character '`|`'. For example
 
 \fish
 cat foo.txt | head
 \endfish
 
-This will call the `cat` program with the parameter 'foo.txt', which will print the contents of the file 'foo.txt'. The contents of foo.txt will then be filtered through the program 'head', which will pass on the first ten lines of the file to the screen. For more information on how to combine commands through pipes, read the manual pages of the commands you want to use using the `man` command. If you want to find out more about the `cat` program, type `man cat`.
+will call the `cat` program with the parameter 'foo.txt', which will print the contents of the file 'foo.txt'. The contents of foo.txt will then be filtered through the program 'head', which will pass on the first ten lines of the file to the screen. For more information on how to combine commands through pipes, read the manual pages of the commands you want to use using the `man` command. If you want to find out more about the `cat` program, type `man cat`.
 
 Pipes usually connect file descriptor 1 (standard output) of the first process to file descriptor 0 (standard input) of the second process. It is possible use a different output file descriptor by prepending the desired FD number and then output redirect symbol to the pipe. For example:
 
@@ -185,7 +185,7 @@ Pipes usually connect file descriptor 1 (standard output) of the first process t
 make fish 2> | less
 \endfish
 
-This will attempt to build the fish program, and any errors will be shown using the less pager.
+will attempt to build the fish program, and any errors will be shown using the less pager.
 
 
 \subsection syntax-background Background jobs
@@ -757,9 +757,9 @@ values of most of these variables.
 
 - `CMD_DURATION`, the runtime of the last command in milliseconds.
 
-The names of these variables are mostly derived from the csh family of shells and differ from the ones used by Bourne style shells such as bash.
-
-Variables whose name are in uppercase are exported to the commands started by fish, while those in lowercase are not exported. This rule is not enforced by fish, but it is good coding practice to use casing to distinguish between exported and unexported variables. `fish` also uses several variables internally. Such variables are prefixed with the string `__FISH` or `__fish`. These should never be used by the user. Changing their value may break fish.
+The names of these variables are mostly derived from the csh family of
+shells and differ from the ones used by Bourne style shells such as
+bash.
 
 Variables whose name are in uppercase are exported to the commands
 started by fish, while those in lowercase are not exported. This rule is not
@@ -1015,6 +1015,7 @@ function on_exit --on-process %self
 end
 \endfish
 
+
 <a href="#variables-universal">Universal variables</a> are stored in the file `.config/fish/fishd.MACHINE_ID`, where MACHINE_ID is typically your MAC address. Do not edit this file directly, as your edits may be overwritten. Edit them through fish scripts or by using fish interactively instead.