From 18f3e723ecfcd50fe854303384c58d7c06e6ed12 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Thu, 5 Nov 2015 19:32:17 -0800 Subject: [PATCH] site: move manual, devguide here; move out of doc/ --- Makefile | 52 +++++++++--------- doc/site/contributors.md | 1 - doc/site/developer-guide.md | 1 - doc/site/manual.md | 1 - {doc/site => site}/.gitignore | 0 {doc/site => site}/LICENSE | 0 {doc/site => site}/README | 0 {doc/site => site}/Setup.hs | 0 {doc/site => site}/TableOfContents.hs | 0 {doc => site}/contributors.md | 0 {doc/site => site}/css/style.css | 0 {doc => site}/developer-guide.md | 30 +++++----- {doc/site => site}/download.md | 0 {doc/site => site}/faq.md | 0 {doc/site => site}/files/README | 0 .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin {doc/site => site}/hakyll-std.cabal | 0 {doc/site => site}/hakyll-std.hs | 0 {doc/site => site}/how-to-read-csv-files.md | 0 .../how-to-use-account-aliases.md | 0 {doc/site => site}/images/balance-q-inc.png | Bin {doc/site => site}/images/coins.svg | 0 {doc/site => site}/images/coins2-248.png | Bin {doc/site => site}/images/coins2.png | Bin {doc/site => site}/images/data-model.png | Bin .../site => site}/images/hledger-charts-2.png | Bin {doc/site => site}/images/hledger-lib-api.png | Bin .../site => site}/images/hledger-screen-1.png | Bin .../hledger-ui-bcexample-acc-etrade.png | Bin .../hledger-ui-bcexample-acc-etrade:cash.png | Bin .../hledger-ui/hledger-ui-bcexample-acc.png | Bin .../hledger-ui-sample-acc-greenterm.png | Bin .../hledger-ui/hledger-ui-sample-acc.png | Bin .../hledger-ui/hledger-ui-sample-acc2.png | Bin .../hledger-ui/hledger-ui-sample-reg.png | Bin .../hledger-ui/hledger-ui-sample-txn.png | Bin .../images/hledger-web-journal.png | Bin .../images/hledger-web/normal/add.png | Bin .../images/hledger-web/normal/help.png | Bin .../images/hledger-web/normal/help2.png | Bin .../hledger-web/normal/journal-sidebar.png | Bin .../images/hledger-web/normal/journal.png | Bin .../images/hledger-web/normal/journal2.png | Bin .../images/hledger-web/normal/register.png | Bin .../images/hledger-web/small/add.png | Bin .../images/hledger-web/small/help.png | Bin .../images/hledger-web/small/help2.png | Bin .../hledger-web/small/journal-sidebar.png | Bin .../hledger-web/small/journal-sidebar2.png | Bin .../images/hledger-web/small/journal.png | Bin .../images/hledger-web/small/journal2.png | Bin .../images/hledger-web/small/register.png | Bin .../images/hledger-web/small/register2.png | Bin {doc/site => site}/images/linux.png | Bin {doc/site => site}/images/mac.png | Bin {doc/site => site}/images/manual.png | Bin {doc/site => site}/images/sshot.png | Bin {doc/site => site}/images/watchhours.png | Bin {doc/site => site}/images/windows.png | Bin {doc/site => site}/index.md | 0 {doc/site => site}/installing.md | 0 .../js/highslide/graphics/close.png | Bin .../js/highslide/graphics/closeX.png | Bin .../js/highslide/graphics/fullexpand.gif | Bin .../js/highslide/graphics/geckodimmer.png | Bin .../js/highslide/graphics/icon.gif | Bin .../js/highslide/graphics/loader.gif | Bin .../js/highslide/graphics/loader.white.gif | Bin .../highslide/graphics/outlines/beveled.png | Bin .../graphics/outlines/drop-shadow.png | Bin .../graphics/outlines/glossy-dark.png | Bin .../graphics/outlines/outer-glow.png | Bin .../graphics/outlines/rounded-black.png | Bin .../graphics/outlines/rounded-white.png | Bin .../js/highslide/graphics/resize.gif | Bin .../js/highslide/graphics/zoomin.cur | Bin .../js/highslide/graphics/zoomout.cur | Bin .../js/highslide/highslide-ie6.css | 0 {doc/site => site}/js/highslide/highslide.css | 0 {doc/site => site}/js/highslide/highslide.js | 0 {doc/site => site}/ledgertips.md | 0 {doc => site}/manual.md | 0 {doc/site => site}/more-docs.md | 0 {doc/site => site}/old-screenshots.md | 0 {doc/site => site}/package.yaml | 0 {doc/site => site}/release-notes.md | 0 {doc/site => site}/sidebar.md | 0 {doc/site => site}/site.tmpl | 0 {doc/site => site}/stack.yaml | 0 {doc/site => site}/step-by-step.md | 0 93 files changed, 41 insertions(+), 44 deletions(-) delete mode 120000 doc/site/contributors.md delete mode 120000 doc/site/developer-guide.md delete mode 120000 doc/site/manual.md rename {doc/site => site}/.gitignore (100%) rename {doc/site => site}/LICENSE (100%) rename {doc/site => site}/README (100%) rename {doc/site => site}/Setup.hs (100%) rename {doc/site => site}/TableOfContents.hs (100%) rename {doc => site}/contributors.md (100%) rename {doc/site => site}/css/style.css (100%) rename {doc => site}/developer-guide.md (98%) rename {doc/site => site}/download.md (100%) rename {doc/site => site}/faq.md (100%) rename {doc/site => site}/files/README (100%) rename {doc/site => site}/fonts/glyphicons-halflings-regular.eot (100%) rename {doc/site => site}/fonts/glyphicons-halflings-regular.svg (100%) rename {doc/site => site}/fonts/glyphicons-halflings-regular.ttf (100%) rename {doc/site => site}/fonts/glyphicons-halflings-regular.woff (100%) rename {doc/site => site}/hakyll-std.cabal (100%) rename {doc/site => site}/hakyll-std.hs (100%) rename {doc/site => site}/how-to-read-csv-files.md (100%) rename {doc/site => site}/how-to-use-account-aliases.md (100%) rename {doc/site => site}/images/balance-q-inc.png (100%) rename {doc/site => site}/images/coins.svg (100%) rename {doc/site => site}/images/coins2-248.png (100%) rename {doc/site => site}/images/coins2.png (100%) rename {doc/site => site}/images/data-model.png (100%) rename {doc/site => site}/images/hledger-charts-2.png (100%) rename {doc/site => site}/images/hledger-lib-api.png (100%) rename {doc/site => site}/images/hledger-screen-1.png (100%) rename {doc/site => site}/images/hledger-ui/hledger-ui-bcexample-acc-etrade.png (100%) rename {doc/site => site}/images/hledger-ui/hledger-ui-bcexample-acc-etrade:cash.png (100%) rename {doc/site => site}/images/hledger-ui/hledger-ui-bcexample-acc.png (100%) rename {doc/site => site}/images/hledger-ui/hledger-ui-sample-acc-greenterm.png (100%) rename {doc/site => site}/images/hledger-ui/hledger-ui-sample-acc.png (100%) rename {doc/site => site}/images/hledger-ui/hledger-ui-sample-acc2.png (100%) rename {doc/site => site}/images/hledger-ui/hledger-ui-sample-reg.png (100%) rename {doc/site => site}/images/hledger-ui/hledger-ui-sample-txn.png (100%) rename {doc/site => site}/images/hledger-web-journal.png (100%) rename {doc/site => site}/images/hledger-web/normal/add.png (100%) rename {doc/site => site}/images/hledger-web/normal/help.png (100%) rename {doc/site => site}/images/hledger-web/normal/help2.png (100%) rename {doc/site => site}/images/hledger-web/normal/journal-sidebar.png (100%) rename {doc/site => site}/images/hledger-web/normal/journal.png (100%) rename {doc/site => site}/images/hledger-web/normal/journal2.png (100%) rename {doc/site => site}/images/hledger-web/normal/register.png (100%) rename {doc/site => site}/images/hledger-web/small/add.png (100%) rename {doc/site => site}/images/hledger-web/small/help.png (100%) rename {doc/site => site}/images/hledger-web/small/help2.png (100%) rename {doc/site => site}/images/hledger-web/small/journal-sidebar.png (100%) rename {doc/site => site}/images/hledger-web/small/journal-sidebar2.png (100%) rename {doc/site => site}/images/hledger-web/small/journal.png (100%) rename {doc/site => site}/images/hledger-web/small/journal2.png (100%) rename {doc/site => site}/images/hledger-web/small/register.png (100%) rename {doc/site => site}/images/hledger-web/small/register2.png (100%) rename {doc/site => site}/images/linux.png (100%) rename {doc/site => site}/images/mac.png (100%) rename {doc/site => site}/images/manual.png (100%) rename {doc/site => site}/images/sshot.png (100%) rename {doc/site => site}/images/watchhours.png (100%) rename {doc/site => site}/images/windows.png (100%) rename {doc/site => site}/index.md (100%) rename {doc/site => site}/installing.md (100%) rename {doc/site => site}/js/highslide/graphics/close.png (100%) rename {doc/site => site}/js/highslide/graphics/closeX.png (100%) rename {doc/site => site}/js/highslide/graphics/fullexpand.gif (100%) rename {doc/site => site}/js/highslide/graphics/geckodimmer.png (100%) rename {doc/site => site}/js/highslide/graphics/icon.gif (100%) rename {doc/site => site}/js/highslide/graphics/loader.gif (100%) rename {doc/site => site}/js/highslide/graphics/loader.white.gif (100%) rename {doc/site => site}/js/highslide/graphics/outlines/beveled.png (100%) rename {doc/site => site}/js/highslide/graphics/outlines/drop-shadow.png (100%) rename {doc/site => site}/js/highslide/graphics/outlines/glossy-dark.png (100%) rename {doc/site => site}/js/highslide/graphics/outlines/outer-glow.png (100%) rename {doc/site => site}/js/highslide/graphics/outlines/rounded-black.png (100%) rename {doc/site => site}/js/highslide/graphics/outlines/rounded-white.png (100%) rename {doc/site => site}/js/highslide/graphics/resize.gif (100%) rename {doc/site => site}/js/highslide/graphics/zoomin.cur (100%) rename {doc/site => site}/js/highslide/graphics/zoomout.cur (100%) rename {doc/site => site}/js/highslide/highslide-ie6.css (100%) rename {doc/site => site}/js/highslide/highslide.css (100%) rename {doc/site => site}/js/highslide/highslide.js (100%) rename {doc/site => site}/ledgertips.md (100%) rename {doc => site}/manual.md (100%) rename {doc/site => site}/more-docs.md (100%) rename {doc/site => site}/old-screenshots.md (100%) rename {doc/site => site}/package.yaml (100%) rename {doc/site => site}/release-notes.md (100%) rename {doc/site => site}/sidebar.md (100%) rename {doc/site => site}/site.tmpl (100%) rename {doc/site => site}/stack.yaml (100%) rename {doc/site => site}/step-by-step.md (100%) diff --git a/Makefile b/Makefile index 602dede56..bbcad2da7 100644 --- a/Makefile +++ b/Makefile @@ -120,12 +120,12 @@ SOURCEFILES:= \ CABALFILES:= \ hledger/hledger.cabal \ hledger-*/*.cabal \ - doc/site/hakyll-std.cabal + site/hakyll-std.cabal HPACKFILES:= \ hledger/package.yaml \ hledger-*/package.yaml \ - doc/site/package.yaml + site/package.yaml WEBFILES:= \ hledger-web/templates/* \ @@ -860,34 +860,34 @@ $(call def-help-subsection,DOCUMENTATION:) # \ # ) -doc/site/hakyll-std hakyll-std: \ - doc/site/hakyll-std.hs \ - doc/site/TableOfContents.hs \ +site/hakyll-std hakyll-std: \ + site/hakyll-std.hs \ + site/TableOfContents.hs \ $(call def-help,hakyll-std, build a generic hakyll site builder script ) - cd doc/site; stack ghc hakyll-std + cd site; stack ghc hakyll-std -site: doc/site/hakyll-std \ - $(call def-help,site, generate the hledger.org website with hakyll-std ) - -cd doc/site; ./hakyll-std build +site-build: site/hakyll-std \ + $(call def-help,site-build, generate the hledger.org website with hakyll-std ) + -cd site; ./hakyll-std build -site-clean: doc/site/hakyll-std \ +site-clean: site/hakyll-std \ $(call def-help,site-clean, remove hakyll-generated files (& take down the website) ) #cleanolddocs - -cd doc/site; ./hakyll-std clean -# rm -rf doc/site/_site/* + -cd site; ./hakyll-std clean +# rm -rf site/_site/* # XXX hakyll watch & preview mostly don't live-update any more -site-preview: doc/site/hakyll-std \ - $(call def-help,site-preview, run a hakyll server to preview the website ) #doc/site/site - -cd doc/site; ./hakyll-std watch # -h hledger.org +site-preview: site/hakyll-std \ + $(call def-help,site-preview, run a hakyll server to preview the website ) #site/site + -cd site; ./hakyll-std watch # -h hledger.org # site-view: site \ # $(call def-help,site-view,\ # \ # ) -# $(VIEWHTML) doc/site/_site/index.html +# $(VIEWHTML) site/_site/index.html # # site-auto: -# # cd doc/site; $(AUTOBUILD) site.hs -o site $(PREFERMACUSRLIBFLAGS) --run preview +# # cd site; $(AUTOBUILD) site.hs -o site $(PREFERMACUSRLIBFLAGS) --run preview # # ensure some old doc versions are in place: @@ -969,25 +969,25 @@ haddock: \ # # http://www.cs.york.ac.uk/fp/darcs/hscolour/ # HSCOLOUR=HsColour -css -# hscolour: doc/site/api/src doc/site/api/src/hscolour.css \ +# hscolour: site/api/src site/api/src/hscolour.css \ # $(call def-help,hscolour,\ # \ # ) # for f in $(HADDOCKSOURCEFILES); do \ -# $(HSCOLOUR) -anchor $$f -odoc/site/api/src/`echo $$f | sed -e's%[^/]*/%%' | sed -e's%/%-%g' | sed -e's%\.hs$$%.html%'` ; \ +# $(HSCOLOUR) -anchor $$f -osite/api/src/`echo $$f | sed -e's%[^/]*/%%' | sed -e's%/%-%g' | sed -e's%\.hs$$%.html%'` ; \ # done -# doc/site/api/src/hscolour.css: doc/site/api/src \ -# $(call def-help,doc/site/api/src/hscolour.css,\ +# site/api/src/hscolour.css: site/api/src \ +# $(call def-help,site/api/src/hscolour.css,\ # \ # ) -# $(HSCOLOUR) -print-css >doc/site/api/src/hscolour.css +# $(HSCOLOUR) -print-css >site/api/src/hscolour.css -# doc/site/api/src: \ -# $(call def-help,doc/site/api/src,\ +# site/api/src: \ +# $(call def-help,site/api/src,\ # \ # ) -# mkdir -p doc/site/api/src +# mkdir -p site/api/src # sourcegraph: \ # $(call def-help,sourcegraph,\ @@ -1358,7 +1358,7 @@ $(call def-help-subsection,MISCELLANEOUS:) # XXX enable for all cabal files when hpack is a little better # gencabalfiles: $$(CABALFILES) -gencabalfiles: doc/site/hakyll-std.cabal \ +gencabalfiles: site/hakyll-std.cabal \ $(call def-help,gencabalfiles, regenerate cabal files from their package.yaml definitions ) %.cabal: $$(dir $$@)package.yaml \ diff --git a/doc/site/contributors.md b/doc/site/contributors.md deleted file mode 120000 index 48d1bd302..000000000 --- a/doc/site/contributors.md +++ /dev/null @@ -1 +0,0 @@ -../contributors.md \ No newline at end of file diff --git a/doc/site/developer-guide.md b/doc/site/developer-guide.md deleted file mode 120000 index ecc4a32b3..000000000 --- a/doc/site/developer-guide.md +++ /dev/null @@ -1 +0,0 @@ -../developer-guide.md \ No newline at end of file diff --git a/doc/site/manual.md b/doc/site/manual.md deleted file mode 120000 index 3ac12d1c6..000000000 --- a/doc/site/manual.md +++ /dev/null @@ -1 +0,0 @@ -../manual.md \ No newline at end of file diff --git a/doc/site/.gitignore b/site/.gitignore similarity index 100% rename from doc/site/.gitignore rename to site/.gitignore diff --git a/doc/site/LICENSE b/site/LICENSE similarity index 100% rename from doc/site/LICENSE rename to site/LICENSE diff --git a/doc/site/README b/site/README similarity index 100% rename from doc/site/README rename to site/README diff --git a/doc/site/Setup.hs b/site/Setup.hs similarity index 100% rename from doc/site/Setup.hs rename to site/Setup.hs diff --git a/doc/site/TableOfContents.hs b/site/TableOfContents.hs similarity index 100% rename from doc/site/TableOfContents.hs rename to site/TableOfContents.hs diff --git a/doc/contributors.md b/site/contributors.md similarity index 100% rename from doc/contributors.md rename to site/contributors.md diff --git a/doc/site/css/style.css b/site/css/style.css similarity index 100% rename from doc/site/css/style.css rename to site/css/style.css diff --git a/doc/developer-guide.md b/site/developer-guide.md similarity index 98% rename from doc/developer-guide.md rename to site/developer-guide.md index 1a866368d..fcf971493 100644 --- a/doc/developer-guide.md +++ b/site/developer-guide.md @@ -684,18 +684,18 @@ If you're new to this process, [help.github.com](http://help.github.com) may be - flags - update docs - - */CHANGES - - doc/site/release-notes.md - haddocks + - changelogs - man pages - - doc/contributors.md - - doc/manual.md (commands, options, --help, ledger compatibility..) - - doc/site/step-by-step.md - - doc/site/how-to-* - - doc/site/faq.md (ledger compatibility) - - doc/site/installing.md - - doc/site/download.md - - doc/developer-guide.md + - site/release-notes.md + - site/manual.md (commands, options, --help, ledger compatibility..) + - site/developer-guide.md + - site/step-by-step.md + - site/how-to-* + - site/faq.md (ledger compatibility) + - site/installing.md + - site/download.md + - site/contributors.md - doc/ANNOUNCE - update version @@ -754,10 +754,10 @@ don't run make setversion. 2. document - */*.cabal for affected package(s) (descriptions, tested-with, files..) - */CHANGES for affected package(s) - - doc/site/release-notes.md - - doc/manual.md (commands, options, --help, ledger compatibility..) - - doc/site/step-by-step.md - - doc/site/how-to-* + - site/release-notes.md + - site/manual.md (commands, options, --help, ledger compatibility..) + - site/step-by-step.md + - site/how-to-* 3. test - make unittest - make functest @@ -812,7 +812,7 @@ The hledger project aims to produce: Project documentation lives in a number of places: -- `doc/*.md` and `doc/site/*.md` form the hledger.org website, which is generated with hakyll[-std] and pandoc +- `site/*.md` is the hledger.org website content, which is generated with hakyll[-std] and pandoc - haddock documentation in the code appears on Hackage - short blurbs: cabal files, module headers, HCAR, GSOC project, .. - `doc/notes.org` has some old developer notes diff --git a/doc/site/download.md b/site/download.md similarity index 100% rename from doc/site/download.md rename to site/download.md diff --git a/doc/site/faq.md b/site/faq.md similarity index 100% rename from doc/site/faq.md rename to site/faq.md diff --git a/doc/site/files/README b/site/files/README similarity index 100% rename from doc/site/files/README rename to site/files/README diff --git a/doc/site/fonts/glyphicons-halflings-regular.eot b/site/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from doc/site/fonts/glyphicons-halflings-regular.eot rename to site/fonts/glyphicons-halflings-regular.eot diff --git a/doc/site/fonts/glyphicons-halflings-regular.svg b/site/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from doc/site/fonts/glyphicons-halflings-regular.svg rename to site/fonts/glyphicons-halflings-regular.svg diff --git a/doc/site/fonts/glyphicons-halflings-regular.ttf b/site/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from doc/site/fonts/glyphicons-halflings-regular.ttf rename to site/fonts/glyphicons-halflings-regular.ttf diff --git a/doc/site/fonts/glyphicons-halflings-regular.woff b/site/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from doc/site/fonts/glyphicons-halflings-regular.woff rename to site/fonts/glyphicons-halflings-regular.woff diff --git a/doc/site/hakyll-std.cabal b/site/hakyll-std.cabal similarity index 100% rename from doc/site/hakyll-std.cabal rename to site/hakyll-std.cabal diff --git a/doc/site/hakyll-std.hs b/site/hakyll-std.hs similarity index 100% rename from doc/site/hakyll-std.hs rename to site/hakyll-std.hs diff --git a/doc/site/how-to-read-csv-files.md b/site/how-to-read-csv-files.md similarity index 100% rename from doc/site/how-to-read-csv-files.md rename to site/how-to-read-csv-files.md diff --git a/doc/site/how-to-use-account-aliases.md b/site/how-to-use-account-aliases.md similarity index 100% rename from doc/site/how-to-use-account-aliases.md rename to site/how-to-use-account-aliases.md diff --git a/doc/site/images/balance-q-inc.png b/site/images/balance-q-inc.png similarity index 100% rename from doc/site/images/balance-q-inc.png rename to site/images/balance-q-inc.png diff --git a/doc/site/images/coins.svg b/site/images/coins.svg similarity index 100% rename from doc/site/images/coins.svg rename to site/images/coins.svg diff --git a/doc/site/images/coins2-248.png b/site/images/coins2-248.png similarity index 100% rename from doc/site/images/coins2-248.png rename to site/images/coins2-248.png diff --git a/doc/site/images/coins2.png b/site/images/coins2.png similarity index 100% rename from doc/site/images/coins2.png rename to site/images/coins2.png diff --git a/doc/site/images/data-model.png b/site/images/data-model.png similarity index 100% rename from doc/site/images/data-model.png rename to site/images/data-model.png diff --git a/doc/site/images/hledger-charts-2.png b/site/images/hledger-charts-2.png similarity index 100% rename from doc/site/images/hledger-charts-2.png rename to site/images/hledger-charts-2.png diff --git a/doc/site/images/hledger-lib-api.png b/site/images/hledger-lib-api.png similarity index 100% rename from doc/site/images/hledger-lib-api.png rename to site/images/hledger-lib-api.png diff --git a/doc/site/images/hledger-screen-1.png b/site/images/hledger-screen-1.png similarity index 100% rename from doc/site/images/hledger-screen-1.png rename to site/images/hledger-screen-1.png diff --git a/doc/site/images/hledger-ui/hledger-ui-bcexample-acc-etrade.png b/site/images/hledger-ui/hledger-ui-bcexample-acc-etrade.png similarity index 100% rename from doc/site/images/hledger-ui/hledger-ui-bcexample-acc-etrade.png rename to site/images/hledger-ui/hledger-ui-bcexample-acc-etrade.png diff --git a/doc/site/images/hledger-ui/hledger-ui-bcexample-acc-etrade:cash.png b/site/images/hledger-ui/hledger-ui-bcexample-acc-etrade:cash.png similarity index 100% rename from doc/site/images/hledger-ui/hledger-ui-bcexample-acc-etrade:cash.png rename to site/images/hledger-ui/hledger-ui-bcexample-acc-etrade:cash.png diff --git a/doc/site/images/hledger-ui/hledger-ui-bcexample-acc.png b/site/images/hledger-ui/hledger-ui-bcexample-acc.png similarity index 100% rename from doc/site/images/hledger-ui/hledger-ui-bcexample-acc.png rename to site/images/hledger-ui/hledger-ui-bcexample-acc.png diff --git a/doc/site/images/hledger-ui/hledger-ui-sample-acc-greenterm.png b/site/images/hledger-ui/hledger-ui-sample-acc-greenterm.png similarity index 100% rename from doc/site/images/hledger-ui/hledger-ui-sample-acc-greenterm.png rename to site/images/hledger-ui/hledger-ui-sample-acc-greenterm.png diff --git a/doc/site/images/hledger-ui/hledger-ui-sample-acc.png b/site/images/hledger-ui/hledger-ui-sample-acc.png similarity index 100% rename from doc/site/images/hledger-ui/hledger-ui-sample-acc.png rename to site/images/hledger-ui/hledger-ui-sample-acc.png diff --git a/doc/site/images/hledger-ui/hledger-ui-sample-acc2.png b/site/images/hledger-ui/hledger-ui-sample-acc2.png similarity index 100% rename from doc/site/images/hledger-ui/hledger-ui-sample-acc2.png rename to site/images/hledger-ui/hledger-ui-sample-acc2.png diff --git a/doc/site/images/hledger-ui/hledger-ui-sample-reg.png b/site/images/hledger-ui/hledger-ui-sample-reg.png similarity index 100% rename from doc/site/images/hledger-ui/hledger-ui-sample-reg.png rename to site/images/hledger-ui/hledger-ui-sample-reg.png diff --git a/doc/site/images/hledger-ui/hledger-ui-sample-txn.png b/site/images/hledger-ui/hledger-ui-sample-txn.png similarity index 100% rename from doc/site/images/hledger-ui/hledger-ui-sample-txn.png rename to site/images/hledger-ui/hledger-ui-sample-txn.png diff --git a/doc/site/images/hledger-web-journal.png b/site/images/hledger-web-journal.png similarity index 100% rename from doc/site/images/hledger-web-journal.png rename to site/images/hledger-web-journal.png diff --git a/doc/site/images/hledger-web/normal/add.png b/site/images/hledger-web/normal/add.png similarity index 100% rename from doc/site/images/hledger-web/normal/add.png rename to site/images/hledger-web/normal/add.png diff --git a/doc/site/images/hledger-web/normal/help.png b/site/images/hledger-web/normal/help.png similarity index 100% rename from doc/site/images/hledger-web/normal/help.png rename to site/images/hledger-web/normal/help.png diff --git a/doc/site/images/hledger-web/normal/help2.png b/site/images/hledger-web/normal/help2.png similarity index 100% rename from doc/site/images/hledger-web/normal/help2.png rename to site/images/hledger-web/normal/help2.png diff --git a/doc/site/images/hledger-web/normal/journal-sidebar.png b/site/images/hledger-web/normal/journal-sidebar.png similarity index 100% rename from doc/site/images/hledger-web/normal/journal-sidebar.png rename to site/images/hledger-web/normal/journal-sidebar.png diff --git a/doc/site/images/hledger-web/normal/journal.png b/site/images/hledger-web/normal/journal.png similarity index 100% rename from doc/site/images/hledger-web/normal/journal.png rename to site/images/hledger-web/normal/journal.png diff --git a/doc/site/images/hledger-web/normal/journal2.png b/site/images/hledger-web/normal/journal2.png similarity index 100% rename from doc/site/images/hledger-web/normal/journal2.png rename to site/images/hledger-web/normal/journal2.png diff --git a/doc/site/images/hledger-web/normal/register.png b/site/images/hledger-web/normal/register.png similarity index 100% rename from doc/site/images/hledger-web/normal/register.png rename to site/images/hledger-web/normal/register.png diff --git a/doc/site/images/hledger-web/small/add.png b/site/images/hledger-web/small/add.png similarity index 100% rename from doc/site/images/hledger-web/small/add.png rename to site/images/hledger-web/small/add.png diff --git a/doc/site/images/hledger-web/small/help.png b/site/images/hledger-web/small/help.png similarity index 100% rename from doc/site/images/hledger-web/small/help.png rename to site/images/hledger-web/small/help.png diff --git a/doc/site/images/hledger-web/small/help2.png b/site/images/hledger-web/small/help2.png similarity index 100% rename from doc/site/images/hledger-web/small/help2.png rename to site/images/hledger-web/small/help2.png diff --git a/doc/site/images/hledger-web/small/journal-sidebar.png b/site/images/hledger-web/small/journal-sidebar.png similarity index 100% rename from doc/site/images/hledger-web/small/journal-sidebar.png rename to site/images/hledger-web/small/journal-sidebar.png diff --git a/doc/site/images/hledger-web/small/journal-sidebar2.png b/site/images/hledger-web/small/journal-sidebar2.png similarity index 100% rename from doc/site/images/hledger-web/small/journal-sidebar2.png rename to site/images/hledger-web/small/journal-sidebar2.png diff --git a/doc/site/images/hledger-web/small/journal.png b/site/images/hledger-web/small/journal.png similarity index 100% rename from doc/site/images/hledger-web/small/journal.png rename to site/images/hledger-web/small/journal.png diff --git a/doc/site/images/hledger-web/small/journal2.png b/site/images/hledger-web/small/journal2.png similarity index 100% rename from doc/site/images/hledger-web/small/journal2.png rename to site/images/hledger-web/small/journal2.png diff --git a/doc/site/images/hledger-web/small/register.png b/site/images/hledger-web/small/register.png similarity index 100% rename from doc/site/images/hledger-web/small/register.png rename to site/images/hledger-web/small/register.png diff --git a/doc/site/images/hledger-web/small/register2.png b/site/images/hledger-web/small/register2.png similarity index 100% rename from doc/site/images/hledger-web/small/register2.png rename to site/images/hledger-web/small/register2.png diff --git a/doc/site/images/linux.png b/site/images/linux.png similarity index 100% rename from doc/site/images/linux.png rename to site/images/linux.png diff --git a/doc/site/images/mac.png b/site/images/mac.png similarity index 100% rename from doc/site/images/mac.png rename to site/images/mac.png diff --git a/doc/site/images/manual.png b/site/images/manual.png similarity index 100% rename from doc/site/images/manual.png rename to site/images/manual.png diff --git a/doc/site/images/sshot.png b/site/images/sshot.png similarity index 100% rename from doc/site/images/sshot.png rename to site/images/sshot.png diff --git a/doc/site/images/watchhours.png b/site/images/watchhours.png similarity index 100% rename from doc/site/images/watchhours.png rename to site/images/watchhours.png diff --git a/doc/site/images/windows.png b/site/images/windows.png similarity index 100% rename from doc/site/images/windows.png rename to site/images/windows.png diff --git a/doc/site/index.md b/site/index.md similarity index 100% rename from doc/site/index.md rename to site/index.md diff --git a/doc/site/installing.md b/site/installing.md similarity index 100% rename from doc/site/installing.md rename to site/installing.md diff --git a/doc/site/js/highslide/graphics/close.png b/site/js/highslide/graphics/close.png similarity index 100% rename from doc/site/js/highslide/graphics/close.png rename to site/js/highslide/graphics/close.png diff --git a/doc/site/js/highslide/graphics/closeX.png b/site/js/highslide/graphics/closeX.png similarity index 100% rename from doc/site/js/highslide/graphics/closeX.png rename to site/js/highslide/graphics/closeX.png diff --git a/doc/site/js/highslide/graphics/fullexpand.gif b/site/js/highslide/graphics/fullexpand.gif similarity index 100% rename from doc/site/js/highslide/graphics/fullexpand.gif rename to site/js/highslide/graphics/fullexpand.gif diff --git a/doc/site/js/highslide/graphics/geckodimmer.png b/site/js/highslide/graphics/geckodimmer.png similarity index 100% rename from doc/site/js/highslide/graphics/geckodimmer.png rename to site/js/highslide/graphics/geckodimmer.png diff --git a/doc/site/js/highslide/graphics/icon.gif b/site/js/highslide/graphics/icon.gif similarity index 100% rename from doc/site/js/highslide/graphics/icon.gif rename to site/js/highslide/graphics/icon.gif diff --git a/doc/site/js/highslide/graphics/loader.gif b/site/js/highslide/graphics/loader.gif similarity index 100% rename from doc/site/js/highslide/graphics/loader.gif rename to site/js/highslide/graphics/loader.gif diff --git a/doc/site/js/highslide/graphics/loader.white.gif b/site/js/highslide/graphics/loader.white.gif similarity index 100% rename from doc/site/js/highslide/graphics/loader.white.gif rename to site/js/highslide/graphics/loader.white.gif diff --git a/doc/site/js/highslide/graphics/outlines/beveled.png b/site/js/highslide/graphics/outlines/beveled.png similarity index 100% rename from doc/site/js/highslide/graphics/outlines/beveled.png rename to site/js/highslide/graphics/outlines/beveled.png diff --git a/doc/site/js/highslide/graphics/outlines/drop-shadow.png b/site/js/highslide/graphics/outlines/drop-shadow.png similarity index 100% rename from doc/site/js/highslide/graphics/outlines/drop-shadow.png rename to site/js/highslide/graphics/outlines/drop-shadow.png diff --git a/doc/site/js/highslide/graphics/outlines/glossy-dark.png b/site/js/highslide/graphics/outlines/glossy-dark.png similarity index 100% rename from doc/site/js/highslide/graphics/outlines/glossy-dark.png rename to site/js/highslide/graphics/outlines/glossy-dark.png diff --git a/doc/site/js/highslide/graphics/outlines/outer-glow.png b/site/js/highslide/graphics/outlines/outer-glow.png similarity index 100% rename from doc/site/js/highslide/graphics/outlines/outer-glow.png rename to site/js/highslide/graphics/outlines/outer-glow.png diff --git a/doc/site/js/highslide/graphics/outlines/rounded-black.png b/site/js/highslide/graphics/outlines/rounded-black.png similarity index 100% rename from doc/site/js/highslide/graphics/outlines/rounded-black.png rename to site/js/highslide/graphics/outlines/rounded-black.png diff --git a/doc/site/js/highslide/graphics/outlines/rounded-white.png b/site/js/highslide/graphics/outlines/rounded-white.png similarity index 100% rename from doc/site/js/highslide/graphics/outlines/rounded-white.png rename to site/js/highslide/graphics/outlines/rounded-white.png diff --git a/doc/site/js/highslide/graphics/resize.gif b/site/js/highslide/graphics/resize.gif similarity index 100% rename from doc/site/js/highslide/graphics/resize.gif rename to site/js/highslide/graphics/resize.gif diff --git a/doc/site/js/highslide/graphics/zoomin.cur b/site/js/highslide/graphics/zoomin.cur similarity index 100% rename from doc/site/js/highslide/graphics/zoomin.cur rename to site/js/highslide/graphics/zoomin.cur diff --git a/doc/site/js/highslide/graphics/zoomout.cur b/site/js/highslide/graphics/zoomout.cur similarity index 100% rename from doc/site/js/highslide/graphics/zoomout.cur rename to site/js/highslide/graphics/zoomout.cur diff --git a/doc/site/js/highslide/highslide-ie6.css b/site/js/highslide/highslide-ie6.css similarity index 100% rename from doc/site/js/highslide/highslide-ie6.css rename to site/js/highslide/highslide-ie6.css diff --git a/doc/site/js/highslide/highslide.css b/site/js/highslide/highslide.css similarity index 100% rename from doc/site/js/highslide/highslide.css rename to site/js/highslide/highslide.css diff --git a/doc/site/js/highslide/highslide.js b/site/js/highslide/highslide.js similarity index 100% rename from doc/site/js/highslide/highslide.js rename to site/js/highslide/highslide.js diff --git a/doc/site/ledgertips.md b/site/ledgertips.md similarity index 100% rename from doc/site/ledgertips.md rename to site/ledgertips.md diff --git a/doc/manual.md b/site/manual.md similarity index 100% rename from doc/manual.md rename to site/manual.md diff --git a/doc/site/more-docs.md b/site/more-docs.md similarity index 100% rename from doc/site/more-docs.md rename to site/more-docs.md diff --git a/doc/site/old-screenshots.md b/site/old-screenshots.md similarity index 100% rename from doc/site/old-screenshots.md rename to site/old-screenshots.md diff --git a/doc/site/package.yaml b/site/package.yaml similarity index 100% rename from doc/site/package.yaml rename to site/package.yaml diff --git a/doc/site/release-notes.md b/site/release-notes.md similarity index 100% rename from doc/site/release-notes.md rename to site/release-notes.md diff --git a/doc/site/sidebar.md b/site/sidebar.md similarity index 100% rename from doc/site/sidebar.md rename to site/sidebar.md diff --git a/doc/site/site.tmpl b/site/site.tmpl similarity index 100% rename from doc/site/site.tmpl rename to site/site.tmpl diff --git a/doc/site/stack.yaml b/site/stack.yaml similarity index 100% rename from doc/site/stack.yaml rename to site/stack.yaml diff --git a/doc/site/step-by-step.md b/site/step-by-step.md similarity index 100% rename from doc/site/step-by-step.md rename to site/step-by-step.md