diff --git a/.gitignore b/.gitignore
index c879e0d2..959f6fdc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@
 .*.swp
 \#*
 
-build
+/build
 cov-int
 
 *.data
@@ -51,18 +51,9 @@ regressions/eformat-tests/*.txt
 *.cp*
 *.fn*
 *.log
-/src/doc/new-doc/*.lsp*
 *.toc
 *.tp*
 *.vr*
-/src/doc/new-doc/new-doc.pdf
-/src/doc/new-doc/ecldoc.info*
-/src/doc/new-doc/new-doc.ex
-/src/doc/new-doc/new-doc.exs
-/src/doc/new-doc/new-doc.ft
-/src/doc/new-doc/new-doc.fts
-/src/doc/new-doc/new-doc.cf
-/src/doc/new-doc/new-doc.cfs
 /examples/ecl_qt/qt/ecl_qtdemo
 /examples/ecl_qt/hello-lisp-system--all-systems.fasb
 /examples/ecl_qt/lisp-envi.a
@@ -97,7 +88,6 @@ regressions/eformat-tests/*.txt
 /msvc/rt.asd
 /msvc/sb-bsd-sockets.asd
 /msvc/sockets.asd
-doc/tmp/
 /src/tests/aux-compiler.0058-coerce.lsp
 /publications/
 /src/cmp/notes.md
diff --git a/Makefile.in b/Makefile.in
index 5f6982fb..005350f0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,7 +2,7 @@
 # DIST: make most of the changes to this file you might want, so try
 # DIST: that first.
 
-# make all	to compile and build Emacs.
+# make all	to compile and build ECL.
 # make install	to install it.
 # make TAGS	to update tags tables.
 #
@@ -51,13 +51,6 @@ infodir=@infodir@
 mandir=@mandir@
 libdir=@libdir@
 
-#  What to release
-TAR_CONTENTS=Makefile.in README.md LGPL ANNOUNCEMENT LICENSE doc \
-	configure src/c src/cmp src/clos src/CHANGELOG src/lsp src/doc \
-	src/h  src/gmp src/config* src/install.sh src/Makefile.in \
-	src/util contrib/ src/gc src/*.in src/*.m4 src/gabriel \
-	src/tests/Makefile.in msvc examples
-
 # ==================== Utility Programs for the Build ====================
 
 #  Allow the user to specify the install program.
@@ -126,11 +119,9 @@ check:
 
 TAR_DIR=ecl-$(VERSION)
 
-doc: build/doc/index.html
-	-mkdir doc
-	(cd build/doc; make html); cp build/doc/*.html doc
-build/doc/index.html:
-	cd build/doc; $(MAKE)
+doc:
+	$(MAKE) -C build/doc
+.PHONY: doc
 
 source-dist: $(TAR_DIR).tgz
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 350f9a90..f7cf3fa7 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -2,7 +2,7 @@
 # vim: set filetype=makefile tabstop=8 shiftwidth=4 expandtab:
 
 #
-# Makefile for ECoLisp
+# Makefile for ECL
 #
 top_srcdir= @top_srcdir@
 srcdir	= @srcdir@
@@ -238,9 +238,7 @@ install:
 	for i in LICENSE COPYING; do \
 	  $(INSTALL_DATA) $(top_srcdir)/../$$i $(DESTDIR)$(ecldir); \
 	done
-	$(mkinstalldirs) $(DESTDIR)$(mandir)/man$(manext)
-	$(INSTALL_DATA) doc/ecl.man $(DESTDIR)$(mandir)/man$(manext)/ecl.$(manext)
-	$(INSTALL_DATA) doc/ecl-config.man $(DESTDIR)$(mandir)/man$(manext)/ecl-config.$(manext)
+	$(MAKE) -C doc install
 
 flatinstall: build-stamp
 	$(MAKE) DESTDIR=$(DESTDIR) bindir=$(prefix) libdir=$(prefix) \
@@ -252,8 +250,7 @@ uninstall:
 			@SONAME@ @SONAME1@ @SONAME2@ @SONAME3@; do \
 	  $(RM) $(DESTDIR)$(libdir)/$$i || : ; \
 	done
-	$(RM) $(DESTDIR)$(mandir)/man$(manext)/ecl.$(manext)
-	$(RM) $(DESTDIR)$(mandir)/man$(manext)/ecl-config.$(manext)
+	$(MAKE) -C doc uninstall
 	$(RM) -r $(DESTDIR)$(includedir)/ecl $(DESTDIR)$(ecldir)
 
 clean: mostlyclean
diff --git a/src/configure b/src/configure
index 2aca24a7..a783e45c 100755
--- a/src/configure
+++ b/src/configure
@@ -737,7 +737,6 @@ infodir
 docdir
 oldincludedir
 includedir
-runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -864,7 +863,6 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1117,15 +1115,6 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
-  -runstatedir | --runstatedir | --runstatedi | --runstated \
-  | --runstate | --runstat | --runsta | --runst | --runs \
-  | --run | --ru | --r)
-    ac_prev=runstatedir ;;
-  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-  | --run=* | --ru=* | --r=*)
-    runstatedir=$ac_optarg ;;
-
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1263,7 +1252,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir runstatedir
+		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1416,7 +1405,6 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -3020,8 +3008,8 @@ boehm_configure_flags=""
 
 
 					                                                                                                                  TARGETS='bin/ecl$(EXE)'
-SUBDIRS=c
-                            LSP_FEATURES='*features*'
+SUBDIRS='c doc'
+                          LSP_FEATURES='*features*'
 
 
 # Make sure we can run config.sub.
diff --git a/src/configure.ac b/src/configure.ac
index 036bf7ef..aafd2490 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -321,7 +321,7 @@ AC_SUBST(SHARED_LDFLAGS)        dnl Flags for shared libraries linker
 AC_SUBST(BUNDLE_LDFLAGS)        dnl Flags for FASL files linker
 AC_SUBST(EXTRA_OBJS)            dnl Extra *.o files to be compiled into libecl.a
 AC_SUBST(TARGETS, ['bin/ecl$(EXE)'])dnl Versions of ECL to be built 
-AC_SUBST(SUBDIRS, [c])          dnl Subdirectories that make should process
+AC_SUBST(SUBDIRS, ['c doc'])        dnl Subdirectories that make should process
 AC_SUBST(LIBRARIES, [])         dnl GMP, Boehm's GC, etc
 AC_SUBST(LSP_LIBRARIES)         dnl Libraries produced by lisp translator
 AC_SUBST(LSP_FEATURES, ['*features*']) dnl Symbols to add to *FEATURES* for conditional compilation
diff --git a/src/doc/Makefile.in b/src/doc/Makefile.in
index ce9287d4..4502d261 100644
--- a/src/doc/Makefile.in
+++ b/src/doc/Makefile.in
@@ -16,127 +16,35 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_INFO = @INSTALL_INFO@
 mkinstalldirs = $(top_srcdir)/bdwgc/install-sh -d
-INFO_FILES = ecl.$(INFOEXT) ecldev.$(INFOEXT)
-HTML_FILES = index.html license.html lgpl.html news.html benchmark.html \
-	install.html download.html cvs.html
+INFO_FILE = ecl.$(INFOEXT)
 
 VERSION=@PACKAGE_VERSION@
 
-FILTER = sed 's,@VERSION@,$(VERSION),g'
+all: manual
+	$(MAKE) -C manual
 
-ECL = ../ecl
+manual:
+	cp -r $(srcdir)/manual .
 
-all: $(INFO_FILES)
-
-html: $(HTML_FILES)
-
-ecl.dvi: $(srcdir)/user.txi $(srcdir)/macros.txi clisp.sty ecl.sty
-	tex $(srcdir)/user.txi
-ecldev.dvi: $(srcdir)/devel.txi $(srcdir)/macros.txi clisp.sty ecl.sty
-	tex $(srcdir)/devel.txi
-
-ecl.ps: ecl.dvi $(srcdir)/macros.txi
-	dvips -o $@ ecl.dvi
-ecldev.ps: ecldev.dvi $(srcdir)/macros.txi
-	dvips -o $@ ecldev.dvi
-
-install: all
-	$(mkinstalldirs) $(DESTDIR)$(infodir)
-	for k in $(INFO_FILES); do \
-	  $(INSTALL_DATA) $$k $(DESTDIR)$(infodir); \
-	  if [ -x $(INSTALL_INFO) ]; then \
-	    $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $$k; \
-	  fi; \
-	done
-	$(mkinstalldirs) $(DESTDIR)$(docdir)
-	for i in LICENSE LGPL; do \
-	  $(INSTALL_DATA) $(top_srcdir)/../$$i $(DESTDIR)$(docdir); \
-	done
+install: install-manual
 	$(mkinstalldirs) $(DESTDIR)$(mandir)/man$(manext)
 	$(INSTALL_DATA) ecl.man $(DESTDIR)$(mandir)/man$(manext)/ecl.$(manext)
 	$(INSTALL_DATA) ecl-config.man $(DESTDIR)$(mandir)/man$(manext)/ecl-config.$(manext)
-flatinstall: all $(HTML_FILES)
-	$(mkinstalldirs) $(DESTDIR)$(docdir)
-	for k in $(INFO_FILES); do $(INSTALL_DATA) $$k $(DESTDIR)$(docdir); done
-	if [ -f user.html ]; then \
-	  $(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/; \
-	else \
-	  $(mkinstalldirs) $(DESTDIR)$(docdir)/ecl; \
-	  for i in ecl/*; do $(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/ecl/; done; \
-	fi
-	if [ -f devel.html ]; then \
-	  $(INSTALL_DATA) devel.html $(DESTDIR)$(docdir)/; \
-	else \
-	  $(mkinstalldirs) $(DESTDIR)$(docdir)/ecldev; \
-	  for i in ecldev/*; do $(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/ecldev/; done; \
-	fi
-	for i in LICENSE LGPL; do \
-	  $(INSTALL_DATA) $(top_srcdir)/../$$i $(DESTDIR)$(docdir); \
-	done
-	for i in *.html; do $(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/; done
 
-uninstall:
-	-for k in $(INFO_FILES); do \
-	  rm $$k; \
-	  if [ -x $(INSTALL_INFO) ]; then \
-	    $(INSTALL_INFO) --remove $$k; \
-	  fi; \
-	done
-	rm -r $(DESTDIR)$(infodir)/ecl.$(INFOEXT) $(DESTDIR)$(infodir)/ecldev.$(INFOEXT); \
-	rm $(DESTDIR)$(mandir)/man$(manext)/ecl.$(manext)
+install-manual: manual
+	$(MAKE) -C manual info
+	$(mkinstalldirs) $(DESTDIR)$(infodir)
+	gzip < manual/$(INFO_FILE) > manual/$(INFO_FILE).gz
+	$(INSTALL_DATA) manual/$(INFO_FILE).gz $(DESTDIR)$(infodir)
+	$(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) manual/$(INFO_FILE);
 
-head: developers_manual user_manual $(srcdir)/head
-	if [ -f ecl/index.html ]; then \
-	  sed -e 's,ecl/user.html,ecl/index.html,g' \
-	      -e 's,ecldev/devel.html,ecldev/index.html,g' $(srcdir)/head > head; \
-	else \
-	  cp $(srcdir)/head head; \
-	fi
-ecl.info.gz: ecl.info
-	gzip < ecl.info > ecl.info.gz
-ecldev.info.gz: ecldev.info
-	gzip < ecldev.info > ecldev.info.gz
-ecl.info: $(srcdir)/user.txi $(srcdir)/macros.txi
-	makeinfo -I $(srcdir) --no-split $(srcdir)/user.txi
-ecldev.info: $(srcdir)/devel.txi $(srcdir)/macros.txi
-	makeinfo -I $(srcdir) --no-split $(srcdir)/devel.txi
+uninstall: uninstall-manual
+	$(RM) $(DESTDIR)$(mandir)/man$(manext)/ecl.$(manext)
+	$(RM) $(DESTDIR)$(mandir)/man$(manext)/ecl-config.$(manext)
+
+uninstall-manual:
+	$(RM) $(DESTDIR)$(infodir)/$(INFO_FILE).gz
+	$(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) --remove manual/$(INFO_FILE);
 
-download.html: $(srcdir)/download.in.html head
-	cat head $(srcdir)/download.in.html $(srcdir)/end | $(FILTER) > $@
-index.html: $(srcdir)/index.in.html head
-	cat head $(srcdir)/index.in.html $(srcdir)/end | $(FILTER) > $@
-cvs.html: $(srcdir)/cvs.in.html head
-	cat head $(srcdir)/cvs.in.html $(srcdir)/end | $(FILTER) > $@
-install.html: $(srcdir)/install.in.html head
-	cat head $(srcdir)/install.in.html $(srcdir)/end | $(FILTER) > $@
-news.html: head $(srcdir)/../..ANNOUNCEMENT
-	(cat head; echo '<pre>'; cat $(srcdir)/../../ANNOUNCEMENT; echo '</pre>';\
-	 cat $(srcdir)/end) | $(FILTER) > $@
-benchmark.html: $(srcdir)/benchmark.in.html BENCHMARK head
-	(cat head; cat $(srcdir)/benchmark.in.html; \
-	 echo '<pre>'; cat BENCHMARK; echo '</pre>'; \
-	 cat $(srcdir)/end) | $(FILTER) > $@
-BENCHMARK:
-	echo "No benchmarks available" > $@
-license.html: $(top_srcdir)/../Copyright head
-	(cat head; \
-	 echo '<pre>'; cat $(top_srcdir)/../Copyright; echo '</pre>'; \
-	 cat $(srcdir)/end) | $(FILTER) > $@
-lgpl.html: $(top_srcdir)/../LGPL head
-	(cat head; \
-	 echo '<pre>'; cat $(top_srcdir)/../LGPL; echo '</pre>'; \
-	 cat $(srcdir)/end) | $(FILTER) > $@
-user_manual: $(srcdir)/user.txi $(srcdir)/macros.txi
-	echo "Producing ecl.html; ignore error messages."
-	test -d ecl || mkdir ecl; \
-	(makeinfo --output-indent=0 -I $(srcdir) --css-include=$(srcdir)/basic.css --html $(srcdir)/user.txi || \
-	 texi2html -I=$(srcdir) -subdir=ecl -split=chapter $(srcdir)/user.txi)  \
-	&& touch user_manual
-developers_manual: $(srcdir)/devel.txi $(srcdir)/macros.txi
-	echo "Producing ecldev.html; ignore error messages."
-	test -d ecldev || mkdir ecldev; \
-	(makeinfo --output-indent=0 -I $(srcdir) --css-include=$(srcdir)/basic.css --html $(srcdir)/devel.txi || \
-	 texi2html -I=$(srcdir) -subdir=ecldev -split=chapter $(srcdir)/devel.txi) \
-	&& touch developers_manual
 clean:
-	rm -r -f ecl ecldev ecl.info* ecldev.info* *.html user_manual developers_manual
+	$(MAKE) -C manual clean
diff --git a/src/doc/manual/.gitignore b/src/doc/manual/.gitignore
new file mode 100644
index 00000000..df080217
--- /dev/null
+++ b/src/doc/manual/.gitignore
@@ -0,0 +1,27 @@
+*.html
+*.info
+*.info-1
+*.info-2
+*.aux
+*.cf
+*.cfs
+*.cp
+*.cpp
+*.cpps
+*.cps
+*.ex
+*.exs
+*.fn
+*.fns
+*.ft
+*.fts
+*.log
+*.lsp
+*.lsps
+*.toc
+*.tp
+*.tps
+*.vr
+*.vrs
+*.pdf
+html
diff --git a/src/doc/manual/Makefile b/src/doc/manual/Makefile
new file mode 100644
index 00000000..c377f616
--- /dev/null
+++ b/src/doc/manual/Makefile
@@ -0,0 +1,24 @@
+FILES= *.txi */*.txi figures/*
+
+.PHONY: all pdf info html
+
+all: pdf info html
+
+pdf: manual.pdf
+info: ecl.info
+html: html/index.html
+
+manual.pdf: $(FILES)
+	texi2pdf manual.txi
+
+ecl.info: $(FILES)
+	makeinfo --no-split manual.txi
+
+html/index.html: $(FILES)
+	makeinfo --html --css-include=ecl.css --split=chapter manual.txi
+	rm -rf html
+	mv ecl html
+	cp -r figures html
+
+clean:
+	rm -rf *.{aux,cf,cfs,cp,cpp,cpps,cps,ex,exs,fn,fns,ft,fts,log,lsp,lsps,toc,tp,tps,vr,vrs,pdf,info,info-1,info-2,html} html
diff --git a/src/doc/new-doc/developer-guide/bytecodes.txi b/src/doc/manual/developer-guide/bytecodes.txi
similarity index 100%
rename from src/doc/new-doc/developer-guide/bytecodes.txi
rename to src/doc/manual/developer-guide/bytecodes.txi
diff --git a/src/doc/new-doc/developer-guide/compiler.txi b/src/doc/manual/developer-guide/compiler.txi
similarity index 100%
rename from src/doc/new-doc/developer-guide/compiler.txi
rename to src/doc/manual/developer-guide/compiler.txi
diff --git a/src/doc/new-doc/developer-guide/contributing-code-standards.txi b/src/doc/manual/developer-guide/contributing-code-standards.txi
similarity index 100%
rename from src/doc/new-doc/developer-guide/contributing-code-standards.txi
rename to src/doc/manual/developer-guide/contributing-code-standards.txi
diff --git a/src/doc/new-doc/developer-guide/contributing-documentation.txi b/src/doc/manual/developer-guide/contributing-documentation.txi
similarity index 100%
rename from src/doc/new-doc/developer-guide/contributing-documentation.txi
rename to src/doc/manual/developer-guide/contributing-documentation.txi
diff --git a/src/doc/new-doc/developer-guide/contributing.txi b/src/doc/manual/developer-guide/contributing.txi
similarity index 100%
rename from src/doc/new-doc/developer-guide/contributing.txi
rename to src/doc/manual/developer-guide/contributing.txi
diff --git a/src/doc/new-doc/developer-guide/dpp.txi b/src/doc/manual/developer-guide/dpp.txi
similarity index 100%
rename from src/doc/new-doc/developer-guide/dpp.txi
rename to src/doc/manual/developer-guide/dpp.txi
diff --git a/src/doc/new-doc/developer-guide/environment.txi b/src/doc/manual/developer-guide/environment.txi
similarity index 100%
rename from src/doc/new-doc/developer-guide/environment.txi
rename to src/doc/manual/developer-guide/environment.txi
diff --git a/src/doc/new-doc/developer-guide/index.txi b/src/doc/manual/developer-guide/index.txi
similarity index 100%
rename from src/doc/new-doc/developer-guide/index.txi
rename to src/doc/manual/developer-guide/index.txi
diff --git a/src/doc/new-doc/developer-guide/interpreter.txi b/src/doc/manual/developer-guide/interpreter.txi
similarity index 100%
rename from src/doc/new-doc/developer-guide/interpreter.txi
rename to src/doc/manual/developer-guide/interpreter.txi
diff --git a/src/doc/new-doc/developer-guide/objects.txi b/src/doc/manual/developer-guide/objects.txi
similarity index 100%
rename from src/doc/new-doc/developer-guide/objects.txi
rename to src/doc/manual/developer-guide/objects.txi
diff --git a/src/doc/new-doc/developer-guide/porting-ecl.txi b/src/doc/manual/developer-guide/porting-ecl.txi
similarity index 100%
rename from src/doc/new-doc/developer-guide/porting-ecl.txi
rename to src/doc/manual/developer-guide/porting-ecl.txi
diff --git a/src/doc/new-doc/developer-guide/removed.txi b/src/doc/manual/developer-guide/removed.txi
similarity index 100%
rename from src/doc/new-doc/developer-guide/removed.txi
rename to src/doc/manual/developer-guide/removed.txi
diff --git a/src/doc/new-doc/developer-guide/sources.txi b/src/doc/manual/developer-guide/sources.txi
similarity index 100%
rename from src/doc/new-doc/developer-guide/sources.txi
rename to src/doc/manual/developer-guide/sources.txi
diff --git a/src/doc/new-doc/developer-guide/system-properites.txi b/src/doc/manual/developer-guide/system-properites.txi
similarity index 100%
rename from src/doc/new-doc/developer-guide/system-properites.txi
rename to src/doc/manual/developer-guide/system-properites.txi
diff --git a/src/doc/new-doc/ecl.css b/src/doc/manual/ecl.css
similarity index 100%
rename from src/doc/new-doc/ecl.css
rename to src/doc/manual/ecl.css
diff --git a/src/doc/new-doc/extensions/building.txi b/src/doc/manual/extensions/building.txi
similarity index 100%
rename from src/doc/new-doc/extensions/building.txi
rename to src/doc/manual/extensions/building.txi
diff --git a/src/doc/manual/extensions/cdr-extensions.txi b/src/doc/manual/extensions/cdr-extensions.txi
new file mode 100644
index 00000000..b26d2839
--- /dev/null
+++ b/src/doc/manual/extensions/cdr-extensions.txi
@@ -0,0 +1,17 @@
+@node CDR Extensions
+@section CDR Extensions
+
+ECL currently implements the following specifications of the
+@url{https://common-lisp.net/project/cdr/, Common Lisp Document
+Repository}:
+
+@float Table, tab:cdr-extensions
+@caption{Implemented CDR extensions}
+@multitable @columnfractions .2 .8
+@headitem Number @tab Comments
+@item 1 @tab In @code{clos} package; partial implementation, @pxref{Meta-Object Protocol (MOP)}
+@item 5 @tab In @code{ext} package
+@item 7 @tab Only if ECL is compiled with @code{--with-cmuformat} configure option
+@item 14 @tab
+@end multitable
+@end float
diff --git a/src/doc/new-doc/extensions/ffi.txi b/src/doc/manual/extensions/ffi.txi
similarity index 100%
rename from src/doc/new-doc/extensions/ffi.txi
rename to src/doc/manual/extensions/ffi.txi
diff --git a/src/doc/new-doc/extensions/ffi_dffi.txi b/src/doc/manual/extensions/ffi_dffi.txi
similarity index 100%
rename from src/doc/new-doc/extensions/ffi_dffi.txi
rename to src/doc/manual/extensions/ffi_dffi.txi
diff --git a/src/doc/new-doc/extensions/ffi_sffi.txi b/src/doc/manual/extensions/ffi_sffi.txi
similarity index 100%
rename from src/doc/new-doc/extensions/ffi_sffi.txi
rename to src/doc/manual/extensions/ffi_sffi.txi
diff --git a/src/doc/new-doc/extensions/ffi_uffi.txi b/src/doc/manual/extensions/ffi_uffi.txi
similarity index 100%
rename from src/doc/new-doc/extensions/ffi_uffi.txi
rename to src/doc/manual/extensions/ffi_uffi.txi
diff --git a/src/doc/new-doc/extensions/gray-streams.txi b/src/doc/manual/extensions/gray-streams.txi
similarity index 100%
rename from src/doc/new-doc/extensions/gray-streams.txi
rename to src/doc/manual/extensions/gray-streams.txi
diff --git a/src/doc/new-doc/extensions/index.txi b/src/doc/manual/extensions/index.txi
similarity index 96%
rename from src/doc/new-doc/extensions/index.txi
rename to src/doc/manual/extensions/index.txi
index 2e25c6c4..7ccd6131 100644
--- a/src/doc/new-doc/extensions/index.txi
+++ b/src/doc/manual/extensions/index.txi
@@ -65,5 +65,4 @@
 @c Package extensions
 @include extensions/packages.txi
 
-@node CDR Extensions
-@section CDR Extensions
+@include extensions/cdr-extensions.txi
diff --git a/src/doc/new-doc/extensions/memory.txi b/src/doc/manual/extensions/memory.txi
similarity index 100%
rename from src/doc/new-doc/extensions/memory.txi
rename to src/doc/manual/extensions/memory.txi
diff --git a/src/doc/new-doc/extensions/memory_ref.txi b/src/doc/manual/extensions/memory_ref.txi
similarity index 100%
rename from src/doc/new-doc/extensions/memory_ref.txi
rename to src/doc/manual/extensions/memory_ref.txi
diff --git a/src/doc/new-doc/extensions/mop.txi b/src/doc/manual/extensions/mop.txi
similarity index 100%
rename from src/doc/new-doc/extensions/mop.txi
rename to src/doc/manual/extensions/mop.txi
diff --git a/src/doc/new-doc/extensions/mp.txi b/src/doc/manual/extensions/mp.txi
similarity index 100%
rename from src/doc/new-doc/extensions/mp.txi
rename to src/doc/manual/extensions/mp.txi
diff --git a/src/doc/new-doc/extensions/mp_ref_atomic.txi b/src/doc/manual/extensions/mp_ref_atomic.txi
similarity index 100%
rename from src/doc/new-doc/extensions/mp_ref_atomic.txi
rename to src/doc/manual/extensions/mp_ref_atomic.txi
diff --git a/src/doc/new-doc/extensions/mp_ref_barrier.txi b/src/doc/manual/extensions/mp_ref_barrier.txi
similarity index 100%
rename from src/doc/new-doc/extensions/mp_ref_barrier.txi
rename to src/doc/manual/extensions/mp_ref_barrier.txi
diff --git a/src/doc/new-doc/extensions/mp_ref_cv.txi b/src/doc/manual/extensions/mp_ref_cv.txi
similarity index 100%
rename from src/doc/new-doc/extensions/mp_ref_cv.txi
rename to src/doc/manual/extensions/mp_ref_cv.txi
diff --git a/src/doc/new-doc/extensions/mp_ref_mailbox.txi b/src/doc/manual/extensions/mp_ref_mailbox.txi
similarity index 100%
rename from src/doc/new-doc/extensions/mp_ref_mailbox.txi
rename to src/doc/manual/extensions/mp_ref_mailbox.txi
diff --git a/src/doc/new-doc/extensions/mp_ref_mutex.txi b/src/doc/manual/extensions/mp_ref_mutex.txi
similarity index 100%
rename from src/doc/new-doc/extensions/mp_ref_mutex.txi
rename to src/doc/manual/extensions/mp_ref_mutex.txi
diff --git a/src/doc/new-doc/extensions/mp_ref_process.txi b/src/doc/manual/extensions/mp_ref_process.txi
similarity index 100%
rename from src/doc/new-doc/extensions/mp_ref_process.txi
rename to src/doc/manual/extensions/mp_ref_process.txi
diff --git a/src/doc/new-doc/extensions/mp_ref_rwlock.txi b/src/doc/manual/extensions/mp_ref_rwlock.txi
similarity index 100%
rename from src/doc/new-doc/extensions/mp_ref_rwlock.txi
rename to src/doc/manual/extensions/mp_ref_rwlock.txi
diff --git a/src/doc/new-doc/extensions/mp_ref_sem.txi b/src/doc/manual/extensions/mp_ref_sem.txi
similarity index 100%
rename from src/doc/new-doc/extensions/mp_ref_sem.txi
rename to src/doc/manual/extensions/mp_ref_sem.txi
diff --git a/src/doc/new-doc/extensions/osi.txi b/src/doc/manual/extensions/osi.txi
similarity index 100%
rename from src/doc/new-doc/extensions/osi.txi
rename to src/doc/manual/extensions/osi.txi
diff --git a/src/doc/new-doc/extensions/packages.txi b/src/doc/manual/extensions/packages.txi
similarity index 100%
rename from src/doc/new-doc/extensions/packages.txi
rename to src/doc/manual/extensions/packages.txi
diff --git a/src/doc/new-doc/extensions/signals.txi b/src/doc/manual/extensions/signals.txi
similarity index 100%
rename from src/doc/new-doc/extensions/signals.txi
rename to src/doc/manual/extensions/signals.txi
diff --git a/src/doc/new-doc/figures/all-hierarchy.svg b/src/doc/manual/figures/all-hierarchy.svg
similarity index 100%
rename from src/doc/new-doc/figures/all-hierarchy.svg
rename to src/doc/manual/figures/all-hierarchy.svg
diff --git a/src/doc/new-doc/figures/ffi.png b/src/doc/manual/figures/ffi.png
similarity index 100%
rename from src/doc/new-doc/figures/ffi.png
rename to src/doc/manual/figures/ffi.png
diff --git a/src/doc/new-doc/figures/ffi.svg b/src/doc/manual/figures/ffi.svg
similarity index 100%
rename from src/doc/new-doc/figures/ffi.svg
rename to src/doc/manual/figures/ffi.svg
diff --git a/src/doc/new-doc/figures/file-types.png b/src/doc/manual/figures/file-types.png
similarity index 100%
rename from src/doc/new-doc/figures/file-types.png
rename to src/doc/manual/figures/file-types.png
diff --git a/src/doc/new-doc/figures/file-types.svg b/src/doc/manual/figures/file-types.svg
similarity index 100%
rename from src/doc/new-doc/figures/file-types.svg
rename to src/doc/manual/figures/file-types.svg
diff --git a/src/doc/new-doc/figures/immediate-types.png b/src/doc/manual/figures/immediate-types.png
similarity index 100%
rename from src/doc/new-doc/figures/immediate-types.png
rename to src/doc/manual/figures/immediate-types.png
diff --git a/src/doc/new-doc/figures/immediate-types.svg b/src/doc/manual/figures/immediate-types.svg
similarity index 100%
rename from src/doc/new-doc/figures/immediate-types.svg
rename to src/doc/manual/figures/immediate-types.svg
diff --git a/src/doc/new-doc/figures/kcl-hierarchy.png b/src/doc/manual/figures/kcl-hierarchy.png
similarity index 100%
rename from src/doc/new-doc/figures/kcl-hierarchy.png
rename to src/doc/manual/figures/kcl-hierarchy.png
diff --git a/src/doc/new-doc/figures/kcl-hierarchy.svg b/src/doc/manual/figures/kcl-hierarchy.svg
similarity index 100%
rename from src/doc/new-doc/figures/kcl-hierarchy.svg
rename to src/doc/manual/figures/kcl-hierarchy.svg
diff --git a/src/doc/new-doc/indexes/index.txi b/src/doc/manual/indexes/index.txi
similarity index 100%
rename from src/doc/new-doc/indexes/index.txi
rename to src/doc/manual/indexes/index.txi
diff --git a/src/doc/new-doc/introduction/about_ecl.txi b/src/doc/manual/introduction/about_ecl.txi
similarity index 100%
rename from src/doc/new-doc/introduction/about_ecl.txi
rename to src/doc/manual/introduction/about_ecl.txi
diff --git a/src/doc/new-doc/introduction/about_man.txi b/src/doc/manual/introduction/about_man.txi
similarity index 100%
rename from src/doc/new-doc/introduction/about_man.txi
rename to src/doc/manual/introduction/about_man.txi
diff --git a/src/doc/new-doc/introduction/copyrights.txi b/src/doc/manual/introduction/copyrights.txi
similarity index 100%
rename from src/doc/new-doc/introduction/copyrights.txi
rename to src/doc/manual/introduction/copyrights.txi
diff --git a/src/doc/new-doc/introduction/credits.txi b/src/doc/manual/introduction/credits.txi
similarity index 100%
rename from src/doc/new-doc/introduction/credits.txi
rename to src/doc/manual/introduction/credits.txi
diff --git a/src/doc/new-doc/introduction/history.txi b/src/doc/manual/introduction/history.txi
similarity index 100%
rename from src/doc/new-doc/introduction/history.txi
rename to src/doc/manual/introduction/history.txi
diff --git a/src/doc/new-doc/introduction/index.txi b/src/doc/manual/introduction/index.txi
similarity index 100%
rename from src/doc/new-doc/introduction/index.txi
rename to src/doc/manual/introduction/index.txi
diff --git a/src/doc/new-doc/macros.txi b/src/doc/manual/macros.txi
similarity index 100%
rename from src/doc/new-doc/macros.txi
rename to src/doc/manual/macros.txi
diff --git a/src/doc/new-doc/new-doc.txi b/src/doc/manual/manual.txi
similarity index 99%
rename from src/doc/new-doc/new-doc.txi
rename to src/doc/manual/manual.txi
index 5feee92c..f45b3fb6 100644
--- a/src/doc/new-doc/new-doc.txi
+++ b/src/doc/manual/manual.txi
@@ -1,6 +1,6 @@
 \input texinfo                  @c -*-texinfo-*-
 @c %**start of header
-@setfilename ecldoc.info
+@setfilename ecl.info
 @settitle ECL User's Guide
 @setchapternewpage odd
 @paragraphindent none
diff --git a/src/doc/new-doc/standards/arrays.txi b/src/doc/manual/standards/arrays.txi
similarity index 100%
rename from src/doc/new-doc/standards/arrays.txi
rename to src/doc/manual/standards/arrays.txi
diff --git a/src/doc/new-doc/standards/characters.txi b/src/doc/manual/standards/characters.txi
similarity index 100%
rename from src/doc/new-doc/standards/characters.txi
rename to src/doc/manual/standards/characters.txi
diff --git a/src/doc/new-doc/standards/conditions.txi b/src/doc/manual/standards/conditions.txi
similarity index 100%
rename from src/doc/new-doc/standards/conditions.txi
rename to src/doc/manual/standards/conditions.txi
diff --git a/src/doc/new-doc/standards/conses.txi b/src/doc/manual/standards/conses.txi
similarity index 100%
rename from src/doc/new-doc/standards/conses.txi
rename to src/doc/manual/standards/conses.txi
diff --git a/src/doc/new-doc/standards/data_and_control_flow.txi b/src/doc/manual/standards/data_and_control_flow.txi
similarity index 100%
rename from src/doc/new-doc/standards/data_and_control_flow.txi
rename to src/doc/manual/standards/data_and_control_flow.txi
diff --git a/src/doc/new-doc/standards/environment.txi b/src/doc/manual/standards/environment.txi
similarity index 100%
rename from src/doc/new-doc/standards/environment.txi
rename to src/doc/manual/standards/environment.txi
diff --git a/src/doc/new-doc/standards/evaluation.txi b/src/doc/manual/standards/evaluation.txi
similarity index 100%
rename from src/doc/new-doc/standards/evaluation.txi
rename to src/doc/manual/standards/evaluation.txi
diff --git a/src/doc/new-doc/standards/filenames.txi b/src/doc/manual/standards/filenames.txi
similarity index 100%
rename from src/doc/new-doc/standards/filenames.txi
rename to src/doc/manual/standards/filenames.txi
diff --git a/src/doc/new-doc/standards/files.txi b/src/doc/manual/standards/files.txi
similarity index 100%
rename from src/doc/new-doc/standards/files.txi
rename to src/doc/manual/standards/files.txi
diff --git a/src/doc/new-doc/standards/hashtables.txi b/src/doc/manual/standards/hashtables.txi
similarity index 100%
rename from src/doc/new-doc/standards/hashtables.txi
rename to src/doc/manual/standards/hashtables.txi
diff --git a/src/doc/new-doc/standards/index.txi b/src/doc/manual/standards/index.txi
similarity index 100%
rename from src/doc/new-doc/standards/index.txi
rename to src/doc/manual/standards/index.txi
diff --git a/src/doc/new-doc/standards/numbers.txi b/src/doc/manual/standards/numbers.txi
similarity index 100%
rename from src/doc/new-doc/standards/numbers.txi
rename to src/doc/manual/standards/numbers.txi
diff --git a/src/doc/new-doc/standards/objects.txi b/src/doc/manual/standards/objects.txi
similarity index 100%
rename from src/doc/new-doc/standards/objects.txi
rename to src/doc/manual/standards/objects.txi
diff --git a/src/doc/new-doc/standards/overview.txi b/src/doc/manual/standards/overview.txi
similarity index 100%
rename from src/doc/new-doc/standards/overview.txi
rename to src/doc/manual/standards/overview.txi
diff --git a/src/doc/new-doc/standards/packages.txi b/src/doc/manual/standards/packages.txi
similarity index 100%
rename from src/doc/new-doc/standards/packages.txi
rename to src/doc/manual/standards/packages.txi
diff --git a/src/doc/new-doc/standards/printer.txi b/src/doc/manual/standards/printer.txi
similarity index 100%
rename from src/doc/new-doc/standards/printer.txi
rename to src/doc/manual/standards/printer.txi
diff --git a/src/doc/new-doc/standards/reader.txi b/src/doc/manual/standards/reader.txi
similarity index 100%
rename from src/doc/new-doc/standards/reader.txi
rename to src/doc/manual/standards/reader.txi
diff --git a/src/doc/new-doc/standards/sequences.txi b/src/doc/manual/standards/sequences.txi
similarity index 100%
rename from src/doc/new-doc/standards/sequences.txi
rename to src/doc/manual/standards/sequences.txi
diff --git a/src/doc/new-doc/standards/streams.txi b/src/doc/manual/standards/streams.txi
similarity index 100%
rename from src/doc/new-doc/standards/streams.txi
rename to src/doc/manual/standards/streams.txi
diff --git a/src/doc/new-doc/standards/strings.txi b/src/doc/manual/standards/strings.txi
similarity index 100%
rename from src/doc/new-doc/standards/strings.txi
rename to src/doc/manual/standards/strings.txi
diff --git a/src/doc/new-doc/standards/structures.txi b/src/doc/manual/standards/structures.txi
similarity index 100%
rename from src/doc/new-doc/standards/structures.txi
rename to src/doc/manual/standards/structures.txi
diff --git a/src/doc/new-doc/standards/symbols.txi b/src/doc/manual/standards/symbols.txi
similarity index 100%
rename from src/doc/new-doc/standards/symbols.txi
rename to src/doc/manual/standards/symbols.txi
diff --git a/src/doc/new-doc/standards/sys-constr.txi b/src/doc/manual/standards/sys-constr.txi
similarity index 100%
rename from src/doc/new-doc/standards/sys-constr.txi
rename to src/doc/manual/standards/sys-constr.txi
diff --git a/src/doc/new-doc/standards/types_and_classes.txi b/src/doc/manual/standards/types_and_classes.txi
similarity index 100%
rename from src/doc/new-doc/standards/types_and_classes.txi
rename to src/doc/manual/standards/types_and_classes.txi
diff --git a/src/doc/status.org b/src/doc/manual/status.org
similarity index 100%
rename from src/doc/status.org
rename to src/doc/manual/status.org
diff --git a/src/doc/new-doc/user-guide/break-loop.txi b/src/doc/manual/user-guide/break-loop.txi
similarity index 100%
rename from src/doc/new-doc/user-guide/break-loop.txi
rename to src/doc/manual/user-guide/break-loop.txi
diff --git a/src/doc/new-doc/user-guide/building.txi b/src/doc/manual/user-guide/building.txi
similarity index 100%
rename from src/doc/new-doc/user-guide/building.txi
rename to src/doc/manual/user-guide/building.txi
diff --git a/src/doc/new-doc/user-guide/embedding.txi b/src/doc/manual/user-guide/embedding.txi
similarity index 100%
rename from src/doc/new-doc/user-guide/embedding.txi
rename to src/doc/manual/user-guide/embedding.txi
diff --git a/src/doc/new-doc/user-guide/index.txi b/src/doc/manual/user-guide/index.txi
similarity index 100%
rename from src/doc/new-doc/user-guide/index.txi
rename to src/doc/manual/user-guide/index.txi
diff --git a/src/doc/new-doc/user-guide/invoking.txi b/src/doc/manual/user-guide/invoking.txi
similarity index 100%
rename from src/doc/new-doc/user-guide/invoking.txi
rename to src/doc/manual/user-guide/invoking.txi
diff --git a/src/doc/new-doc/.gitignore b/src/doc/new-doc/.gitignore
deleted file mode 100644
index 0b84df0f..00000000
--- a/src/doc/new-doc/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.html
\ No newline at end of file
diff --git a/src/doc/new-doc/Makefile b/src/doc/new-doc/Makefile
deleted file mode 100644
index f5861002..00000000
--- a/src/doc/new-doc/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-FILES= *.txi */*.txi figures/*
-
-.PHONY: all pdf info html
-
-all: pdf info html
-
-pdf: new-doc.pdf
-info: ecldoc.info
-html: ecldoc
-
-new-doc.pdf: $(FILES)
-	texi2pdf new-doc.txi
-
-ecldoc.info: $(FILES)
-	makeinfo new-doc.txi
-
-ecldoc: $(FILES)
-	makeinfo --html --css-include=ecl.css --split=chapter new-doc.txi
-	cp -r figures ecldoc
-
-clean:
-	rm -rf *.{aux,cf,cfs,cp,cpp,cpps,cps,ex,exs,fn,fns,ft,fts,log,lsp,lsps,toc,tp,tps,vr,vrs,pdf,info,html}
diff --git a/doc/.gitignore b/src/doc/old-manual/.gitignore
similarity index 100%
rename from doc/.gitignore
rename to src/doc/old-manual/.gitignore
diff --git a/doc/COPYING.GFDL b/src/doc/old-manual/COPYING.GFDL
similarity index 100%
rename from doc/COPYING.GFDL
rename to src/doc/old-manual/COPYING.GFDL
diff --git a/doc/Makefile b/src/doc/old-manual/Makefile
similarity index 100%
rename from doc/Makefile
rename to src/doc/old-manual/Makefile
diff --git a/doc/README b/src/doc/old-manual/README
similarity index 100%
rename from doc/README
rename to src/doc/old-manual/README
diff --git a/doc/ansi_arrays.xml b/src/doc/old-manual/ansi_arrays.xml
similarity index 100%
rename from doc/ansi_arrays.xml
rename to src/doc/old-manual/ansi_arrays.xml
diff --git a/doc/ansi_characters.xml b/src/doc/old-manual/ansi_characters.xml
similarity index 100%
rename from doc/ansi_characters.xml
rename to src/doc/old-manual/ansi_characters.xml
diff --git a/doc/ansi_conditions.xml b/src/doc/old-manual/ansi_conditions.xml
similarity index 100%
rename from doc/ansi_conditions.xml
rename to src/doc/old-manual/ansi_conditions.xml
diff --git a/doc/ansi_conses.xml b/src/doc/old-manual/ansi_conses.xml
similarity index 100%
rename from doc/ansi_conses.xml
rename to src/doc/old-manual/ansi_conses.xml
diff --git a/doc/ansi_data_flow.xml b/src/doc/old-manual/ansi_data_flow.xml
similarity index 100%
rename from doc/ansi_data_flow.xml
rename to src/doc/old-manual/ansi_data_flow.xml
diff --git a/doc/ansi_environment.xml b/src/doc/old-manual/ansi_environment.xml
similarity index 100%
rename from doc/ansi_environment.xml
rename to src/doc/old-manual/ansi_environment.xml
diff --git a/doc/ansi_evaluation.xml b/src/doc/old-manual/ansi_evaluation.xml
similarity index 100%
rename from doc/ansi_evaluation.xml
rename to src/doc/old-manual/ansi_evaluation.xml
diff --git a/doc/ansi_filenames.xml b/src/doc/old-manual/ansi_filenames.xml
similarity index 100%
rename from doc/ansi_filenames.xml
rename to src/doc/old-manual/ansi_filenames.xml
diff --git a/doc/ansi_files.xml b/src/doc/old-manual/ansi_files.xml
similarity index 100%
rename from doc/ansi_files.xml
rename to src/doc/old-manual/ansi_files.xml
diff --git a/doc/ansi_hash_tables.xml b/src/doc/old-manual/ansi_hash_tables.xml
similarity index 100%
rename from doc/ansi_hash_tables.xml
rename to src/doc/old-manual/ansi_hash_tables.xml
diff --git a/doc/ansi_numbers.xml b/src/doc/old-manual/ansi_numbers.xml
similarity index 100%
rename from doc/ansi_numbers.xml
rename to src/doc/old-manual/ansi_numbers.xml
diff --git a/doc/ansi_objects.xml b/src/doc/old-manual/ansi_objects.xml
similarity index 100%
rename from doc/ansi_objects.xml
rename to src/doc/old-manual/ansi_objects.xml
diff --git a/doc/ansi_overview.xml b/src/doc/old-manual/ansi_overview.xml
similarity index 100%
rename from doc/ansi_overview.xml
rename to src/doc/old-manual/ansi_overview.xml
diff --git a/doc/ansi_packages.xml b/src/doc/old-manual/ansi_packages.xml
similarity index 100%
rename from doc/ansi_packages.xml
rename to src/doc/old-manual/ansi_packages.xml
diff --git a/doc/ansi_printer.xml b/src/doc/old-manual/ansi_printer.xml
similarity index 100%
rename from doc/ansi_printer.xml
rename to src/doc/old-manual/ansi_printer.xml
diff --git a/doc/ansi_reader.xml b/src/doc/old-manual/ansi_reader.xml
similarity index 100%
rename from doc/ansi_reader.xml
rename to src/doc/old-manual/ansi_reader.xml
diff --git a/doc/ansi_sequences.xml b/src/doc/old-manual/ansi_sequences.xml
similarity index 100%
rename from doc/ansi_sequences.xml
rename to src/doc/old-manual/ansi_sequences.xml
diff --git a/doc/ansi_streams.xml b/src/doc/old-manual/ansi_streams.xml
similarity index 100%
rename from doc/ansi_streams.xml
rename to src/doc/old-manual/ansi_streams.xml
diff --git a/doc/ansi_strings.xml b/src/doc/old-manual/ansi_strings.xml
similarity index 100%
rename from doc/ansi_strings.xml
rename to src/doc/old-manual/ansi_strings.xml
diff --git a/doc/ansi_structures.xml b/src/doc/old-manual/ansi_structures.xml
similarity index 100%
rename from doc/ansi_structures.xml
rename to src/doc/old-manual/ansi_structures.xml
diff --git a/doc/ansi_symbols.xml b/src/doc/old-manual/ansi_symbols.xml
similarity index 100%
rename from doc/ansi_symbols.xml
rename to src/doc/old-manual/ansi_symbols.xml
diff --git a/doc/ansi_system_construction.xml b/src/doc/old-manual/ansi_system_construction.xml
similarity index 100%
rename from doc/ansi_system_construction.xml
rename to src/doc/old-manual/ansi_system_construction.xml
diff --git a/doc/ansi_types.xml b/src/doc/old-manual/ansi_types.xml
similarity index 100%
rename from doc/ansi_types.xml
rename to src/doc/old-manual/ansi_types.xml
diff --git a/doc/asdf.xmlf b/src/doc/old-manual/asdf.xmlf
similarity index 100%
rename from doc/asdf.xmlf
rename to src/doc/old-manual/asdf.xmlf
diff --git a/doc/bibliography.xmlf b/src/doc/old-manual/bibliography.xmlf
similarity index 100%
rename from doc/bibliography.xmlf
rename to src/doc/old-manual/bibliography.xmlf
diff --git a/doc/clos.xmlf b/src/doc/old-manual/clos.xmlf
similarity index 100%
rename from doc/clos.xmlf
rename to src/doc/old-manual/clos.xmlf
diff --git a/doc/compiler.xmlf b/src/doc/old-manual/compiler.xmlf
similarity index 100%
rename from doc/compiler.xmlf
rename to src/doc/old-manual/compiler.xmlf
diff --git a/doc/copyright.xmlf b/src/doc/old-manual/copyright.xmlf
similarity index 100%
rename from doc/copyright.xmlf
rename to src/doc/old-manual/copyright.xmlf
diff --git a/doc/declarations.xmlf b/src/doc/old-manual/declarations.xmlf
similarity index 100%
rename from doc/declarations.xmlf
rename to src/doc/old-manual/declarations.xmlf
diff --git a/doc/discarded.xmlf b/src/doc/old-manual/discarded.xmlf
similarity index 100%
rename from doc/discarded.xmlf
rename to src/doc/old-manual/discarded.xmlf
diff --git a/doc/ecl.css b/src/doc/old-manual/ecl.css
similarity index 100%
rename from doc/ecl.css
rename to src/doc/old-manual/ecl.css
diff --git a/doc/ecl.ent b/src/doc/old-manual/ecl.ent
similarity index 100%
rename from doc/ecl.ent
rename to src/doc/old-manual/ecl.ent
diff --git a/doc/ecl.html b/src/doc/old-manual/ecl.html
similarity index 100%
rename from doc/ecl.html
rename to src/doc/old-manual/ecl.html
diff --git a/doc/ecl.xml b/src/doc/old-manual/ecl.xml
similarity index 100%
rename from doc/ecl.xml
rename to src/doc/old-manual/ecl.xml
diff --git a/doc/ecldev.xmlf b/src/doc/old-manual/ecldev.xmlf
similarity index 100%
rename from doc/ecldev.xmlf
rename to src/doc/old-manual/ecldev.xmlf
diff --git a/doc/emacs.el b/src/doc/old-manual/emacs.el
similarity index 100%
rename from doc/emacs.el
rename to src/doc/old-manual/emacs.el
diff --git a/doc/embed.xmlf b/src/doc/old-manual/embed.xmlf
similarity index 100%
rename from doc/embed.xmlf
rename to src/doc/old-manual/embed.xmlf
diff --git a/doc/ffi.xmlf b/src/doc/old-manual/ffi.xmlf
similarity index 100%
rename from doc/ffi.xmlf
rename to src/doc/old-manual/ffi.xmlf
diff --git a/doc/figures/ffi.pdf b/src/doc/old-manual/figures/ffi.pdf
similarity index 100%
rename from doc/figures/ffi.pdf
rename to src/doc/old-manual/figures/ffi.pdf
diff --git a/doc/figures/ffi.png b/src/doc/old-manual/figures/ffi.png
similarity index 100%
rename from doc/figures/ffi.png
rename to src/doc/old-manual/figures/ffi.png
diff --git a/doc/figures/hierarchy.fig b/src/doc/old-manual/figures/hierarchy.fig
similarity index 100%
rename from doc/figures/hierarchy.fig
rename to src/doc/old-manual/figures/hierarchy.fig
diff --git a/doc/figures/hierarchy.png b/src/doc/old-manual/figures/hierarchy.png
similarity index 100%
rename from doc/figures/hierarchy.png
rename to src/doc/old-manual/figures/hierarchy.png
diff --git a/doc/internals.xmlf b/src/doc/old-manual/internals.xmlf
similarity index 100%
rename from doc/internals.xmlf
rename to src/doc/old-manual/internals.xmlf
diff --git a/doc/interpreter.xmlf b/src/doc/old-manual/interpreter.xmlf
similarity index 100%
rename from doc/interpreter.xmlf
rename to src/doc/old-manual/interpreter.xmlf
diff --git a/doc/intro.xmlf b/src/doc/old-manual/intro.xmlf
similarity index 100%
rename from doc/intro.xmlf
rename to src/doc/old-manual/intro.xmlf
diff --git a/doc/io.xmlf b/src/doc/old-manual/io.xmlf
similarity index 100%
rename from doc/io.xmlf
rename to src/doc/old-manual/io.xmlf
diff --git a/doc/macros.xmlf b/src/doc/old-manual/macros.xmlf
similarity index 100%
rename from doc/macros.xmlf
rename to src/doc/old-manual/macros.xmlf
diff --git a/doc/memory.xmlf b/src/doc/old-manual/memory.xmlf
similarity index 100%
rename from doc/memory.xmlf
rename to src/doc/old-manual/memory.xmlf
diff --git a/doc/mop.xmlf b/src/doc/old-manual/mop.xmlf
similarity index 100%
rename from doc/mop.xmlf
rename to src/doc/old-manual/mop.xmlf
diff --git a/doc/mp.xmlf b/src/doc/old-manual/mp.xmlf
similarity index 100%
rename from doc/mp.xmlf
rename to src/doc/old-manual/mp.xmlf
diff --git a/doc/os.xmlf b/src/doc/old-manual/os.xmlf
similarity index 100%
rename from doc/os.xmlf
rename to src/doc/old-manual/os.xmlf
diff --git a/doc/pde.xmlf b/src/doc/old-manual/pde.xmlf
similarity index 100%
rename from doc/pde.xmlf
rename to src/doc/old-manual/pde.xmlf
diff --git a/doc/preface.xmlf b/src/doc/old-manual/preface.xmlf
similarity index 100%
rename from doc/preface.xmlf
rename to src/doc/old-manual/preface.xmlf
diff --git a/doc/ref_c_arrays.xml b/src/doc/old-manual/ref_c_arrays.xml
similarity index 100%
rename from doc/ref_c_arrays.xml
rename to src/doc/old-manual/ref_c_arrays.xml
diff --git a/doc/ref_c_characters.xml b/src/doc/old-manual/ref_c_characters.xml
similarity index 100%
rename from doc/ref_c_characters.xml
rename to src/doc/old-manual/ref_c_characters.xml
diff --git a/doc/ref_c_conditions.xml b/src/doc/old-manual/ref_c_conditions.xml
similarity index 100%
rename from doc/ref_c_conditions.xml
rename to src/doc/old-manual/ref_c_conditions.xml
diff --git a/doc/ref_c_conses.xml b/src/doc/old-manual/ref_c_conses.xml
similarity index 100%
rename from doc/ref_c_conses.xml
rename to src/doc/old-manual/ref_c_conses.xml
diff --git a/doc/ref_c_data_flow.xml b/src/doc/old-manual/ref_c_data_flow.xml
similarity index 100%
rename from doc/ref_c_data_flow.xml
rename to src/doc/old-manual/ref_c_data_flow.xml
diff --git a/doc/ref_c_environment.xml b/src/doc/old-manual/ref_c_environment.xml
similarity index 100%
rename from doc/ref_c_environment.xml
rename to src/doc/old-manual/ref_c_environment.xml
diff --git a/doc/ref_c_evaluation.xml b/src/doc/old-manual/ref_c_evaluation.xml
similarity index 100%
rename from doc/ref_c_evaluation.xml
rename to src/doc/old-manual/ref_c_evaluation.xml
diff --git a/doc/ref_c_filenames.xml b/src/doc/old-manual/ref_c_filenames.xml
similarity index 100%
rename from doc/ref_c_filenames.xml
rename to src/doc/old-manual/ref_c_filenames.xml
diff --git a/doc/ref_c_files.xml b/src/doc/old-manual/ref_c_files.xml
similarity index 100%
rename from doc/ref_c_files.xml
rename to src/doc/old-manual/ref_c_files.xml
diff --git a/doc/ref_c_hash_tables.xml b/src/doc/old-manual/ref_c_hash_tables.xml
similarity index 100%
rename from doc/ref_c_hash_tables.xml
rename to src/doc/old-manual/ref_c_hash_tables.xml
diff --git a/doc/ref_c_numbers.xml b/src/doc/old-manual/ref_c_numbers.xml
similarity index 100%
rename from doc/ref_c_numbers.xml
rename to src/doc/old-manual/ref_c_numbers.xml
diff --git a/doc/ref_c_objects.xml b/src/doc/old-manual/ref_c_objects.xml
similarity index 100%
rename from doc/ref_c_objects.xml
rename to src/doc/old-manual/ref_c_objects.xml
diff --git a/doc/ref_c_packages.xml b/src/doc/old-manual/ref_c_packages.xml
similarity index 100%
rename from doc/ref_c_packages.xml
rename to src/doc/old-manual/ref_c_packages.xml
diff --git a/doc/ref_c_printer.xml b/src/doc/old-manual/ref_c_printer.xml
similarity index 100%
rename from doc/ref_c_printer.xml
rename to src/doc/old-manual/ref_c_printer.xml
diff --git a/doc/ref_c_reader.xml b/src/doc/old-manual/ref_c_reader.xml
similarity index 100%
rename from doc/ref_c_reader.xml
rename to src/doc/old-manual/ref_c_reader.xml
diff --git a/doc/ref_c_sequences.xml b/src/doc/old-manual/ref_c_sequences.xml
similarity index 100%
rename from doc/ref_c_sequences.xml
rename to src/doc/old-manual/ref_c_sequences.xml
diff --git a/doc/ref_c_streams.xml b/src/doc/old-manual/ref_c_streams.xml
similarity index 100%
rename from doc/ref_c_streams.xml
rename to src/doc/old-manual/ref_c_streams.xml
diff --git a/doc/ref_c_strings.xml b/src/doc/old-manual/ref_c_strings.xml
similarity index 100%
rename from doc/ref_c_strings.xml
rename to src/doc/old-manual/ref_c_strings.xml
diff --git a/doc/ref_c_structures.xml b/src/doc/old-manual/ref_c_structures.xml
similarity index 100%
rename from doc/ref_c_structures.xml
rename to src/doc/old-manual/ref_c_structures.xml
diff --git a/doc/ref_c_symbols.xml b/src/doc/old-manual/ref_c_symbols.xml
similarity index 100%
rename from doc/ref_c_symbols.xml
rename to src/doc/old-manual/ref_c_symbols.xml
diff --git a/doc/ref_c_system_construction.xml b/src/doc/old-manual/ref_c_system_construction.xml
similarity index 100%
rename from doc/ref_c_system_construction.xml
rename to src/doc/old-manual/ref_c_system_construction.xml
diff --git a/doc/ref_c_types_and_classes.xml b/src/doc/old-manual/ref_c_types_and_classes.xml
similarity index 100%
rename from doc/ref_c_types_and_classes.xml
rename to src/doc/old-manual/ref_c_types_and_classes.xml
diff --git a/doc/ref_embed.xmlf b/src/doc/old-manual/ref_embed.xmlf
similarity index 100%
rename from doc/ref_embed.xmlf
rename to src/doc/old-manual/ref_embed.xmlf
diff --git a/doc/ref_memory.xmlf b/src/doc/old-manual/ref_memory.xmlf
similarity index 100%
rename from doc/ref_memory.xmlf
rename to src/doc/old-manual/ref_memory.xmlf
diff --git a/doc/ref_mp.xmlf b/src/doc/old-manual/ref_mp.xmlf
similarity index 100%
rename from doc/ref_mp.xmlf
rename to src/doc/old-manual/ref_mp.xmlf
diff --git a/doc/ref_os.xmlf b/src/doc/old-manual/ref_os.xmlf
similarity index 100%
rename from doc/ref_os.xmlf
rename to src/doc/old-manual/ref_os.xmlf
diff --git a/doc/ref_signals.xmlf b/src/doc/old-manual/ref_signals.xmlf
similarity index 100%
rename from doc/ref_signals.xmlf
rename to src/doc/old-manual/ref_signals.xmlf
diff --git a/doc/schemas.xml b/src/doc/old-manual/schemas.xml
similarity index 100%
rename from doc/schemas.xml
rename to src/doc/old-manual/schemas.xml
diff --git a/doc/signals.xmlf b/src/doc/old-manual/signals.xmlf
similarity index 100%
rename from doc/signals.xmlf
rename to src/doc/old-manual/signals.xmlf
diff --git a/src/doc/old-manual/tmp/COPYING.GFDL.xml b/src/doc/old-manual/tmp/COPYING.GFDL.xml
new file mode 100644
index 00000000..f35d0509
--- /dev/null
+++ b/src/doc/old-manual/tmp/COPYING.GFDL.xml
@@ -0,0 +1,332 @@
+<![CDATA[
+		GNU Free Documentation License
+		   Version 1.1, March 2000
+
+ Copyright (C) 2000  Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+0. PREAMBLE
+
+The purpose of this License is to make a manual, textbook, or other
+written document "free" in the sense of freedom: to assure everyone
+the effective freedom to copy and redistribute it, with or without
+modifying it, either commercially or noncommercially.  Secondarily,
+this License preserves for the author and publisher a way to get
+credit for their work, while not being considered responsible for
+modifications made by others.
+
+This License is a kind of "copyleft", which means that derivative
+works of the document must themselves be free in the same sense.  It
+complements the GNU General Public License, which is a copyleft
+license designed for free software.
+
+We have designed this License in order to use it for manuals for free
+software, because free software needs free documentation: a free
+program should come with manuals providing the same freedoms that the
+software does.  But this License is not limited to software manuals;
+it can be used for any textual work, regardless of subject matter or
+whether it is published as a printed book.  We recommend this License
+principally for works whose purpose is instruction or reference.
+
+
+1. APPLICABILITY AND DEFINITIONS
+
+This License applies to any manual or other work that contains a
+notice placed by the copyright holder saying it can be distributed
+under the terms of this License.  The "Document", below, refers to any
+such manual or work.  Any member of the public is a licensee, and is
+addressed as "you".
+
+A "Modified Version" of the Document means any work containing the
+Document or a portion of it, either copied verbatim, or with
+modifications and/or translated into another language.
+
+A "Secondary Section" is a named appendix or a front-matter section of
+the Document that deals exclusively with the relationship of the
+publishers or authors of the Document to the Document's overall subject
+(or to related matters) and contains nothing that could fall directly
+within that overall subject.  (For example, if the Document is in part a
+textbook of mathematics, a Secondary Section may not explain any
+mathematics.)  The relationship could be a matter of historical
+connection with the subject or with related matters, or of legal,
+commercial, philosophical, ethical or political position regarding
+them.
+
+The "Invariant Sections" are certain Secondary Sections whose titles
+are designated, as being those of Invariant Sections, in the notice
+that says that the Document is released under this License.
+
+The "Cover Texts" are certain short passages of text that are listed,
+as Front-Cover Texts or Back-Cover Texts, in the notice that says that
+the Document is released under this License.
+
+A "Transparent" copy of the Document means a machine-readable copy,
+represented in a format whose specification is available to the
+general public, whose contents can be viewed and edited directly and
+straightforwardly with generic text editors or (for images composed of
+pixels) generic paint programs or (for drawings) some widely available
+drawing editor, and that is suitable for input to text formatters or
+for automatic translation to a variety of formats suitable for input
+to text formatters.  A copy made in an otherwise Transparent file
+format whose markup has been designed to thwart or discourage
+subsequent modification by readers is not Transparent.  A copy that is
+not "Transparent" is called "Opaque".
+
+Examples of suitable formats for Transparent copies include plain
+ASCII without markup, Texinfo input format, LaTeX input format, SGML
+or XML using a publicly available DTD, and standard-conforming simple
+HTML designed for human modification.  Opaque formats include
+PostScript, PDF, proprietary formats that can be read and edited only
+by proprietary word processors, SGML or XML for which the DTD and/or
+processing tools are not generally available, and the
+machine-generated HTML produced by some word processors for output
+purposes only.
+
+The "Title Page" means, for a printed book, the title page itself,
+plus such following pages as are needed to hold, legibly, the material
+this License requires to appear in the title page.  For works in
+formats which do not have any title page as such, "Title Page" means
+the text near the most prominent appearance of the work's title,
+preceding the beginning of the body of the text.
+
+
+2. VERBATIM COPYING
+
+You may copy and distribute the Document in any medium, either
+commercially or noncommercially, provided that this License, the
+copyright notices, and the license notice saying this License applies
+to the Document are reproduced in all copies, and that you add no other
+conditions whatsoever to those of this License.  You may not use
+technical measures to obstruct or control the reading or further
+copying of the copies you make or distribute.  However, you may accept
+compensation in exchange for copies.  If you distribute a large enough
+number of copies you must also follow the conditions in section 3.
+
+You may also lend copies, under the same conditions stated above, and
+you may publicly display copies.
+
+
+3. COPYING IN QUANTITY
+
+If you publish printed copies of the Document numbering more than 100,
+and the Document's license notice requires Cover Texts, you must enclose
+the copies in covers that carry, clearly and legibly, all these Cover
+Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
+the back cover.  Both covers must also clearly and legibly identify
+you as the publisher of these copies.  The front cover must present
+the full title with all words of the title equally prominent and
+visible.  You may add other material on the covers in addition.
+Copying with changes limited to the covers, as long as they preserve
+the title of the Document and satisfy these conditions, can be treated
+as verbatim copying in other respects.
+
+If the required texts for either cover are too voluminous to fit
+legibly, you should put the first ones listed (as many as fit
+reasonably) on the actual cover, and continue the rest onto adjacent
+pages.
+
+If you publish or distribute Opaque copies of the Document numbering
+more than 100, you must either include a machine-readable Transparent
+copy along with each Opaque copy, or state in or with each Opaque copy
+a publicly-accessible computer-network location containing a complete
+Transparent copy of the Document, free of added material, which the
+general network-using public has access to download anonymously at no
+charge using public-standard network protocols.  If you use the latter
+option, you must take reasonably prudent steps, when you begin
+distribution of Opaque copies in quantity, to ensure that this
+Transparent copy will remain thus accessible at the stated location
+until at least one year after the last time you distribute an Opaque
+copy (directly or through your agents or retailers) of that edition to
+the public.
+
+It is requested, but not required, that you contact the authors of the
+Document well before redistributing any large number of copies, to give
+them a chance to provide you with an updated version of the Document.
+
+
+4. MODIFICATIONS
+
+You may copy and distribute a Modified Version of the Document under
+the conditions of sections 2 and 3 above, provided that you release
+the Modified Version under precisely this License, with the Modified
+Version filling the role of the Document, thus licensing distribution
+and modification of the Modified Version to whoever possesses a copy
+of it.  In addition, you must do these things in the Modified Version:
+
+A. Use in the Title Page (and on the covers, if any) a title distinct
+   from that of the Document, and from those of previous versions
+   (which should, if there were any, be listed in the History section
+   of the Document).  You may use the same title as a previous version
+   if the original publisher of that version gives permission.
+B. List on the Title Page, as authors, one or more persons or entities
+   responsible for authorship of the modifications in the Modified
+   Version, together with at least five of the principal authors of the
+   Document (all of its principal authors, if it has less than five).
+C. State on the Title page the name of the publisher of the
+   Modified Version, as the publisher.
+D. Preserve all the copyright notices of the Document.
+E. Add an appropriate copyright notice for your modifications
+   adjacent to the other copyright notices.
+F. Include, immediately after the copyright notices, a license notice
+   giving the public permission to use the Modified Version under the
+   terms of this License, in the form shown in the Addendum below.
+G. Preserve in that license notice the full lists of Invariant Sections
+   and required Cover Texts given in the Document's license notice.
+H. Include an unaltered copy of this License.
+I. Preserve the section entitled "History", and its title, and add to
+   it an item stating at least the title, year, new authors, and
+   publisher of the Modified Version as given on the Title Page.  If
+   there is no section entitled "History" in the Document, create one
+   stating the title, year, authors, and publisher of the Document as
+   given on its Title Page, then add an item describing the Modified
+   Version as stated in the previous sentence.
+J. Preserve the network location, if any, given in the Document for
+   public access to a Transparent copy of the Document, and likewise
+   the network locations given in the Document for previous versions
+   it was based on.  These may be placed in the "History" section.
+   You may omit a network location for a work that was published at
+   least four years before the Document itself, or if the original
+   publisher of the version it refers to gives permission.
+K. In any section entitled "Acknowledgements" or "Dedications",
+   preserve the section's title, and preserve in the section all the
+   substance and tone of each of the contributor acknowledgements
+   and/or dedications given therein.
+L. Preserve all the Invariant Sections of the Document,
+   unaltered in their text and in their titles.  Section numbers
+   or the equivalent are not considered part of the section titles.
+M. Delete any section entitled "Endorsements".  Such a section
+   may not be included in the Modified Version.
+N. Do not retitle any existing section as "Endorsements"
+   or to conflict in title with any Invariant Section.
+
+If the Modified Version includes new front-matter sections or
+appendices that qualify as Secondary Sections and contain no material
+copied from the Document, you may at your option designate some or all
+of these sections as invariant.  To do this, add their titles to the
+list of Invariant Sections in the Modified Version's license notice.
+These titles must be distinct from any other section titles.
+
+You may add a section entitled "Endorsements", provided it contains
+nothing but endorsements of your Modified Version by various
+parties--for example, statements of peer review or that the text has
+been approved by an organization as the authoritative definition of a
+standard.
+
+You may add a passage of up to five words as a Front-Cover Text, and a
+passage of up to 25 words as a Back-Cover Text, to the end of the list
+of Cover Texts in the Modified Version.  Only one passage of
+Front-Cover Text and one of Back-Cover Text may be added by (or
+through arrangements made by) any one entity.  If the Document already
+includes a cover text for the same cover, previously added by you or
+by arrangement made by the same entity you are acting on behalf of,
+you may not add another; but you may replace the old one, on explicit
+permission from the previous publisher that added the old one.
+
+The author(s) and publisher(s) of the Document do not by this License
+give permission to use their names for publicity for or to assert or
+imply endorsement of any Modified Version.
+
+
+5. COMBINING DOCUMENTS
+
+You may combine the Document with other documents released under this
+License, under the terms defined in section 4 above for modified
+versions, provided that you include in the combination all of the
+Invariant Sections of all of the original documents, unmodified, and
+list them all as Invariant Sections of your combined work in its
+license notice.
+
+The combined work need only contain one copy of this License, and
+multiple identical Invariant Sections may be replaced with a single
+copy.  If there are multiple Invariant Sections with the same name but
+different contents, make the title of each such section unique by
+adding at the end of it, in parentheses, the name of the original
+author or publisher of that section if known, or else a unique number.
+Make the same adjustment to the section titles in the list of
+Invariant Sections in the license notice of the combined work.
+
+In the combination, you must combine any sections entitled "History"
+in the various original documents, forming one section entitled
+"History"; likewise combine any sections entitled "Acknowledgements",
+and any sections entitled "Dedications".  You must delete all sections
+entitled "Endorsements."
+
+
+6. COLLECTIONS OF DOCUMENTS
+
+You may make a collection consisting of the Document and other documents
+released under this License, and replace the individual copies of this
+License in the various documents with a single copy that is included in
+the collection, provided that you follow the rules of this License for
+verbatim copying of each of the documents in all other respects.
+
+You may extract a single document from such a collection, and distribute
+it individually under this License, provided you insert a copy of this
+License into the extracted document, and follow this License in all
+other respects regarding verbatim copying of that document.
+
+
+7. AGGREGATION WITH INDEPENDENT WORKS
+
+A compilation of the Document or its derivatives with other separate
+and independent documents or works, in or on a volume of a storage or
+distribution medium, does not as a whole count as a Modified Version
+of the Document, provided no compilation copyright is claimed for the
+compilation.  Such a compilation is called an "aggregate", and this
+License does not apply to the other self-contained works thus compiled
+with the Document, on account of their being thus compiled, if they
+are not themselves derivative works of the Document.
+
+If the Cover Text requirement of section 3 is applicable to these
+copies of the Document, then if the Document is less than one quarter
+of the entire aggregate, the Document's Cover Texts may be placed on
+covers that surround only the Document within the aggregate.
+Otherwise they must appear on covers around the whole aggregate.
+
+
+8. TRANSLATION
+
+Translation is considered a kind of modification, so you may
+distribute translations of the Document under the terms of section 4.
+Replacing Invariant Sections with translations requires special
+permission from their copyright holders, but you may include
+translations of some or all Invariant Sections in addition to the
+original versions of these Invariant Sections.  You may include a
+translation of this License provided that you also include the
+original English version of this License.  In case of a disagreement
+between the translation and the original English version of this
+License, the original English version will prevail.
+
+
+9. TERMINATION
+
+You may not copy, modify, sublicense, or distribute the Document except
+as expressly provided for under this License.  Any other attempt to
+copy, modify, sublicense or distribute the Document is void, and will
+automatically terminate your rights under this License.  However,
+parties who have received copies, or rights, from you under this
+License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+
+10. FUTURE REVISIONS OF THIS LICENSE
+
+The Free Software Foundation may publish new, revised versions
+of the GNU Free Documentation License from time to time.  Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.  See
+http://www.gnu.org/copyleft/.
+
+Each version of the License is given a distinguishing version number.
+If the Document specifies that a particular numbered version of this
+License "or any later version" applies to it, you have the option of
+following the terms and conditions either of that specified version or
+of any later version that has been published (not as a draft) by the
+Free Software Foundation.  If the Document does not specify a version
+number of this License, you may choose any version ever published (not
+as a draft) by the Free Software Foundation.
+
+]]>
diff --git a/doc/tmp/placeholder b/src/doc/old-manual/tmp/placeholder
similarity index 100%
rename from doc/tmp/placeholder
rename to src/doc/old-manual/tmp/placeholder
diff --git a/doc/uffi/ref_aggregate.xml b/src/doc/old-manual/uffi/ref_aggregate.xml
similarity index 100%
rename from doc/uffi/ref_aggregate.xml
rename to src/doc/old-manual/uffi/ref_aggregate.xml
diff --git a/doc/uffi/ref_declare.xml b/src/doc/old-manual/uffi/ref_declare.xml
similarity index 100%
rename from doc/uffi/ref_declare.xml
rename to src/doc/old-manual/uffi/ref_declare.xml
diff --git a/doc/uffi/ref_func_libr.xml b/src/doc/old-manual/uffi/ref_func_libr.xml
similarity index 100%
rename from doc/uffi/ref_func_libr.xml
rename to src/doc/old-manual/uffi/ref_func_libr.xml
diff --git a/doc/uffi/ref_object.xml b/src/doc/old-manual/uffi/ref_object.xml
similarity index 100%
rename from doc/uffi/ref_object.xml
rename to src/doc/old-manual/uffi/ref_object.xml
diff --git a/doc/uffi/ref_primitive.xml b/src/doc/old-manual/uffi/ref_primitive.xml
similarity index 100%
rename from doc/uffi/ref_primitive.xml
rename to src/doc/old-manual/uffi/ref_primitive.xml
diff --git a/doc/uffi/ref_string.xml b/src/doc/old-manual/uffi/ref_string.xml
similarity index 100%
rename from doc/uffi/ref_string.xml
rename to src/doc/old-manual/uffi/ref_string.xml
diff --git a/doc/uffi/schemas.xml b/src/doc/old-manual/uffi/schemas.xml
similarity index 100%
rename from doc/uffi/schemas.xml
rename to src/doc/old-manual/uffi/schemas.xml
diff --git a/doc/xsl/add_indexterm.xml b/src/doc/old-manual/xsl/add_indexterm.xml
similarity index 100%
rename from doc/xsl/add_indexterm.xml
rename to src/doc/old-manual/xsl/add_indexterm.xml
diff --git a/doc/xsl/customization.xml b/src/doc/old-manual/xsl/customization.xml
similarity index 100%
rename from doc/xsl/customization.xml
rename to src/doc/old-manual/xsl/customization.xml
diff --git a/doc/xsl/lispfunc-po.xml b/src/doc/old-manual/xsl/lispfunc-po.xml
similarity index 100%
rename from doc/xsl/lispfunc-po.xml
rename to src/doc/old-manual/xsl/lispfunc-po.xml
diff --git a/doc/xsl/lispfunc.xml b/src/doc/old-manual/xsl/lispfunc.xml
similarity index 100%
rename from doc/xsl/lispfunc.xml
rename to src/doc/old-manual/xsl/lispfunc.xml
diff --git a/doc/xsl/refentryintoc.xml b/src/doc/old-manual/xsl/refentryintoc.xml
similarity index 100%
rename from doc/xsl/refentryintoc.xml
rename to src/doc/old-manual/xsl/refentryintoc.xml