m fixesHEADmaster

Signed-off-by: Mattias Andrée <m@maandree.se>

3 files changed, 39 insertions, 42 deletions

diff --git a/Makefile b/Makefile
index f45223a..8e32ac1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,21 @@
+# Comments may appear before .POSIX:
 BOOK = using-git
 PKGNAME = using-git
 TEXINFO_DIR = .
 
 PREFIX = /usr
-DATA = /share
-DATADIR = $(DATADIR)
+DATADIR = $(PREFIX)/share
 INFODIR = $(DATADIR)/info
 DOCDIR = $(DATADIR)/doc
 LICENSEDIR = $(DATADIR)/licenses
 
-TEXIFLAGS = #--force
-
-
+MAKEINFO = makeinfo
+TEXI2DVI = texi2dvi
+TEXIFLAGS =
 
 .PHONY: all
 all:
 
-
 .PHONY: install
 install:
 
@@ -75,13 +74,17 @@ dvi: $(BOOK).dvi
 .PHONY: install-info install-pdf install-dvi install-ps
 install: install-info
 install-info: $(BOOK).info
-	install -Dm644 "$<" -- "$(DESTDIR)$(INFODIR)/$(PKGNAME).info"
+	mkdir -p -- "$(DESTDIR)$(INFODIR)"
+	cp -f -- $(BOOK).info "$(DESTDIR)$(INFODIR)/$(PKGNAME).info"
 install-pdf: $(BOOK).pdf
-	install -Dm644 "$<" -- "$(DESTDIR)$(DOCDIR)/$(PKGNAME).pdf"
+	mkdir -p -- "$(DESTDIR)$(DOCDIR)"
+	cp -f -- $(BOOK).pdf "$(DESTDIR)$(DOCDIR)/$(PKGNAME).pdf"
 install-dvi: $(BOOK).dvi
-	install -Dm644 "$<" -- "$(DESTDIR)$(DOCDIR)/$(PKGNAME).dvi"
+	mkdir -p -- "$(DESTDIR)$(DOCDIR)"
+	cp -f -- $(BOOK).dvi "$(DESTDIR)$(DOCDIR)/$(PKGNAME).dvi"
 install-ps: $(BOOK).ps
-	install -Dm644 "$<" -- "$(DESTDIR)$(DOCDIR)/$(PKGNAME).ps"
+	mkdir -p -- "$(DESTDIR)$(DOCDIR)"
+	cp -f -- $(BOOK).ps "$(DESTDIR)$(DOCDIR)/$(PKGNAME).ps"
 
 .PHONY: uninstall-info uninstall-pdf uninstall-dvi uninstall-ps
 uninstall: uninstall-info uninstall-pdf uninstall-dvi uninstall-ps
@@ -97,19 +100,18 @@ uninstall-ps:
 .PHONY: clean-texinfo
 clean: clean-texinfo
 clean-texinfo:
-	-rm -r -- *.{info,pdf,ps,dvi}
+	-rm -f -- $(BOOK).info $(BOOK).pdf $(BOOK).ps $(BOOK).dvi
 
 ## License section
 
 .PHONY: install-license
 install: install-license
 install-license:
-	install -d -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)"
-	install -m644 LICENSE -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)"
+	@mkdir -p -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)/"
+	cp -f -- LICENSE "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)/LICENSE"
 
 .PHONY: uninstall-license
 uninstall: uninstall-license
 uninstall-license:
 	-rm -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)/LICENSE"
 	-rmdir -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)"
-
diff --git a/README b/README
index 5f71ba5..d649ab8 100644
--- a/README
+++ b/README
@@ -1,34 +1,30 @@
-In lack of good git documentation and manuals, I started by own.
+For lack of good Git documentation and manuals, I started my own.
 
   This manual is aimed at technical people.
 
-It seems to be lack of well written manuals, and Git's online
-documention itself is atrocious. While I do not except the
-writers to have taken any course in pedagogy or didactics, or
-even have any practical experience, I at least expect the
-writters to try to keep those aspects in mind, but that does
-not seem to be the case.
+There seems to be a lack of well-written manuals, and Git's online
+documentation itself is atrocious. While I do not expect the
+writers to have taken any course in pedagogy or didactics, or even
+have any practical experience, I at least expect the writers to try
+to keep those aspects in mind, but that does not seem to be the case.
 
 Documentation should first introduce the concept, then the
-implementation; that is, first how to get started, than what
-they are doing*. In other words, first how to create a Git
-repository and the absolute essantials, than introduce Git
-itself. Not first taking about what Git is, readers want to
-read the chapters in their order, if they do not have anything
-specific in mind.
+implementation; that is, first how to get started, then what it is
+doing*. In other words, first how to create a Git repository and the
+absolute essentials, then introduce Git itself. Readers want to read
+the chapters in their order, if they do not have anything specific in
+mind.
 
-Documentation should then give you breif a documentation of
-everything you need to know in the order of its imporantance,
-then, iterate to the more advanced.
+Documentation should then give you brief documentation of
+everything you need to know in the order of its importance, then
+iterate to the more advanced.
 
-But one of the most important part is not to start with
-dangerous commands just because it is easier to be lazy with
-them. Try to do it right from the beginning, otherwise the
-wrong way will stick in the reader's memory.
+One of the most important parts is not to start with dangerous
+commands just because it is easier. Try to do it right from the
+beginning, otherwise the wrong way will stick in the reader's memory.
 
 
 
 *  This is a concept called ‘concrete before abstract’. While I
-   disagree that it is always the best practices, I do think so
-   in this case.
-
+   disagree that it is always the best practice, I do think so in
+   this case.
diff --git a/using-git.texinfo b/using-git.texinfo
index d368fb9..6e66e6b 100644
--- a/using-git.texinfo
+++ b/using-git.texinfo
@@ -63,12 +63,12 @@ This manual will teach you the basics
 for using Git with an early focus on
 contributing to existing projects, and
 iterates to increasingly more advanced
-features that makes life with Git even
+features that make life with Git even
 easier. But it will also teach you some
-ideas behide Git's design. You will also
+ideas behind Git's design. You will also
 learn about side-issues such as how to
 best make your own project installable
-and navigateable by others without
+and navigable by others without
 excessive documentation and without having
 to answer too many questions.
 
@@ -114,7 +114,7 @@ Texts. A copy of the license is included in the section entitled
 @subtitle Educational manual for Git, the version control system.
 
 @c @vskip 0pt plus 1filll
-@c @c this way, it is centered exactly in pdf and approximently in dvi and ps
+@c @c this way, it is centred exactly in pdf and approximately in dvi and ps
 @c @c @center does not work for @image in dvi and ps
 @c @multitable @columnfractions 0.15 0.7
 @c @item @tab @center @image{obj/logo,200px}
@@ -2676,4 +2676,3 @@ man gitdiffcore
 man gitcredentials
 man gitnamespaces
 man gitcore-tutorial
-