summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Thomas Ackermann <th.acker@arcor.de>2016-03-03 19:43:51 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-03-03 13:43:36 -0800
commitd285ab0a41c5c04222cf356066d1df1e6096c5a7 (patch)
treef2f8f77950e0436ed881423edb11d8ba42b35c11 /Documentation
parentGit 2.8-rc0 (diff)
downloadtgif-d285ab0a41c5c04222cf356066d1df1e6096c5a7.tar.xz
documentation: fix some typos
Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-ls-files.txt2
-rw-r--r--Documentation/user-manual.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 0e08f567a1..75c3f4157d 100644
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -155,7 +155,7 @@ a space) at the start of each line:
<eolinfo> is either "-text", "none", "lf", "crlf", "mixed" or "".
+
"" means the file is not a regular file, it is not in the index or
-not accessable in the working tree.
+not accessible in the working tree.
+
<eolattr> is the attribute that is used when checking out or committing,
it is either "", "-text", "text", "text=auto", "text eol=lf", "text eol=crlf".
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index ec6bacfcdf..5e07454572 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -2134,7 +2134,7 @@ browsing the repository using gitweb. The default server when using
instaweb is lighttpd.
See the file gitweb/INSTALL in the Git source tree and
-linkgit:gitweb[1] for instructions on details setting up a permament
+linkgit:gitweb[1] for instructions on details setting up a permanent
installation with a CGI or Perl capable server.
[[how-to-get-a-git-repository-with-minimal-history]]