60 files changed, 44 insertions, 40 deletions
diff --git a/.gitignore b/.gitignore
index dc67577..0c895e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,18 +2,18 @@
 *~
 /*.tar
 /*.tar.gz
-/Documentation/*.epub
-/Documentation/*.html
-/Documentation/*.info
-/Documentation/*.pdf
-/Documentation/META-INF/
-/Documentation/OEBPS/
-/Documentation/dir
-/Documentation/epub.xml
-/Documentation/magit/
-/Documentation/magit-section/
-/Documentation/mimetype
-/Documentation/stats/
 /config.mk
+/docs/*.epub
+/docs/*.html
+/docs/*.info
+/docs/*.pdf
+/docs/META-INF/
+/docs/OEBPS/
+/docs/dir
+/docs/epub.xml
+/docs/magit/
+/docs/magit-section/
+/docs/mimetype
+/docs/stats/
 /lisp/magit-autoloads.el
 /lisp/magit-version.el
diff --git a/Makefile b/Makefile
index 0481f02..db6ae0c 100644
--- a/Makefile
+++ b/Makefile
@@ -74,22 +74,22 @@ lisp:
 	@$(MAKE) -C lisp lisp
 
 docs:
-	@$(MAKE) -C Documentation all
+	@$(MAKE) -C docs all
 
 info:
-	@$(MAKE) -C Documentation info
+	@$(MAKE) -C docs info
 
 html:
-	@$(MAKE) -C Documentation html
+	@$(MAKE) -C docs html
 
 html-dir:
-	@$(MAKE) -C Documentation html-dir
+	@$(MAKE) -C docs html-dir
 
 pdf:
-	@$(MAKE) -C Documentation pdf
+	@$(MAKE) -C docs pdf
 
 epub:
-	@$(MAKE) -C Documentation epub
+	@$(MAKE) -C docs epub
 
 ## Install ###########################################################
 
@@ -99,10 +99,10 @@ install-lisp: lisp
 	@$(MAKE) -C lisp install
 
 install-docs: docs
-	@$(MAKE) -C Documentation install-docs
+	@$(MAKE) -C docs install-docs
 
 install-info: info
-	@$(MAKE) -C Documentation install-info
+	@$(MAKE) -C docs install-info
 
 ## Test ##############################################################
 
@@ -131,14 +131,14 @@ check-declare:
 clean: clean-lisp clean-docs clean-archives
 	@printf "Cleaning...\n"
 	@$(RM) *.elc $(ELGS) # temporary cleanup kludge
-	@$(RM) Documentation/*.texi~ Documentation/*.info-1 Documentation/*.info-2
+	@$(RM) docs/*.texi~ docs/*.info-1 docs/*.info-2
 	@$(RM) magit-pkg.el t/magit-tests.elc
 
 clean-lisp:
 	@$(MAKE) -C lisp clean
 
 clean-docs:
-	@$(MAKE) -C Documentation clean
+	@$(MAKE) -C docs clean
 
 clean-archives:
 	@$(RM) *.tar.gz *.tar lisp/magit-version.el
@@ -147,30 +147,30 @@ clean-archives:
 clean-all: clean clean-stats
 
 clean-stats:
-	@$(RMDIR) $(statsdir)
+	@$(MAKE) -C docs clean-stats
 
 ## Release management ################################################
 
 texi:
-	@$(MAKE) -C Documentation texi
+	@$(MAKE) -C docs texi
 
 stats:
-	@$(MAKE) -C Documentation stats
+	@$(MAKE) -C docs stats
 
 authors:
-	@$(MAKE) -C Documentation authors
+	@$(MAKE) -C docs authors
 	@git commit --gpg-sign -m "AUTHORS.md: Update list of contributors" \
-	-o -- Documentation/AUTHORS.md
+	-o -- docs/AUTHORS.md
 	@git show --pretty= -p HEAD
 
 publish-stats:
-	@$(MAKE) -C Documentation publish-stats
+	@$(MAKE) -C docs publish-stats
 
 publish-manuals:
-	@$(MAKE) -C Documentation publish-manuals
+	@$(MAKE) -C docs publish-manuals
 
 release-manuals:
-	@$(MAKE) -C Documentation release-manuals
+	@$(MAKE) -C docs release-manuals
 
 dist: magit-$(VERSION).tar.gz
 
@@ -179,9 +179,9 @@ versionlib:
 
 DIST_ROOT_FILES = LICENSE default.mk Makefile README.md
 DIST_LISP_FILES = $(addprefix lisp/,$(ELS) magit-version.el Makefile)
-DIST_DOCS_FILES = $(addprefix Documentation/,$(TEXIPAGES) AUTHORS.md Makefile)
-ifneq ("$(wildcard Documentation/RelNotes/$(VERSION).txt)","")
-  DIST_DOCS_FILES += Documentation/RelNotes/$(VERSION).txt
+DIST_DOCS_FILES = $(addprefix docs/,$(TEXIPAGES) AUTHORS.md Makefile)
+ifneq ("$(wildcard docs/RelNotes/$(VERSION).txt)","")
+  DIST_DOCS_FILES += docs/RelNotes/$(VERSION).txt
 endif
 
 magit-$(VERSION).tar.gz: lisp versionlib info
@@ -190,8 +190,8 @@ magit-$(VERSION).tar.gz: lisp versionlib info
 	@$(CP) $(DIST_ROOT_FILES) magit-$(VERSION)
 	@$(MKDIR) magit-$(VERSION)/lisp
 	@$(CP) $(DIST_LISP_FILES) magit-$(VERSION)/lisp
-	@$(MKDIR) magit-$(VERSION)/Documentation
-	@$(CP) $(DIST_DOCS_FILES) magit-$(VERSION)/Documentation
+	@$(MKDIR) magit-$(VERSION)/docs
+	@$(CP) $(DIST_DOCS_FILES) magit-$(VERSION)/docs
 	@$(TAR) cz --mtime=./magit-$(VERSION) -f magit-$(VERSION).tar.gz magit-$(VERSION)
 	@$(RMDIR) magit-$(VERSION)
 
diff --git a/RelNotes.org b/RelNotes.org
index 0c663f1..abf8b62 120000
--- a/RelNotes.org
+++ b/RelNotes.org
@@ -1 +1 @@
-Documentation/RelNotes/3.4.0.org
-\ No newline at end of file
+docs/RelNotes/3.4.0.org
+\ No newline at end of file
diff --git a/default.mk b/default.mk
index b594782..b5abc1d 100644
--- a/default.mk
+++ b/default.mk
@@ -18,7 +18,8 @@ sharedir ?= $(PREFIX)/share
 lispdir  ?= $(sharedir)/emacs/site-lisp/magit
 infodir  ?= $(sharedir)/info
 docdir   ?= $(sharedir)/doc/magit
-statsdir ?= $(TOP)/Documentation/stats
+
+STATSDIR ?= $(TOP)docs/stats
 
 CP       ?= install -p -m 644
 MKDIR    ?= install -p -m 755 -d
diff --git a/Documentation/AUTHORS.md b/docs/AUTHORS.md
index b907942..b907942 100644
--- a/Documentation/AUTHORS.md
+++ b/docs/AUTHORS.md
diff --git a/Documentation/BACKERS.md b/docs/BACKERS.md
index 847fc22..847fc22 100644
--- a/Documentation/BACKERS.md
+++ b/docs/BACKERS.md
diff --git a/Documentation/Makefile b/docs/Makefile
index 7034cb4..00ce2cd 100644
--- a/Documentation/Makefile
+++ b/docs/Makefile
@@ -77,10 +77,13 @@ install-info: info
 ## Clean #############################################################
 
 clean:
-	@printf "Cleaning Documentation/*...\n"
+	@printf "Cleaning docs/*...\n"
 	@$(RMDIR) dir $(INFOPAGES) $(HTMLFILES) $(HTMLDIRS) $(PDFFILES)
 	@$(RMDIR) $(EPUBFILES) $(EPUBTRASH)
 
+clean-stats:
+	@$(RMDIR) $(statsdir)
+
 ## Release management ################################################
 
 ORG_ARGS  = --batch -Q $(ORG_LOAD_PATH) -l ox-texinfo+
@@ -107,7 +110,7 @@ texi:
 
 stats:
 	@printf "Generating statistics\n"
-	@gitstats -c style=https://magit.vc/assets/stats.css -c max_authors=999 $(TOP) $(statsdir)
+	@gitstats -c style=https://magit.vc/assets/stats.css -c max_authors=999 $(TOP) $(STATSDIR)
 
 authors: AUTHORS.md
 
@@ -136,7 +139,7 @@ space := $(empty) $(empty)
 
 publish-stats: stats
 	@printf "Uploading statistics...\n"
-	@aws s3 sync $(statsdir) $(S3_BUCKET)/stats/
+	@aws s3 sync $(STATSDIR) $(S3_BUCKET)/stats/
 	@printf "Uploaded to $(PUBLISH_URL)/stats/\n"
 	@printf "Generating CDN invalidation\n"
 	@aws cloudfront create-invalidation \
diff --git a/Documentation/RelNotes/0.5.1.txt b/docs/RelNotes/0.5.1.txt
index d08cdb0..d08cdb0 100644
--- a/Documentation/RelNotes/0.5.1.txt
+++ b/docs/RelNotes/0.5.1.txt
diff --git a/Documentation/RelNotes/0.6.1.txt b/docs/RelNotes/0.6.1.txt
index a58c3ba..a58c3ba 100644
--- a/Documentation/RelNotes/0.6.1.txt
+++ b/docs/RelNotes/0.6.1.txt
diff --git a/Documentation/RelNotes/0.7.0.txt b/docs/RelNotes/0.7.0.txt
index d035539..d035539 100644
--- a/Documentation/RelNotes/0.7.0.txt
+++ b/docs/RelNotes/0.7.0.txt
diff --git a/Documentation/RelNotes/0.8.0.txt b/docs/RelNotes/0.8.0.txt
index 3ce415f..3ce415f 100644
--- a/Documentation/RelNotes/0.8.0.txt
+++ b/docs/RelNotes/0.8.0.txt
diff --git a/Documentation/RelNotes/0.8.1.txt b/docs/RelNotes/0.8.1.txt
index 95b204f..95b204f 100644
--- a/Documentation/RelNotes/0.8.1.txt
+++ b/docs/RelNotes/0.8.1.txt
diff --git a/Documentation/RelNotes/0.8.2.txt b/docs/RelNotes/0.8.2.txt
index 9367486..9367486 100644
--- a/Documentation/RelNotes/0.8.2.txt
+++ b/docs/RelNotes/0.8.2.txt
diff --git a/Documentation/RelNotes/1.0.0.txt b/docs/RelNotes/1.0.0.txt
index 92f9175..92f9175 100644
--- a/Documentation/RelNotes/1.0.0.txt
+++ b/docs/RelNotes/1.0.0.txt
diff --git a/Documentation/RelNotes/1.1.0.txt b/docs/RelNotes/1.1.0.txt
index 0e1c1fb..0e1c1fb 100644
--- a/Documentation/RelNotes/1.1.0.txt
+++ b/docs/RelNotes/1.1.0.txt
diff --git a/Documentation/RelNotes/1.1.1.txt b/docs/RelNotes/1.1.1.txt
index 21b3baf..21b3baf 100644
--- a/Documentation/RelNotes/1.1.1.txt
+++ b/docs/RelNotes/1.1.1.txt
diff --git a/Documentation/RelNotes/1.1.2.txt b/docs/RelNotes/1.1.2.txt
index 4950edc..4950edc 100644
--- a/Documentation/RelNotes/1.1.2.txt
+++ b/docs/RelNotes/1.1.2.txt
diff --git a/Documentation/RelNotes/1.2.0.txt b/docs/RelNotes/1.2.0.txt
index b27f259..b27f259 100644
--- a/Documentation/RelNotes/1.2.0.txt
+++ b/docs/RelNotes/1.2.0.txt
diff --git a/Documentation/RelNotes/1.2.1.txt b/docs/RelNotes/1.2.1.txt
index 6e255bf..6e255bf 100644
--- a/Documentation/RelNotes/1.2.1.txt
+++ b/docs/RelNotes/1.2.1.txt
diff --git a/Documentation/RelNotes/1.2.2.txt b/docs/RelNotes/1.2.2.txt
index e529dc9..e529dc9 100644
--- a/Documentation/RelNotes/1.2.2.txt
+++ b/docs/RelNotes/1.2.2.txt
diff --git a/Documentation/RelNotes/1.4.0.txt b/docs/RelNotes/1.4.0.txt
index f0f8d9e..f0f8d9e 100644
--- a/Documentation/RelNotes/1.4.0.txt
+++ b/docs/RelNotes/1.4.0.txt
diff --git a/Documentation/RelNotes/1.4.1.txt b/docs/RelNotes/1.4.1.txt
index 15dc747..15dc747 100644
--- a/Documentation/RelNotes/1.4.1.txt
+++ b/docs/RelNotes/1.4.1.txt
diff --git a/Documentation/RelNotes/1.4.2.txt b/docs/RelNotes/1.4.2.txt
index b50f1a8..b50f1a8 100644
--- a/Documentation/RelNotes/1.4.2.txt
+++ b/docs/RelNotes/1.4.2.txt
diff --git a/Documentation/RelNotes/2.1.0.txt b/docs/RelNotes/2.1.0.txt
index 85e8d41..85e8d41 100644
--- a/Documentation/RelNotes/2.1.0.txt
+++ b/docs/RelNotes/2.1.0.txt
diff --git a/Documentation/RelNotes/2.10.0.txt b/docs/RelNotes/2.10.0.txt
index 6b6e5ac..6b6e5ac 100644
--- a/Documentation/RelNotes/2.10.0.txt
+++ b/docs/RelNotes/2.10.0.txt
diff --git a/Documentation/RelNotes/2.10.1.txt b/docs/RelNotes/2.10.1.txt
index 7f90600..7f90600 100644
--- a/Documentation/RelNotes/2.10.1.txt
+++ b/docs/RelNotes/2.10.1.txt
diff --git a/Documentation/RelNotes/2.10.2.txt b/docs/RelNotes/2.10.2.txt
index bcaa040..bcaa040 100644
--- a/Documentation/RelNotes/2.10.2.txt
+++ b/docs/RelNotes/2.10.2.txt
diff --git a/Documentation/RelNotes/2.10.3.txt b/docs/RelNotes/2.10.3.txt
index 1a77c40..1a77c40 100644
--- a/Documentation/RelNotes/2.10.3.txt
+++ b/docs/RelNotes/2.10.3.txt
diff --git a/Documentation/RelNotes/2.11.0.txt b/docs/RelNotes/2.11.0.txt
index 1cd9694..1cd9694 100644
--- a/Documentation/RelNotes/2.11.0.txt
+++ b/docs/RelNotes/2.11.0.txt
diff --git a/Documentation/RelNotes/2.12.0.txt b/docs/RelNotes/2.12.0.txt
index d871732..d871732 100644
--- a/Documentation/RelNotes/2.12.0.txt
+++ b/docs/RelNotes/2.12.0.txt
diff --git a/Documentation/RelNotes/2.12.1.txt b/docs/RelNotes/2.12.1.txt
index a7e0971..a7e0971 100644
--- a/Documentation/RelNotes/2.12.1.txt
+++ b/docs/RelNotes/2.12.1.txt
diff --git a/Documentation/RelNotes/2.13.0.txt b/docs/RelNotes/2.13.0.txt
index cbb07c7..cbb07c7 100644
--- a/Documentation/RelNotes/2.13.0.txt
+++ b/docs/RelNotes/2.13.0.txt
diff --git a/Documentation/RelNotes/2.13.1.txt b/docs/RelNotes/2.13.1.txt
index 3447dab..3447dab 100644
--- a/Documentation/RelNotes/2.13.1.txt
+++ b/docs/RelNotes/2.13.1.txt
diff --git a/Documentation/RelNotes/2.2.0.txt b/docs/RelNotes/2.2.0.txt
index 2b77c4a..2b77c4a 100644
--- a/Documentation/RelNotes/2.2.0.txt
+++ b/docs/RelNotes/2.2.0.txt
diff --git a/Documentation/RelNotes/2.2.1.txt b/docs/RelNotes/2.2.1.txt
index 11771bf..11771bf 100644
--- a/Documentation/RelNotes/2.2.1.txt
+++ b/docs/RelNotes/2.2.1.txt
diff --git a/Documentation/RelNotes/2.2.2.txt b/docs/RelNotes/2.2.2.txt
index 1d5ec52..1d5ec52 100644
--- a/Documentation/RelNotes/2.2.2.txt
+++ b/docs/RelNotes/2.2.2.txt
diff --git a/Documentation/RelNotes/2.3.0.txt b/docs/RelNotes/2.3.0.txt
index fa7d822..fa7d822 100644
--- a/Documentation/RelNotes/2.3.0.txt
+++ b/docs/RelNotes/2.3.0.txt
diff --git a/Documentation/RelNotes/2.3.1.txt b/docs/RelNotes/2.3.1.txt
index b1d1291..b1d1291 100644
--- a/Documentation/RelNotes/2.3.1.txt
+++ b/docs/RelNotes/2.3.1.txt
diff --git a/Documentation/RelNotes/2.4.0.txt b/docs/RelNotes/2.4.0.txt
index bedd075..bedd075 100644
--- a/Documentation/RelNotes/2.4.0.txt
+++ b/docs/RelNotes/2.4.0.txt
diff --git a/Documentation/RelNotes/2.4.1.txt b/docs/RelNotes/2.4.1.txt
index 872a6df..872a6df 100644
--- a/Documentation/RelNotes/2.4.1.txt
+++ b/docs/RelNotes/2.4.1.txt
diff --git a/Documentation/RelNotes/2.5.0.txt b/docs/RelNotes/2.5.0.txt
index cce9fed..cce9fed 100644
--- a/Documentation/RelNotes/2.5.0.txt
+++ b/docs/RelNotes/2.5.0.txt
diff --git a/Documentation/RelNotes/2.6.0.txt b/docs/RelNotes/2.6.0.txt
index c58fdc2..c58fdc2 100644
--- a/Documentation/RelNotes/2.6.0.txt
+++ b/docs/RelNotes/2.6.0.txt
diff --git a/Documentation/RelNotes/2.6.1.txt b/docs/RelNotes/2.6.1.txt
index 075f1c0..075f1c0 100644
--- a/Documentation/RelNotes/2.6.1.txt
+++ b/docs/RelNotes/2.6.1.txt
diff --git a/Documentation/RelNotes/2.6.2.txt b/docs/RelNotes/2.6.2.txt
index 9433128..9433128 100644
--- a/Documentation/RelNotes/2.6.2.txt
+++ b/docs/RelNotes/2.6.2.txt
diff --git a/Documentation/RelNotes/2.7.0.txt b/docs/RelNotes/2.7.0.txt
index 310878a..310878a 100644
--- a/Documentation/RelNotes/2.7.0.txt
+++ b/docs/RelNotes/2.7.0.txt
diff --git a/Documentation/RelNotes/2.8.0.txt b/docs/RelNotes/2.8.0.txt
index 2ca6b70..2ca6b70 100644
--- a/Documentation/RelNotes/2.8.0.txt
+++ b/docs/RelNotes/2.8.0.txt
diff --git a/Documentation/RelNotes/2.9.0.txt b/docs/RelNotes/2.9.0.txt
index 64353e5..64353e5 100644
--- a/Documentation/RelNotes/2.9.0.txt
+++ b/docs/RelNotes/2.9.0.txt
diff --git a/Documentation/RelNotes/2.90.0.org b/docs/RelNotes/2.90.0.org
index 671e0bc..671e0bc 100644
--- a/Documentation/RelNotes/2.90.0.org
+++ b/docs/RelNotes/2.90.0.org
diff --git a/Documentation/RelNotes/2.90.1.org b/docs/RelNotes/2.90.1.org
index 2c601f8..2c601f8 100644
--- a/Documentation/RelNotes/2.90.1.org
+++ b/docs/RelNotes/2.90.1.org
diff --git a/Documentation/RelNotes/3.0.0.org b/docs/RelNotes/3.0.0.org
index 0e384b4..0e384b4 100644
--- a/Documentation/RelNotes/3.0.0.org
+++ b/docs/RelNotes/3.0.0.org
diff --git a/Documentation/RelNotes/3.1.0.org b/docs/RelNotes/3.1.0.org
index 48b408b..48b408b 100644
--- a/Documentation/RelNotes/3.1.0.org
+++ b/docs/RelNotes/3.1.0.org
diff --git a/Documentation/RelNotes/3.2.0.org b/docs/RelNotes/3.2.0.org
index 198c4b7..198c4b7 100644
--- a/Documentation/RelNotes/3.2.0.org
+++ b/docs/RelNotes/3.2.0.org
diff --git a/Documentation/RelNotes/3.2.1.org b/docs/RelNotes/3.2.1.org
index 3e853ea..3e853ea 100644
--- a/Documentation/RelNotes/3.2.1.org
+++ b/docs/RelNotes/3.2.1.org
diff --git a/Documentation/RelNotes/3.3.0.org b/docs/RelNotes/3.3.0.org
index be74f19..be74f19 100644
--- a/Documentation/RelNotes/3.3.0.org
+++ b/docs/RelNotes/3.3.0.org
diff --git a/Documentation/RelNotes/3.4.0.org b/docs/RelNotes/3.4.0.org
index ad3d6c4..ad3d6c4 100644
--- a/Documentation/RelNotes/3.4.0.org
+++ b/docs/RelNotes/3.4.0.org
diff --git a/Documentation/htmlxref.cnf b/docs/htmlxref.cnf
index 54c3421..54c3421 100644
--- a/Documentation/htmlxref.cnf
+++ b/docs/htmlxref.cnf
diff --git a/Documentation/magit-section.org b/docs/magit-section.org
index 6828408..6828408 100644
--- a/Documentation/magit-section.org
+++ b/docs/magit-section.org
diff --git a/Documentation/magit-section.texi b/docs/magit-section.texi
index 3d357c6..3d357c6 100644
--- a/Documentation/magit-section.texi
+++ b/docs/magit-section.texi
diff --git a/Documentation/magit.org b/docs/magit.org
index a0ee5e1..a0ee5e1 100644
--- a/Documentation/magit.org
+++ b/docs/magit.org
diff --git a/Documentation/magit.texi b/docs/magit.texi
index 0091875..0091875 100644
--- a/Documentation/magit.texi
+++ b/docs/magit.texi