Move docs/src to src/docs.

#199

--HG--
rename : docs/Doxyfile => src/docs/Doxyfile
rename : docs/Makefile => src/docs/Makefile
rename : docs/src/architecture.dox => src/docs/architecture.dox
rename : docs/src/basic-api.dox => src/docs/basic-api.dox
rename : docs/build-javadoc.sh => src/docs/build-javadoc.sh
rename : docs/build-pydoc.sh => src/docs/build-pydoc.sh
rename : docs/src/command-line.dox => src/docs/command-line.dox
rename : docs/src/compression.dox => src/docs/compression.dox
rename : docs/src/config-file.dox => src/docs/config-file.dox
rename : docs/src/config-strings.dox => src/docs/config-strings.dox
rename : docs/src/cursor-ops.dox => src/docs/cursor-ops.dox
rename : docs/src/cursors.dox => src/docs/cursors.dox
rename : docs/src/data_sources.dox => src/docs/data_sources.dox
rename : docs/src/dump-formats.dox => src/docs/dump-formats.dox
rename : docs/src/examples.dox => src/docs/examples.dox
rename : docs/src/file-formats.dox => src/docs/file-formats.dox
rename : docs/src/home.dox => src/docs/home.dox
rename : docs/src/huffman.dox => src/docs/huffman.dox
rename : docs/images/LogoFace-watermark.png => src/docs/images/LogoFace-watermark.png
rename : docs/images/LogoFinal-header.png => src/docs/images/LogoFinal-header.png
rename : docs/images/architecture.pdf => src/docs/images/architecture.pdf
rename : docs/images/architecture.png => src/docs/images/architecture.png
rename : docs/src/install.dox => src/docs/install.dox
rename : docs/src/introduction.dox => src/docs/introduction.dox
rename : docs/src/keyvalue.dox => src/docs/keyvalue.dox
rename : docs/src/license.dox => src/docs/license.dox
rename : docs/src/namespace.dox => src/docs/namespace.dox
rename : docs/src/packing.dox => src/docs/packing.dox
rename : docs/src/processes.dox => src/docs/processes.dox
rename : docs/src/schema.dox => src/docs/schema.dox
rename : docs/src/security.dox => src/docs/security.dox
rename : docs/src/signals.dox => src/docs/signals.dox
rename : docs/src/snapshot.dox => src/docs/snapshot.dox
rename : docs/src/spell.ok => src/docs/spell.ok
rename : docs/src/sql-map.dox => src/docs/sql-map.dox
rename : docs/style/DoxygenLayout.xml => src/docs/style/DoxygenLayout.xml
rename : docs/style/background_navigation.png => src/docs/style/background_navigation.png
rename : docs/style/doxygen.png => src/docs/style/doxygen.png
rename : docs/style/footer.html => src/docs/style/footer.html
rename : docs/style/header.html => src/docs/style/header.html
rename : docs/style/img_downArrow.png => src/docs/style/img_downArrow.png
rename : docs/style/javadoc.css => src/docs/style/javadoc.css
rename : docs/style/tabs.css => src/docs/style/tabs.css
rename : docs/style/wiredtiger.css => src/docs/style/wiredtiger.css
rename : docs/src/threads.dox => src/docs/threads.dox
rename : docs/tools/doxypy.py => src/docs/tools/doxypy.py
rename : docs/tools/fixlinks.py => src/docs/tools/fixlinks.py
rename : docs/tools/pyfilter => src/docs/tools/pyfilter
rename : docs/src/transactions.dox => src/docs/transactions.dox
rename : docs/src/tuning.dox => src/docs/tuning.dox
rename : docs/src/using.dox => src/docs/using.dox

54 files changed, 26 insertions, 25 deletions

diff --git a/dist/s_copyright b/dist/s_copyright
index 953378a5aad..2e5c07e91c7 100644
--- a/dist/s_copyright
+++ b/dist/s_copyright
@@ -80,7 +80,7 @@ done
 
 # The documentation copyright appears in two files.
 s="Copyright (c) 2008-$year WiredTiger, Inc."
-f="docs/build-javadoc.sh docs/style/footer.html"
+f="src/docs/build-javadoc.sh src/docs/style/footer.html"
 for i in $f; do
 	if `grep "$s" ../$i > /dev/null`; then
 		continue;
diff --git a/dist/s_docs b/dist/s_docs
index 0b7f6da2d1a..5a4f469f51e 100755
--- a/dist/s_docs
+++ b/dist/s_docs
@@ -20,13 +20,13 @@ spellchk()
 	# If aspell has been installed, run a spell check.
 	type aspell > /dev/null 2>&1 || return
 
-	(cd ../docs/src &&
+	(cd ../src/docs &&
 	cat *.dox | aspell --lang=en --personal=./spell.ok list) |
 	sort -u > $t
 	test -s $t && {
 		echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-="
 		echo 'Documentation spelling notes'
-		echo 'Update docs/src/spell.ok to remove warnings.'
+		echo 'Update src/docs/spell.ok to remove warnings.'
 		sed -e 's/^/	/' < $t
 		echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-="
 		e=1
@@ -45,14 +45,14 @@ valid_build()
 build()
 {
 	# Build from scratch on demand.
-	[ "$1" -eq 0 ] || (cd ../docs && make clean)
+	[ "$1" -eq 0 ] || (cd ../src/docs && make clean)
 
 	# Run doxygen to generate warnings for the base HTML documentation.
 	#
 	# We omit Python because warnings are expected there (the code generated
 	# by swig does not have named arguments, but we want to document them
 	# as if they do.
-	(cd ../docs &&
+	(cd ../src/docs &&
 	    (eval cat Doxyfile $filter ; cat <<EOF
 QUIET=YES
 EOF
@@ -64,10 +64,10 @@ EOF
 	}
 
 	# Run again to generate the full documentation set (with Python).
-	[ -f ../lang/python/wiredtiger.py ] && (cd ../docs &&
+	[ -f ../lang/python/wiredtiger.py ] && (cd ../src/docs &&
 		(eval cat Doxyfile $filter ; cat <<EOF
 QUIET=YES
-INPUT+=../lang/python/wiredtiger.py
+INPUT+=../../lang/python/wiredtiger.py
 EOF
 ) | doxygen -)
 
diff --git a/docs/Makefile b/docs/Makefile
deleted file mode 100644
index 35a775c1259..00000000000
--- a/docs/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-all:
-	@(cd ../dist && sh s_docs -t)
-
-clean:
-	rm -f doxygen.log *.css *.html *.js *.png *.ps
-
-.PHONY: all
diff --git a/docs/Doxyfile b/src/docs/Doxyfile
index aaf019dce2f..45daa187dc3 100644
--- a/docs/Doxyfile
+++ b/src/docs/Doxyfile
@@ -51,7 +51,7 @@ PROJECT_LOGO           = images/LogoFinal-header.png
 # If a relative path is entered, it will be relative to the location 
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = 
+OUTPUT_DIRECTORY       = ../../docs
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
 # 4096 sub-directories (in 2 levels) under the output directory of each output 
@@ -146,7 +146,7 @@ STRIP_FROM_PATH        =
 # definition is used. Otherwise one should specify the include paths that 
 # are normally passed to the compiler using the -I flag.
 
-STRIP_FROM_INC_PATH    = ../src/include/
+STRIP_FROM_INC_PATH    = ../include/
 
 # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
 # (but less readable) file names. This can be useful if your file system 
@@ -635,9 +635,9 @@ WARN_LOGFILE           = doxygen.log
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = ../src/include/wiredtiger.in \
-			 ../src/include/wiredtiger_ext.h \
-                         src
+INPUT                  = ../include/wiredtiger.in \
+			 ../include/wiredtiger_ext.h \
+                         .
 
 # This tag can be used to specify the character encoding of the source files 
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
@@ -698,10 +698,11 @@ RECURSIVE              = YES
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
 EXCLUDE                = \
-                         src/bdb-map.dox \
-                         src/design.dox \
-                         src/processes.dox \
-                         src/sql-map.dox
+                         bdb-map.dox \
+                         design.dox \
+                         processes.dox \
+                         sql-map.dox \
+			 tools
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
 # directories that are symbolic links (a Unix file system feature) are excluded 
@@ -729,7 +730,7 @@ EXCLUDE_SYMBOLS        = __F
 # directories that contain example code fragments that are included (see 
 # the \include command).
 
-EXAMPLE_PATH           = ../examples/c
+EXAMPLE_PATH           = ../../examples/c
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the 
 # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
diff --git a/src/docs/Makefile b/src/docs/Makefile
new file mode 100644
index 00000000000..2730c40062d
--- /dev/null
+++ b/src/docs/Makefile
@@ -0,0 +1,7 @@
+all:
+	@(cd ../../dist && sh s_docs -t)
+
+clean:
+	rm -f doxygen.log ../../docs/*.css ../../docs/*.html ../../docs/*.js ../../docs/*.png ../../docs/*.ps
+
+.PHONY: all clean
diff --git a/docs/src/architecture.dox b/src/docs/architecture.dox
index 221432bd248..221432bd248 100644
--- a/docs/src/architecture.dox
+++ b/src/docs/architecture.dox
diff --git a/docs/src/basic-api.dox b/src/docs/basic-api.dox
index d7098e9ab61..d7098e9ab61 100644
--- a/docs/src/basic-api.dox
+++ b/src/docs/basic-api.dox
diff --git a/docs/build-javadoc.sh b/src/docs/build-javadoc.sh
index c413db28d33..c413db28d33 100755
--- a/docs/build-javadoc.sh
+++ b/src/docs/build-javadoc.sh
diff --git a/docs/build-pydoc.sh b/src/docs/build-pydoc.sh
index 5e6e3635be5..5e6e3635be5 100755
--- a/docs/build-pydoc.sh
+++ b/src/docs/build-pydoc.sh
diff --git a/docs/src/command-line.dox b/src/docs/command-line.dox
index 80cd740564c..80cd740564c 100644
--- a/docs/src/command-line.dox
+++ b/src/docs/command-line.dox
diff --git a/docs/src/compression.dox b/src/docs/compression.dox
index c2223f0a404..c2223f0a404 100644
--- a/docs/src/compression.dox
+++ b/src/docs/compression.dox
diff --git a/docs/src/config-file.dox b/src/docs/config-file.dox
index 6490aca20e6..6490aca20e6 100644
--- a/docs/src/config-file.dox
+++ b/src/docs/config-file.dox
diff --git a/docs/src/config-strings.dox b/src/docs/config-strings.dox
index 65f78c19946..65f78c19946 100644
--- a/docs/src/config-strings.dox
+++ b/src/docs/config-strings.dox
diff --git a/docs/src/cursor-ops.dox b/src/docs/cursor-ops.dox
index cd77621d43d..cd77621d43d 100644
--- a/docs/src/cursor-ops.dox
+++ b/src/docs/cursor-ops.dox
diff --git a/docs/src/cursors.dox b/src/docs/cursors.dox
index 53b025a6845..53b025a6845 100644
--- a/docs/src/cursors.dox
+++ b/src/docs/cursors.dox
diff --git a/docs/src/data_sources.dox b/src/docs/data_sources.dox
index 2eaf2a99fe4..2eaf2a99fe4 100644
--- a/docs/src/data_sources.dox
+++ b/src/docs/data_sources.dox
diff --git a/docs/src/dump-formats.dox b/src/docs/dump-formats.dox
index 0c021e3a29b..0c021e3a29b 100644
--- a/docs/src/dump-formats.dox
+++ b/src/docs/dump-formats.dox
diff --git a/docs/src/examples.dox b/src/docs/examples.dox
index d0a249aecb6..d0a249aecb6 100644
--- a/docs/src/examples.dox
+++ b/src/docs/examples.dox
diff --git a/docs/src/file-formats.dox b/src/docs/file-formats.dox
index 538709673d4..538709673d4 100644
--- a/docs/src/file-formats.dox
+++ b/src/docs/file-formats.dox
diff --git a/docs/src/home.dox b/src/docs/home.dox
index 222e0400f75..222e0400f75 100644
--- a/docs/src/home.dox
+++ b/src/docs/home.dox
diff --git a/docs/src/huffman.dox b/src/docs/huffman.dox
index e4693873d66..e4693873d66 100644
--- a/docs/src/huffman.dox
+++ b/src/docs/huffman.dox
diff --git a/docs/images/LogoFace-watermark.png b/src/docs/images/LogoFace-watermark.png
index 7af37f88a7c..7af37f88a7c 100644
--- a/docs/images/LogoFace-watermark.png
+++ b/src/docs/images/LogoFace-watermark.png
diff --git a/docs/images/LogoFinal-header.png b/src/docs/images/LogoFinal-header.png
index fcbdb27ae81..fcbdb27ae81 100644
--- a/docs/images/LogoFinal-header.png
+++ b/src/docs/images/LogoFinal-header.png
diff --git a/docs/images/architecture.pdf b/src/docs/images/architecture.pdf
index ff97ddff2b4..ff97ddff2b4 100644
--- a/docs/images/architecture.pdf
+++ b/src/docs/images/architecture.pdf
diff --git a/docs/images/architecture.png b/src/docs/images/architecture.png
index c5b72bc05e0..c5b72bc05e0 100644
--- a/docs/images/architecture.png
+++ b/src/docs/images/architecture.png
diff --git a/docs/src/install.dox b/src/docs/install.dox
index dbf4712ba1d..dbf4712ba1d 100644
--- a/docs/src/install.dox
+++ b/src/docs/install.dox
diff --git a/docs/src/introduction.dox b/src/docs/introduction.dox
index 055bf09c40d..055bf09c40d 100644
--- a/docs/src/introduction.dox
+++ b/src/docs/introduction.dox
diff --git a/docs/src/keyvalue.dox b/src/docs/keyvalue.dox
index f375886b030..f375886b030 100644
--- a/docs/src/keyvalue.dox
+++ b/src/docs/keyvalue.dox
diff --git a/docs/src/license.dox b/src/docs/license.dox
index 282b1da5ff6..282b1da5ff6 100644
--- a/docs/src/license.dox
+++ b/src/docs/license.dox
diff --git a/docs/src/namespace.dox b/src/docs/namespace.dox
index 1b2402dd4f2..1b2402dd4f2 100644
--- a/docs/src/namespace.dox
+++ b/src/docs/namespace.dox
diff --git a/docs/src/packing.dox b/src/docs/packing.dox
index 7723e21bc79..7723e21bc79 100644
--- a/docs/src/packing.dox
+++ b/src/docs/packing.dox
diff --git a/docs/src/processes.dox b/src/docs/processes.dox
index 87f715792f9..87f715792f9 100644
--- a/docs/src/processes.dox
+++ b/src/docs/processes.dox
diff --git a/docs/src/schema.dox b/src/docs/schema.dox
index 01b9572c0ff..01b9572c0ff 100644
--- a/docs/src/schema.dox
+++ b/src/docs/schema.dox
diff --git a/docs/src/security.dox b/src/docs/security.dox
index 004a2661f54..004a2661f54 100644
--- a/docs/src/security.dox
+++ b/src/docs/security.dox
diff --git a/docs/src/signals.dox b/src/docs/signals.dox
index 1d05f0f2019..1d05f0f2019 100644
--- a/docs/src/signals.dox
+++ b/src/docs/signals.dox
diff --git a/docs/src/snapshot.dox b/src/docs/snapshot.dox
index 7dfb6f12efa..7dfb6f12efa 100644
--- a/docs/src/snapshot.dox
+++ b/src/docs/snapshot.dox
diff --git a/docs/src/spell.ok b/src/docs/spell.ok
index 027c6623ecd..027c6623ecd 100644
--- a/docs/src/spell.ok
+++ b/src/docs/spell.ok
diff --git a/docs/src/sql-map.dox b/src/docs/sql-map.dox
index 8f288565436..8f288565436 100644
--- a/docs/src/sql-map.dox
+++ b/src/docs/sql-map.dox
diff --git a/docs/style/DoxygenLayout.xml b/src/docs/style/DoxygenLayout.xml
index 3c186e36f89..3c186e36f89 100644
--- a/docs/style/DoxygenLayout.xml
+++ b/src/docs/style/DoxygenLayout.xml
diff --git a/docs/style/background_navigation.png b/src/docs/style/background_navigation.png
index d59e96ddef6..d59e96ddef6 100644
--- a/docs/style/background_navigation.png
+++ b/src/docs/style/background_navigation.png
diff --git a/docs/style/doxygen.png b/src/docs/style/doxygen.png
index f0a274bbaff..f0a274bbaff 100644
--- a/docs/style/doxygen.png
+++ b/src/docs/style/doxygen.png
diff --git a/docs/style/footer.html b/src/docs/style/footer.html
index cf0bb962e6f..cf0bb962e6f 100644
--- a/docs/style/footer.html
+++ b/src/docs/style/footer.html
diff --git a/docs/style/header.html b/src/docs/style/header.html
index c6302f28692..39b1d1b9372 100644
--- a/docs/style/header.html
+++ b/src/docs/style/header.html
@@ -20,7 +20,7 @@ $mathjax
  <tr style="height: 56px;">
   <!--BEGIN PROJECT_LOGO-->
   <td id="projectlogo">
-    <div class="logo"><a href="http://wiredtiger.com/"><img src="$relpath$images/LogoFinal-header.png" alt="WiredTiger" /></a></div>
+    <div class="logo"><a href="http://wiredtiger.com/"><img src="$relpath$LogoFinal-header.png" alt="WiredTiger" /></a></div>
   </td>
   <!--END PROJECT_LOGO-->
   <!--BEGIN PROJECT_NAME-->
diff --git a/docs/style/img_downArrow.png b/src/docs/style/img_downArrow.png
index 024a03c2654..024a03c2654 100644
--- a/docs/style/img_downArrow.png
+++ b/src/docs/style/img_downArrow.png
diff --git a/docs/style/javadoc.css b/src/docs/style/javadoc.css
index f345b05b158..f345b05b158 100644
--- a/docs/style/javadoc.css
+++ b/src/docs/style/javadoc.css
diff --git a/docs/style/tabs.css b/src/docs/style/tabs.css
index c543eb00429..c543eb00429 100644
--- a/docs/style/tabs.css
+++ b/src/docs/style/tabs.css
diff --git a/docs/style/wiredtiger.css b/src/docs/style/wiredtiger.css
index f3d3dcc6bee..f3d3dcc6bee 100644
--- a/docs/style/wiredtiger.css
+++ b/src/docs/style/wiredtiger.css
diff --git a/docs/src/threads.dox b/src/docs/threads.dox
index eb830de6b01..eb830de6b01 100644
--- a/docs/src/threads.dox
+++ b/src/docs/threads.dox
diff --git a/docs/tools/doxypy.py b/src/docs/tools/doxypy.py
index 54fef5f03a5..54fef5f03a5 100755
--- a/docs/tools/doxypy.py
+++ b/src/docs/tools/doxypy.py
diff --git a/docs/tools/fixlinks.py b/src/docs/tools/fixlinks.py
index b249307f3c3..b249307f3c3 100755
--- a/docs/tools/fixlinks.py
+++ b/src/docs/tools/fixlinks.py
diff --git a/docs/tools/pyfilter b/src/docs/tools/pyfilter
index 67ee7ca4544..67ee7ca4544 100755
--- a/docs/tools/pyfilter
+++ b/src/docs/tools/pyfilter
diff --git a/docs/src/transactions.dox b/src/docs/transactions.dox
index cee780a8fab..cee780a8fab 100644
--- a/docs/src/transactions.dox
+++ b/src/docs/transactions.dox
diff --git a/docs/src/tuning.dox b/src/docs/tuning.dox
index bb7ae29fb4c..bb7ae29fb4c 100644
--- a/docs/src/tuning.dox
+++ b/src/docs/tuning.dox
diff --git a/docs/src/using.dox b/src/docs/using.dox
index 8adce94adbb..8adce94adbb 100644
--- a/docs/src/using.dox
+++ b/src/docs/using.dox