diff --git a/Documentation/config.txt b/Documentation/config.txt index ee0884545bf..e1eaee9971e 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -757,7 +757,7 @@ remote.<name>.push:: remote.<name>.skipDefaultUpdate:: If true, this remote will be skipped by default when updating - using the remote subcommand of gitlink:git-remote[1]. + using the update subcommand of gitlink:git-remote[1]. remote.<name>.receivepack:: The default program to execute on the remote side when pushing. See diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index f2b42068f3c..3f552e9d8ea 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -74,7 +74,7 @@ version is called a <<def_commit,commit>>. Those snapshots aren't necessarily all arranged in a single line from oldest to newest; instead, work may simultaneously proceed along -parallel lines of development, called <def_branch,branches>>, which may +parallel lines of development, called <<def_branch,branches>>, which may merge and diverge. A single git repository can track development on multiple branches. It