diff --git a/.gitignore b/.gitignore index 27f4a585d..091a943c9 100644 --- a/.gitignore +++ b/.gitignore @@ -232,64 +232,6 @@ Makefile.in /haskell/Guestfs030Config /haskell/Guestfs050LVCreate /haskell/Guestfs.hs -/html/guestfish.1.html -/html/guestfs.3.html -/html/guestfs-erlang.3.html -/html/guestfs-examples.3.html -/html/guestfs-faq.1.html -/html/guestfs-hacking.1.html -/html/guestfs-internals.1.html -/html/guestfs-golang.3.html -/html/guestfs-java.3.html -/html/guestfs-lua.3.html -/html/guestfs-ocaml.3.html -/html/guestfs-performance.1.html -/html/guestfs-perl.3.html -/html/guestfs-python.3.html -/html/guestfs-recipes.1.html -/html/guestfs-release-notes.1.html -/html/guestfs-ruby.3.html -/html/guestfs-security.1.html -/html/guestfs-testing.1.html -/html/guestfsd.8.html -/html/guestmount.1.html -/html/guestunmount.1.html -/html/libguestfs-make-fixed-appliance.1.html -/html/libguestfs-test-tool.1.html -/html/libguestfs-tools.conf.5.html -/html/virt-alignment-scan.1.html -/html/virt-builder.1.html -/html/virt-cat.1.html -/html/virt-copy-in.1.html -/html/virt-copy-out.1.html -/html/virt-customize.1.html -/html/virt-df.1.html -/html/virt-dib.1.html -/html/virt-diff.1.html -/html/virt-edit.1.html -/html/virt-filesystems.1.html -/html/virt-format.1.html -/html/virt-get-kernel.1.html -/html/virt-index-validate.1.html -/html/virt-inspector.1.html -/html/virt-list-filesystems.1.html -/html/virt-list-partitions.1.html -/html/virt-log.1.html -/html/virt-ls.1.html -/html/virt-make-fs.1.html -/html/virt-p2v.1.html -/html/virt-p2v-make-disk.1.html -/html/virt-p2v-make-kickstart.1.html -/html/virt-rescue.1.html -/html/virt-resize.1.html -/html/virt-sparsify.1.html -/html/virt-sysprep.1.html -/html/virt-tar.1.html -/html/virt-tar-in.1.html -/html/virt-tar-out.1.html -/html/virt-v2v.1.html -/html/virt-v2v-test-harness.1.html -/html/virt-win-reg.1.html /inspector/actual-*.xml /inspector/stamp-virt-inspector.pod /inspector/test-xmllint.sh @@ -617,3 +559,6 @@ Makefile.in /v2v/v2v_unit_tests /v2v/virt-v2v /v2v/virt-v2v.1 +/website/*.html +/website/README.txt +/website/TODO.txt diff --git a/Makefile.am b/Makefile.am index 49e707665..1f1da83d5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -205,10 +205,6 @@ EXTRA_DIST = \ contrib/visualize-alignment/README \ contrib/visualize-alignment/tracetops.ml \ contrib/windows-icons.pl \ - html/draft.png \ - html/draft.svg \ - html/pod.css \ - html/virt-builder.svg \ libtool-kill-dependency_libs.sh \ logo/fish.svg logo/fish.png \ logo/fish-5yrs.svg logo/fish-5yrs.png \ @@ -220,6 +216,21 @@ EXTRA_DIST = \ tmp/.gitignore \ update-bugs.sh \ valgrind-suppressions \ + website/bugs.png \ + website/communicate.png \ + website/documentation.png \ + website/download.png \ + website/draft.png \ + website/draft.svg \ + website/easytoread.css \ + website/feed.css \ + website/fish-5yrs.svg \ + website/fish.png \ + website/git.png \ + website/index.css \ + website/index.html.in \ + website/pod.css \ + website/standard.css \ zanata.xml \ zanata-pull.sh \ .x-sc_avoid_ctype_macros \ @@ -230,94 +241,7 @@ EXTRA_DIST = \ .x-sc_TAB_in_indentation \ .x-sc_trailing_blank -# The website. -HTMLFILES = \ - html/guestfs.3.html \ - html/guestfs-examples.3.html \ - html/guestfs-faq.1.html \ - html/guestfs-hacking.1.html \ - html/guestfs-internals.1.html \ - html/guestfs-performance.1.html \ - html/guestfs-recipes.1.html \ - html/guestfs-release-notes.1.html \ - html/guestfs-security.1.html \ - html/guestfs-testing.1.html \ - html/guestfsd.8.html \ - html/guestfish.1.html \ - html/libguestfs-make-fixed-appliance.1.html \ - html/libguestfs-test-tool.1.html \ - html/virt-alignment-scan.1.html \ - html/virt-builder.1.html \ - html/virt-cat.1.html \ - html/virt-copy-in.1.html \ - html/virt-copy-out.1.html \ - html/virt-customize.1.html \ - html/virt-df.1.html \ - html/virt-dib.1.html \ - html/virt-diff.1.html \ - html/virt-edit.1.html \ - html/virt-filesystems.1.html \ - html/virt-format.1.html \ - html/virt-get-kernel.1.html \ - html/virt-inspector.1.html \ - html/virt-list-filesystems.1.html \ - html/virt-list-partitions.1.html \ - html/virt-log.1.html \ - html/virt-ls.1.html \ - html/virt-make-fs.1.html \ - html/virt-rescue.1.html \ - html/virt-resize.1.html \ - html/virt-sparsify.1.html \ - html/virt-sysprep.1.html \ - html/virt-tar.1.html \ - html/virt-tar-in.1.html \ - html/virt-tar-out.1.html \ - html/virt-v2v.1.html \ - html/virt-win-reg.1.html - -if HAVE_ERLANG -HTMLFILES += html/guestfs-erlang.3.html -endif -if HAVE_GOLANG -HTMLFILES += html/guestfs-golang.3.html -endif -if HAVE_JAVA -HTMLFILES += html/guestfs-java.3.html -endif -if HAVE_LUA -HTMLFILES += html/guestfs-lua.3.html -endif -if HAVE_OCAML -HTMLFILES += html/guestfs-ocaml.3.html -endif -if HAVE_PERL -HTMLFILES += html/guestfs-perl.3.html -endif -if HAVE_PYTHON -HTMLFILES += html/guestfs-python.3.html -endif -if HAVE_RUBY -HTMLFILES += html/guestfs-ruby.3.html -endif -if HAVE_FUSE -HTMLFILES += \ - html/guestmount.1.html \ - html/guestunmount.1.html -endif -if HAVE_P2V -HTMLFILES += \ - html/virt-p2v.1.html \ - html/virt-p2v-make-disk.1.html \ - html/virt-p2v-make-kickstart.1.html -endif - -HTMLSUPPORTFILES = \ - html/draft.png \ - html/pod.css \ - html/virt-builder.svg - -TEXTFILES = BUGS README TODO - +# XXX Eventually move builder/website under website/ top level directory. BUILDERFILES = \ builder/website/README \ builder/website/index \ @@ -325,19 +249,20 @@ BUILDERFILES = \ WEBSITEDIR = $(HOME)/d/websites/libguestfs -# For reasons not fully understood, we need to rebuild all the -# man pages and HTMLFILES from scratch here. -website: $(HTMLFILES) $(HTMLSUPPORTFILES) $(TEXTFILES) $(BUILDERFILES) - find -name 'stamp-*.pod' -delete - $(MAKE) - cp $(HTMLFILES) $(HTMLSUPPORTFILES) $(WEBSITEDIR) - for f in $(TEXTFILES); do cp $$f $(WEBSITEDIR)/$$f.txt; done +noinst_DATA = \ + website/index.html \ + website/README.txt \ + website/TODO.txt + +website/README.txt: README + cp $< $@ + +website/TODO.txt: TODO + cp $< $@ + +maintainer-upload-website: + cp website/*.{css,html,png,svg,txt} $(WEBSITEDIR)/ cp $(BUILDERFILES) $(WEBSITEDIR)/download/builder/ - cd $(WEBSITEDIR) && \ - date=`date +%F`; \ - sed -e "s/SUBST_VERSION/$(VERSION)/" \ - -e "s/SUBST_DATE/$$date/" \ - < index.html.in > index.html # When doing 'make dist' update a few files automatically. dist-hook: @@ -405,13 +330,14 @@ podwrapper.1: podwrapper.pl CLEANFILES = \ *~ \ - html/*.html \ pod2htm?.tmp \ podwrapper.1 \ qemu-wrapper.sh \ tmp/disk* \ tmp/run-* \ - tmp/valgrind-*.log + tmp/valgrind-*.log \ + website/*~ \ + website/*.html clean-local: -rm -rf tmp/libguestfs?????? diff --git a/align/Makefile.am b/align/Makefile.am index 92b86b77e..d54fab8fd 100644 --- a/align/Makefile.am +++ b/align/Makefile.am @@ -74,14 +74,14 @@ virt_alignment_scan_LDADD = \ # Manual pages and HTML files for the website. man_MANS = virt-alignment-scan.1 -noinst_DATA = $(top_builddir)/html/virt-alignment-scan.1.html +noinst_DATA = $(top_builddir)/website/virt-alignment-scan.1.html -virt-alignment-scan.1 $(top_builddir)/html/virt-alignment-scan.1.html: stamp-virt-alignment-scan.pod +virt-alignment-scan.1 $(top_builddir)/website/virt-alignment-scan.1.html: stamp-virt-alignment-scan.pod stamp-virt-alignment-scan.pod: virt-alignment-scan.pod $(PODWRAPPER) \ --man virt-alignment-scan.1 \ - --html $(top_builddir)/html/virt-alignment-scan.1.html \ + --html $(top_builddir)/website/virt-alignment-scan.1.html \ --license GPLv2+ \ $< touch $@ diff --git a/appliance/Makefile.am b/appliance/Makefile.am index d47fd235a..004c8a111 100644 --- a/appliance/Makefile.am +++ b/appliance/Makefile.am @@ -127,12 +127,12 @@ sbin_SCRIPTS = libguestfs-make-fixed-appliance man_MANS = libguestfs-make-fixed-appliance.1 -libguestfs-make-fixed-appliance.1 $(top_builddir)/html/libguestfs-make-fixed-appliance.1.html: stamp-libguestfs-make-fixed-appliance.pod +libguestfs-make-fixed-appliance.1 $(top_builddir)/website/libguestfs-make-fixed-appliance.1.html: stamp-libguestfs-make-fixed-appliance.pod stamp-libguestfs-make-fixed-appliance.pod: libguestfs-make-fixed-appliance.pod $(PODWRAPPER) \ --man libguestfs-make-fixed-appliance.1 \ - --html $(top_builddir)/html/libguestfs-make-fixed-appliance.1.html \ + --html $(top_builddir)/website/libguestfs-make-fixed-appliance.1.html \ --license GPLv2+ \ $< touch $@ diff --git a/builder/Makefile.am b/builder/Makefile.am index 1591150fe..a56390877 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -205,14 +205,14 @@ endif # Manual pages and HTML files for the website. man_MANS += virt-builder.1 -noinst_DATA += $(top_builddir)/html/virt-builder.1.html +noinst_DATA += $(top_builddir)/website/virt-builder.1.html -virt-builder.1 $(top_builddir)/html/virt-builder.1.html: stamp-virt-builder.pod +virt-builder.1 $(top_builddir)/website/virt-builder.1.html: stamp-virt-builder.pod stamp-virt-builder.pod: virt-builder.pod $(top_srcdir)/customize/customize-synopsis.pod $(top_srcdir)/customize/customize-options.pod $(PODWRAPPER) \ --man virt-builder.1 \ - --html $(top_builddir)/html/virt-builder.1.html \ + --html $(top_builddir)/website/virt-builder.1.html \ --insert $(top_srcdir)/customize/customize-synopsis.pod:__CUSTOMIZE_SYNOPSIS__ \ --insert $(top_srcdir)/customize/customize-options.pod:__CUSTOMIZE_OPTIONS__ \ --license GPLv2+ \ @@ -346,14 +346,14 @@ virt_index_validate_LDADD = \ ../gnulib/lib/libgnu.la man_MANS += virt-index-validate.1 -noinst_DATA += $(top_builddir)/html/virt-index-validate.1.html +noinst_DATA += $(top_builddir)/website/virt-index-validate.1.html -virt-index-validate.1 $(top_builddir)/html/virt-index-validate.1.html: stamp-virt-index-validate.pod +virt-index-validate.1 $(top_builddir)/website/virt-index-validate.1.html: stamp-virt-index-validate.pod stamp-virt-index-validate.pod: virt-index-validate.pod $(PODWRAPPER) \ --man virt-index-validate.1 \ - --html $(top_builddir)/html/virt-index-validate.1.html \ + --html $(top_builddir)/website/virt-index-validate.1.html \ --license GPLv2+ \ $< touch $@ diff --git a/cat/Makefile.am b/cat/Makefile.am index d0db6fa86..db981c65e 100644 --- a/cat/Makefile.am +++ b/cat/Makefile.am @@ -144,47 +144,47 @@ virt_ls_LDADD = \ man_MANS = virt-cat.1 virt-filesystems.1 virt-log.1 virt-ls.1 noinst_DATA = \ - $(top_builddir)/html/virt-cat.1.html \ - $(top_builddir)/html/virt-filesystems.1.html \ - $(top_builddir)/html/virt-log.1.html \ - $(top_builddir)/html/virt-ls.1.html + $(top_builddir)/website/virt-cat.1.html \ + $(top_builddir)/website/virt-filesystems.1.html \ + $(top_builddir)/website/virt-log.1.html \ + $(top_builddir)/website/virt-ls.1.html -virt-cat.1 $(top_builddir)/html/virt-cat.1.html: stamp-virt-cat.pod +virt-cat.1 $(top_builddir)/website/virt-cat.1.html: stamp-virt-cat.pod stamp-virt-cat.pod: virt-cat.pod $(PODWRAPPER) \ --man virt-cat.1 \ - --html $(top_builddir)/html/virt-cat.1.html \ + --html $(top_builddir)/website/virt-cat.1.html \ --license GPLv2+ \ $< touch $@ -virt-filesystems.1 $(top_builddir)/html/virt-filesystems.1.html: stamp-virt-filesystems.pod +virt-filesystems.1 $(top_builddir)/website/virt-filesystems.1.html: stamp-virt-filesystems.pod stamp-virt-filesystems.pod: virt-filesystems.pod $(PODWRAPPER) \ --man virt-filesystems.1 \ - --html $(top_builddir)/html/virt-filesystems.1.html \ + --html $(top_builddir)/website/virt-filesystems.1.html \ --license GPLv2+ \ $< touch $@ -virt-log.1 $(top_builddir)/html/virt-log.1.html: stamp-virt-log.pod +virt-log.1 $(top_builddir)/website/virt-log.1.html: stamp-virt-log.pod stamp-virt-log.pod: virt-log.pod $(PODWRAPPER) \ --man virt-log.1 \ - --html $(top_builddir)/html/virt-log.1.html \ + --html $(top_builddir)/website/virt-log.1.html \ --license GPLv2+ \ $< touch $@ -virt-ls.1 $(top_builddir)/html/virt-ls.1.html: stamp-virt-ls.pod +virt-ls.1 $(top_builddir)/website/virt-ls.1.html: stamp-virt-ls.pod stamp-virt-ls.pod: virt-ls.pod $(PODWRAPPER) \ --man virt-ls.1 \ - --html $(top_builddir)/html/virt-ls.1.html \ + --html $(top_builddir)/website/virt-ls.1.html \ --license GPLv2+ \ $< touch $@ diff --git a/configure.ac b/configure.ac index 8f97c28dc..d8f05954f 100644 --- a/configure.ac +++ b/configure.ac @@ -23,6 +23,11 @@ m4_define([libguestfs_minor], [31]) m4_define([libguestfs_release], [23]) AC_INIT([libguestfs],libguestfs_major.libguestfs_minor.libguestfs_release) + +dnl The date that the above version was released. This is used in +dnl the website 'index.html' file. +AC_SUBST([RELEASE_DATE], [2015-10-31]) + AC_CONFIG_AUX_DIR([build-aux]) dnl Initialize automake. automake < 1.12 didn't have serial-tests and @@ -293,7 +298,8 @@ AC_CONFIG_FILES([Makefile tools/Makefile v2v/Makefile v2v/test-harness/Makefile - v2v/test-harness/META]) + v2v/test-harness/META + website/index.html]) AC_OUTPUT dnl Produce summary. diff --git a/customize/Makefile.am b/customize/Makefile.am index aee7729b8..875be4c14 100644 --- a/customize/Makefile.am +++ b/customize/Makefile.am @@ -150,14 +150,14 @@ endif # Manual pages and HTML files for the website. man_MANS = virt-customize.1 -noinst_DATA = $(top_builddir)/html/virt-customize.1.html +noinst_DATA = $(top_builddir)/website/virt-customize.1.html -virt-customize.1 $(top_builddir)/html/virt-customize.1.html: stamp-virt-customize.pod +virt-customize.1 $(top_builddir)/website/virt-customize.1.html: stamp-virt-customize.pod stamp-virt-customize.pod: virt-customize.pod $(top_srcdir)/customize/customize-synopsis.pod $(top_srcdir)/customize/customize-options.pod $(PODWRAPPER) \ --man virt-customize.1 \ - --html $(top_builddir)/html/virt-customize.1.html \ + --html $(top_builddir)/website/virt-customize.1.html \ --insert $(top_srcdir)/customize/customize-synopsis.pod:__CUSTOMIZE_SYNOPSIS__ \ --insert $(top_srcdir)/customize/customize-options.pod:__CUSTOMIZE_OPTIONS__ \ --license GPLv2+ \ diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 0a01a241b..e1522a62e 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -222,15 +222,15 @@ man_MANS = guestfsd.8 else noinst_MANS = guestfsd.8 endif -noinst_DATA = $(top_builddir)/html/guestfsd.8.html +noinst_DATA = $(top_builddir)/website/guestfsd.8.html -guestfsd.8 $(top_builddir)/html/guestfsd.8.html: stamp-guestfsd.pod +guestfsd.8 $(top_builddir)/website/guestfsd.8.html: stamp-guestfsd.pod stamp-guestfsd.pod: guestfsd.pod $(PODWRAPPER) \ --section 8 \ --man guestfsd.8 \ - --html $(top_builddir)/html/guestfsd.8.html \ + --html $(top_builddir)/website/guestfsd.8.html \ --license GPLv2+ \ $< touch $@ diff --git a/df/Makefile.am b/df/Makefile.am index e56ac7984..9f7d118df 100644 --- a/df/Makefile.am +++ b/df/Makefile.am @@ -77,14 +77,14 @@ virt_df_LDADD = \ # Manual pages and HTML files for the website. man_MANS = virt-df.1 -noinst_DATA = $(top_builddir)/html/virt-df.1.html +noinst_DATA = $(top_builddir)/website/virt-df.1.html -virt-df.1 $(top_builddir)/html/virt-df.1.html: stamp-virt-df.pod +virt-df.1 $(top_builddir)/website/virt-df.1.html: stamp-virt-df.pod stamp-virt-df.pod: virt-df.pod $(PODWRAPPER) \ --man virt-df.1 \ - --html $(top_builddir)/html/virt-df.1.html \ + --html $(top_builddir)/website/virt-df.1.html \ --license GPLv2+ \ $< touch $@ diff --git a/dib/Makefile.am b/dib/Makefile.am index 07dcd6d89..d8c73b142 100644 --- a/dib/Makefile.am +++ b/dib/Makefile.am @@ -109,14 +109,14 @@ endif man_MANS = virt-dib.1 -noinst_DATA = $(top_builddir)/html/virt-dib.1.html +noinst_DATA = $(top_builddir)/website/virt-dib.1.html -virt-dib.1 $(top_builddir)/html/virt-dib.1.html: stamp-virt-dib.pod +virt-dib.1 $(top_builddir)/website/virt-dib.1.html: stamp-virt-dib.pod stamp-virt-dib.pod: virt-dib.pod $(PODWRAPPER) \ --man virt-dib.1 \ - --html $(top_builddir)/html/virt-dib.1.html \ + --html $(top_builddir)/website/virt-dib.1.html \ --license GPLv2+ \ $< touch $@ diff --git a/diff/Makefile.am b/diff/Makefile.am index 65a8a305e..95c186f1c 100644 --- a/diff/Makefile.am +++ b/diff/Makefile.am @@ -63,14 +63,14 @@ virt_diff_LDADD = \ man_MANS = virt-diff.1 noinst_DATA = \ - $(top_builddir)/html/virt-diff.1.html + $(top_builddir)/website/virt-diff.1.html -virt-diff.1 $(top_builddir)/html/virt-diff.1.html: stamp-virt-diff.pod +virt-diff.1 $(top_builddir)/website/virt-diff.1.html: stamp-virt-diff.pod stamp-virt-diff.pod: virt-diff.pod $(PODWRAPPER) \ --man virt-diff.1 \ - --html $(top_builddir)/html/virt-diff.1.html \ + --html $(top_builddir)/website/virt-diff.1.html \ --license GPLv2+ \ $< touch $@ diff --git a/docs/Makefile.am b/docs/Makefile.am index 2b6484ae9..c49b11e41 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -48,99 +48,99 @@ man_MANS = \ guestfs-security.1 \ guestfs-testing.1 noinst_DATA = \ - $(top_builddir)/html/guestfs-faq.1.html \ - $(top_builddir)/html/guestfs-hacking.1.html \ - $(top_builddir)/html/guestfs-internals.1.html \ - $(top_builddir)/html/guestfs-performance.1.html \ - $(top_builddir)/html/guestfs-recipes.1.html \ - $(top_builddir)/html/guestfs-release-notes.1.html \ - $(top_builddir)/html/guestfs-security.1.html \ - $(top_builddir)/html/guestfs-testing.1.html + $(top_builddir)/website/guestfs-faq.1.html \ + $(top_builddir)/website/guestfs-hacking.1.html \ + $(top_builddir)/website/guestfs-internals.1.html \ + $(top_builddir)/website/guestfs-performance.1.html \ + $(top_builddir)/website/guestfs-recipes.1.html \ + $(top_builddir)/website/guestfs-release-notes.1.html \ + $(top_builddir)/website/guestfs-security.1.html \ + $(top_builddir)/website/guestfs-testing.1.html -guestfs-faq.1 $(top_builddir)/html/guestfs-faq.1.html: stamp-guestfs-faq.pod +guestfs-faq.1 $(top_builddir)/website/guestfs-faq.1.html: stamp-guestfs-faq.pod stamp-guestfs-faq.pod: guestfs-faq.pod $(PODWRAPPER) \ --section 1 \ --man guestfs-faq.1 \ - --html $(top_builddir)/html/guestfs-faq.1.html \ + --html $(top_builddir)/website/guestfs-faq.1.html \ --license LGPLv2+ \ $< touch $@ -guestfs-hacking.1 $(top_builddir)/html/guestfs-hacking.1.html: stamp-guestfs-hacking.pod +guestfs-hacking.1 $(top_builddir)/website/guestfs-hacking.1.html: stamp-guestfs-hacking.pod stamp-guestfs-hacking.pod: guestfs-hacking.pod $(PODWRAPPER) \ --section 1 \ --man guestfs-hacking.1 \ - --html $(top_builddir)/html/guestfs-hacking.1.html \ + --html $(top_builddir)/website/guestfs-hacking.1.html \ --license LGPLv2+ \ $< touch $@ -guestfs-internals.1 $(top_builddir)/html/guestfs-internals.1.html: stamp-guestfs-internals.pod +guestfs-internals.1 $(top_builddir)/website/guestfs-internals.1.html: stamp-guestfs-internals.pod stamp-guestfs-internals.pod: guestfs-internals.pod $(PODWRAPPER) \ --section 1 \ --man guestfs-internals.1 \ - --html $(top_builddir)/html/guestfs-internals.1.html \ + --html $(top_builddir)/website/guestfs-internals.1.html \ --license LGPLv2+ \ $< touch $@ -guestfs-performance.1 $(top_builddir)/html/guestfs-performance.1.html: stamp-guestfs-performance.pod +guestfs-performance.1 $(top_builddir)/website/guestfs-performance.1.html: stamp-guestfs-performance.pod stamp-guestfs-performance.pod: guestfs-performance.pod $(PODWRAPPER) \ --section 1 \ --man guestfs-performance.1 \ - --html $(top_builddir)/html/guestfs-performance.1.html \ + --html $(top_builddir)/website/guestfs-performance.1.html \ --license LGPLv2+ \ $< touch $@ -guestfs-recipes.1 $(top_builddir)/html/guestfs-recipes.1.html: stamp-guestfs-recipes.pod +guestfs-recipes.1 $(top_builddir)/website/guestfs-recipes.1.html: stamp-guestfs-recipes.pod stamp-guestfs-recipes.pod: guestfs-recipes.pod $(PODWRAPPER) \ --section 1 \ --man guestfs-recipes.1 \ - --html $(top_builddir)/html/guestfs-recipes.1.html \ + --html $(top_builddir)/website/guestfs-recipes.1.html \ --license examples \ $< touch $@ -guestfs-release-notes.1 guestfs-release-notes.txt $(top_builddir)/html/guestfs-release-notes.1.html: stamp-guestfs-release-notes.pod +guestfs-release-notes.1 guestfs-release-notes.txt $(top_builddir)/website/guestfs-release-notes.1.html: stamp-guestfs-release-notes.pod stamp-guestfs-release-notes.pod: guestfs-release-notes.pod $(PODWRAPPER) \ --section 1 \ --man guestfs-release-notes.1 \ - --html $(top_builddir)/html/guestfs-release-notes.1.html \ + --html $(top_builddir)/website/guestfs-release-notes.1.html \ --license GPLv2+ \ $< touch $@ -guestfs-security.1 $(top_builddir)/html/guestfs-security.1.html: stamp-guestfs-security.pod +guestfs-security.1 $(top_builddir)/website/guestfs-security.1.html: stamp-guestfs-security.pod stamp-guestfs-security.pod: guestfs-security.pod $(PODWRAPPER) \ --section 1 \ --man guestfs-security.1 \ - --html $(top_builddir)/html/guestfs-security.1.html \ + --html $(top_builddir)/website/guestfs-security.1.html \ --license LGPLv2+ \ $< touch $@ -guestfs-testing.1 $(top_builddir)/html/guestfs-testing.1.html: stamp-guestfs-testing.pod +guestfs-testing.1 $(top_builddir)/website/guestfs-testing.1.html: stamp-guestfs-testing.pod stamp-guestfs-testing.pod: guestfs-testing.pod $(PODWRAPPER) \ --section 1 \ --man guestfs-testing.1 \ - --html $(top_builddir)/html/guestfs-testing.1.html \ + --html $(top_builddir)/website/guestfs-testing.1.html \ --license LGPLv2+ \ $< touch $@ diff --git a/docs/guestfs-hacking.pod b/docs/guestfs-hacking.pod index ca9b81eb8..9f4b72a6b 100644 --- a/docs/guestfs-hacking.pod +++ b/docs/guestfs-hacking.pod @@ -560,10 +560,6 @@ L command and documentation. Gnulib is used as a portability library. A copy of gnulib is included under here. -=item F - -Generated HTML manual pages. - =item F L, the virtual machine image inspector. @@ -648,6 +644,10 @@ Command line tools written in Perl (L and many others). L command and documentation. +=item F + +The L website files. + =item F =item F diff --git a/edit/Makefile.am b/edit/Makefile.am index bbb7254f0..519b57807 100644 --- a/edit/Makefile.am +++ b/edit/Makefile.am @@ -66,14 +66,14 @@ virt_edit_LDADD = \ # Manual pages and HTML files for the website. man_MANS = virt-edit.1 -noinst_DATA = $(top_builddir)/html/virt-edit.1.html +noinst_DATA = $(top_builddir)/website/virt-edit.1.html -virt-edit.1 $(top_builddir)/html/virt-edit.1.html: stamp-virt-edit.pod +virt-edit.1 $(top_builddir)/website/virt-edit.1.html: stamp-virt-edit.pod stamp-virt-edit.pod: virt-edit.pod $(PODWRAPPER) \ --man virt-edit.1 \ - --html $(top_builddir)/html/virt-edit.1.html \ + --html $(top_builddir)/website/virt-edit.1.html \ --license GPLv2+ \ $< touch $@ diff --git a/erlang/examples/Makefile.am b/erlang/examples/Makefile.am index 92e2c2dca..22d7a0ee6 100644 --- a/erlang/examples/Makefile.am +++ b/erlang/examples/Makefile.am @@ -26,15 +26,15 @@ EXTRA_DIST = \ CLEANFILES = stamp-guestfs-erlang.pod man_MANS = guestfs-erlang.3 -noinst_DATA = $(top_builddir)/html/guestfs-erlang.3.html +noinst_DATA = $(top_builddir)/website/guestfs-erlang.3.html -guestfs-erlang.3 $(top_builddir)/html/guestfs-erlang.3.html: stamp-guestfs-erlang.pod +guestfs-erlang.3 $(top_builddir)/website/guestfs-erlang.3.html: stamp-guestfs-erlang.pod stamp-guestfs-erlang.pod: guestfs-erlang.pod create_disk.erl inspect_vm.erl $(PODWRAPPER) \ --section 3 \ --man guestfs-erlang.3 \ - --html $(top_builddir)/html/guestfs-erlang.3.html \ + --html $(top_builddir)/website/guestfs-erlang.3.html \ --verbatim $(srcdir)/create_disk.erl:@EXAMPLE1@ \ --verbatim $(srcdir)/inspect_vm.erl:@EXAMPLE2@ \ --license examples \ diff --git a/examples/Makefile.am b/examples/Makefile.am index 06f5235cf..a27ce0dde 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -132,15 +132,15 @@ virt_dhcp_address_LDADD = \ endif man_MANS = guestfs-examples.3 -noinst_DATA = $(top_builddir)/html/guestfs-examples.3.html +noinst_DATA = $(top_builddir)/website/guestfs-examples.3.html -guestfs-examples.3 $(top_builddir)/html/guestfs-examples.3.html: stamp-guestfs-examples.pod +guestfs-examples.3 $(top_builddir)/website/guestfs-examples.3.html: stamp-guestfs-examples.pod stamp-guestfs-examples.pod: guestfs-examples.pod copy-over.c create-disk.c debug-logging.c display-icon.c inspect-vm.c libvirt-auth.c mount-local.c virt-dhcp-address.c $(PODWRAPPER) \ --section 3 \ --man guestfs-examples.3 \ - --html $(top_builddir)/html/guestfs-examples.3.html \ + --html $(top_builddir)/website/guestfs-examples.3.html \ --verbatim $(srcdir)/copy-over.c:@COPY_OVER@ \ --verbatim $(srcdir)/create-disk.c:@CREATE_DISK@ \ --verbatim $(srcdir)/debug-logging.c:@DEBUG_LOGGING@ \ diff --git a/fish/Makefile.am b/fish/Makefile.am index c4b82aea6..266b7665d 100644 --- a/fish/Makefile.am +++ b/fish/Makefile.am @@ -188,19 +188,19 @@ man_MANS = \ virt-tar-in.1 \ virt-tar-out.1 noinst_DATA = \ - $(top_builddir)/html/guestfish.1.html \ - $(top_builddir)/html/libguestfs-tools.conf.5.html \ - $(top_builddir)/html/virt-copy-in.1.html \ - $(top_builddir)/html/virt-copy-out.1.html \ - $(top_builddir)/html/virt-tar-in.1.html \ - $(top_builddir)/html/virt-tar-out.1.html + $(top_builddir)/website/guestfish.1.html \ + $(top_builddir)/website/libguestfs-tools.conf.5.html \ + $(top_builddir)/website/virt-copy-in.1.html \ + $(top_builddir)/website/virt-copy-out.1.html \ + $(top_builddir)/website/virt-tar-in.1.html \ + $(top_builddir)/website/virt-tar-out.1.html -guestfish.1 $(top_builddir)/html/guestfish.1.html: stamp-guestfish.pod +guestfish.1 $(top_builddir)/website/guestfish.1.html: stamp-guestfish.pod stamp-guestfish.pod: guestfish.pod guestfish-actions.pod guestfish-commands.pod guestfish-prepopts.pod $(PODWRAPPER) \ --man guestfish.1 \ - --html $(top_builddir)/html/guestfish.1.html \ + --html $(top_builddir)/website/guestfish.1.html \ --insert $(srcdir)/guestfish-actions.pod:__ACTIONS__ \ --insert $(srcdir)/guestfish-commands.pod:__FISH_COMMANDS__ \ --insert $(srcdir)/guestfish-prepopts.pod:__PREPOPTS__ \ @@ -208,53 +208,53 @@ stamp-guestfish.pod: guestfish.pod guestfish-actions.pod guestfish-commands.pod $< touch $@ -libguestfs-tools.conf.5 $(top_builddir)/html/libguestfs-tools.conf.5.html: stamp-libguestfs-tools.conf.pod +libguestfs-tools.conf.5 $(top_builddir)/website/libguestfs-tools.conf.5.html: stamp-libguestfs-tools.conf.pod stamp-libguestfs-tools.conf.pod: libguestfs-tools.conf.pod $(PODWRAPPER) \ --section 5 \ --man libguestfs-tools.conf.5 \ - --html $(top_builddir)/html/libguestfs-tools.conf.5.html \ + --html $(top_builddir)/website/libguestfs-tools.conf.5.html \ --license GPLv2+ \ $< touch $@ -virt-copy-in.1 $(top_builddir)/html/virt-copy-in.1.html: stamp-virt-copy-in.pod +virt-copy-in.1 $(top_builddir)/website/virt-copy-in.1.html: stamp-virt-copy-in.pod stamp-virt-copy-in.pod: virt-copy-in.pod $(PODWRAPPER) \ --man virt-copy-in.1 \ - --html $(top_builddir)/html/virt-copy-in.1.html \ + --html $(top_builddir)/website/virt-copy-in.1.html \ --license GPLv2+ \ $< touch $@ -virt-copy-out.1 $(top_builddir)/html/virt-copy-out.1.html: stamp-virt-copy-out.pod +virt-copy-out.1 $(top_builddir)/website/virt-copy-out.1.html: stamp-virt-copy-out.pod stamp-virt-copy-out.pod: virt-copy-out.pod $(PODWRAPPER) \ --man virt-copy-out.1 \ - --html $(top_builddir)/html/virt-copy-out.1.html \ + --html $(top_builddir)/website/virt-copy-out.1.html \ --license GPLv2+ \ $< touch $@ -virt-tar-in.1 $(top_builddir)/html/virt-tar-in.1.html: stamp-virt-tar-in.pod +virt-tar-in.1 $(top_builddir)/website/virt-tar-in.1.html: stamp-virt-tar-in.pod stamp-virt-tar-in.pod: virt-tar-in.pod $(PODWRAPPER) \ --man virt-tar-in.1 \ - --html $(top_builddir)/html/virt-tar-in.1.html \ + --html $(top_builddir)/website/virt-tar-in.1.html \ --license GPLv2+ \ $< touch $@ -virt-tar-out.1 $(top_builddir)/html/virt-tar-out.1.html: stamp-virt-tar-out.pod +virt-tar-out.1 $(top_builddir)/website/virt-tar-out.1.html: stamp-virt-tar-out.pod stamp-virt-tar-out.pod: virt-tar-out.pod $(PODWRAPPER) \ --man virt-tar-out.1 \ - --html $(top_builddir)/html/virt-tar-out.1.html \ + --html $(top_builddir)/website/virt-tar-out.1.html \ --license GPLv2+ \ $< touch $@ diff --git a/format/Makefile.am b/format/Makefile.am index 276cfc36b..55204a3ca 100644 --- a/format/Makefile.am +++ b/format/Makefile.am @@ -62,14 +62,14 @@ virt_format_LDADD = \ # Manual pages and HTML files for the website. man_MANS = virt-format.1 -noinst_DATA = $(top_builddir)/html/virt-format.1.html +noinst_DATA = $(top_builddir)/website/virt-format.1.html -virt-format.1 $(top_builddir)/html/virt-format.1.html: stamp-virt-format.pod +virt-format.1 $(top_builddir)/website/virt-format.1.html: stamp-virt-format.pod stamp-virt-format.pod: virt-format.pod $(PODWRAPPER) \ --man virt-format.1 \ - --html $(top_builddir)/html/virt-format.1.html \ + --html $(top_builddir)/website/virt-format.1.html \ --license GPLv2+ \ $< touch $@ diff --git a/fuse/Makefile.am b/fuse/Makefile.am index 318061b0d..e0186548a 100644 --- a/fuse/Makefile.am +++ b/fuse/Makefile.am @@ -101,25 +101,25 @@ man_MANS = \ guestmount.1 \ guestunmount.1 noinst_DATA = \ - $(top_builddir)/html/guestmount.1.html \ - $(top_builddir)/html/guestunmount.1.html + $(top_builddir)/website/guestmount.1.html \ + $(top_builddir)/website/guestunmount.1.html -guestmount.1 $(top_builddir)/html/guestmount.1.html: stamp-guestmount.pod +guestmount.1 $(top_builddir)/website/guestmount.1.html: stamp-guestmount.pod stamp-guestmount.pod: guestmount.pod $(PODWRAPPER) \ --man guestmount.1 \ - --html $(top_builddir)/html/guestmount.1.html \ + --html $(top_builddir)/website/guestmount.1.html \ --license GPLv2+ \ $< touch $@ -guestunmount.1 $(top_builddir)/html/guestunmount.1.html: stamp-guestunmount.pod +guestunmount.1 $(top_builddir)/website/guestunmount.1.html: stamp-guestunmount.pod stamp-guestunmount.pod: guestunmount.pod $(PODWRAPPER) \ --man guestunmount.1 \ - --html $(top_builddir)/html/guestunmount.1.html \ + --html $(top_builddir)/website/guestunmount.1.html \ --license GPLv2+ \ $< touch $@ diff --git a/get-kernel/Makefile.am b/get-kernel/Makefile.am index f764edc22..8dd1e5941 100644 --- a/get-kernel/Makefile.am +++ b/get-kernel/Makefile.am @@ -111,14 +111,14 @@ endif # Manual pages and HTML files for the website. man_MANS += virt-get-kernel.1 -noinst_DATA += $(top_builddir)/html/virt-get-kernel.1.html +noinst_DATA += $(top_builddir)/website/virt-get-kernel.1.html -virt-get-kernel.1 $(top_builddir)/html/virt-get-kernel.1.html: stamp-virt-get-kernel.pod +virt-get-kernel.1 $(top_builddir)/website/virt-get-kernel.1.html: stamp-virt-get-kernel.pod stamp-virt-get-kernel.pod: virt-get-kernel.pod $(PODWRAPPER) \ --man virt-get-kernel.1 \ - --html $(top_builddir)/html/virt-get-kernel.1.html \ + --html $(top_builddir)/website/virt-get-kernel.1.html \ --license GPLv2+ \ $< touch $@ diff --git a/golang/examples/Makefile.am b/golang/examples/Makefile.am index b5093ef28..e77e57cd2 100644 --- a/golang/examples/Makefile.am +++ b/golang/examples/Makefile.am @@ -26,15 +26,15 @@ EXTRA_DIST = \ CLEANFILES = stamp-guestfs-golang.pod man_MANS = guestfs-golang.3 -noinst_DATA = $(top_builddir)/html/guestfs-golang.3.html +noinst_DATA = $(top_builddir)/website/guestfs-golang.3.html -guestfs-golang.3 $(top_builddir)/html/guestfs-golang.3.html: stamp-guestfs-golang.pod +guestfs-golang.3 $(top_builddir)/website/guestfs-golang.3.html: stamp-guestfs-golang.pod stamp-guestfs-golang.pod: guestfs-golang.pod create-disk.go inspect-vm.go $(PODWRAPPER) \ --section 3 \ --man guestfs-golang.3 \ - --html $(top_builddir)/html/guestfs-golang.3.html \ + --html $(top_builddir)/website/guestfs-golang.3.html \ --verbatim $(srcdir)/create-disk.go:@EXAMPLE1@ \ --verbatim $(srcdir)/inspect-vm.go:@EXAMPLE2@ \ --license examples \ diff --git a/html/virt-builder.svg b/html/virt-builder.svg deleted file mode 100644 index b034dc8ba..000000000 --- a/html/virt-builder.svg +++ /dev/null @@ -1,225 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - virt-builder - - - diff --git a/inspector/Makefile.am b/inspector/Makefile.am index 9c79bed2d..2e0140561 100644 --- a/inspector/Makefile.am +++ b/inspector/Makefile.am @@ -91,14 +91,14 @@ virt_inspector_LDADD = \ # Manual pages and HTML files for the website. man_MANS = virt-inspector.1 -noinst_DATA = $(top_builddir)/html/virt-inspector.1.html +noinst_DATA = $(top_builddir)/website/virt-inspector.1.html -virt-inspector.1 $(top_builddir)/html/virt-inspector.1.html: stamp-virt-inspector.pod +virt-inspector.1 $(top_builddir)/website/virt-inspector.1.html: stamp-virt-inspector.pod stamp-virt-inspector.pod: virt-inspector.pod $(PODWRAPPER) \ --man virt-inspector.1 \ - --html $(top_builddir)/html/virt-inspector.1.html \ + --html $(top_builddir)/website/virt-inspector.1.html \ --license GPLv2+ \ $< touch $@ diff --git a/java/examples/Makefile.am b/java/examples/Makefile.am index f49419097..8103318a5 100644 --- a/java/examples/Makefile.am +++ b/java/examples/Makefile.am @@ -28,15 +28,15 @@ CLEANFILES = \ stamp-guestfs-java.pod man_MANS = guestfs-java.3 -noinst_DATA = $(top_builddir)/html/guestfs-java.3.html +noinst_DATA = $(top_builddir)/website/guestfs-java.3.html -guestfs-java.3 $(top_builddir)/html/guestfs-java.3.html: stamp-guestfs-java.pod +guestfs-java.3 $(top_builddir)/website/guestfs-java.3.html: stamp-guestfs-java.pod stamp-guestfs-java.pod: guestfs-java.pod CreateDisk.java InspectVM.java $(PODWRAPPER) \ --section 3 \ --man guestfs-java.3 \ - --html $(top_builddir)/html/guestfs-java.3.html \ + --html $(top_builddir)/website/guestfs-java.3.html \ --verbatim $(srcdir)/CreateDisk.java:@EXAMPLE1@ \ --verbatim $(srcdir)/InspectVM.java:@EXAMPLE2@ \ --license examples \ diff --git a/lua/examples/Makefile.am b/lua/examples/Makefile.am index 93ba2c54f..10950012c 100644 --- a/lua/examples/Makefile.am +++ b/lua/examples/Makefile.am @@ -26,15 +26,15 @@ EXTRA_DIST = \ CLEANFILES = stamp-guestfs-lua.pod man_MANS = guestfs-lua.3 -noinst_DATA = $(top_builddir)/html/guestfs-lua.3.html +noinst_DATA = $(top_builddir)/website/guestfs-lua.3.html -guestfs-lua.3 $(top_builddir)/html/guestfs-lua.3.html: stamp-guestfs-lua.pod +guestfs-lua.3 $(top_builddir)/website/guestfs-lua.3.html: stamp-guestfs-lua.pod stamp-guestfs-lua.pod: guestfs-lua.pod create_disk.lua inspect_vm.lua $(PODWRAPPER) \ --section 3 \ --man guestfs-lua.3 \ - --html $(top_builddir)/html/guestfs-lua.3.html \ + --html $(top_builddir)/website/guestfs-lua.3.html \ --verbatim $(srcdir)/create_disk.lua:@EXAMPLE1@ \ --verbatim $(srcdir)/inspect_vm.lua:@EXAMPLE2@ \ --license examples \ diff --git a/make-fs/Makefile.am b/make-fs/Makefile.am index b88ece09e..4ed6e990c 100644 --- a/make-fs/Makefile.am +++ b/make-fs/Makefile.am @@ -57,14 +57,14 @@ virt_make_fs_LDADD = \ man_MANS = virt-make-fs.1 noinst_DATA = \ - $(top_builddir)/html/virt-make-fs.1.html + $(top_builddir)/website/virt-make-fs.1.html -virt-make-fs.1 $(top_builddir)/html/virt-make-fs.1.html: stamp-virt-make-fs.pod +virt-make-fs.1 $(top_builddir)/website/virt-make-fs.1.html: stamp-virt-make-fs.pod stamp-virt-make-fs.pod: virt-make-fs.pod $(PODWRAPPER) \ --man virt-make-fs.1 \ - --html $(top_builddir)/html/virt-make-fs.1.html \ + --html $(top_builddir)/website/virt-make-fs.1.html \ --license GPLv2+ \ $< touch $@ diff --git a/ocaml/examples/Makefile.am b/ocaml/examples/Makefile.am index 512fd1216..34d60320a 100644 --- a/ocaml/examples/Makefile.am +++ b/ocaml/examples/Makefile.am @@ -30,15 +30,15 @@ CLEANFILES = \ stamp-guestfs-ocaml.pod man_MANS = guestfs-ocaml.3 -noinst_DATA = $(top_builddir)/html/guestfs-ocaml.3.html +noinst_DATA = $(top_builddir)/website/guestfs-ocaml.3.html -guestfs-ocaml.3 $(top_builddir)/html/guestfs-ocaml.3.html: stamp-guestfs-ocaml.pod +guestfs-ocaml.3 $(top_builddir)/website/guestfs-ocaml.3.html: stamp-guestfs-ocaml.pod stamp-guestfs-ocaml.pod: guestfs-ocaml.pod create_disk.ml inspect_vm.ml $(PODWRAPPER) \ --section 3 \ --man guestfs-ocaml.3 \ - --html $(top_builddir)/html/guestfs-ocaml.3.html \ + --html $(top_builddir)/website/guestfs-ocaml.3.html \ --verbatim $(srcdir)/create_disk.ml:@CREATE_DISK@ \ --verbatim $(srcdir)/inspect_vm.ml:@INSPECT_VM@ \ --verbatim $(srcdir)/debug_logging.ml:@DEBUG_LOGGING@ \ diff --git a/p2v/Makefile.am b/p2v/Makefile.am index b4167141c..d51324ed7 100644 --- a/p2v/Makefile.am +++ b/p2v/Makefile.am @@ -117,36 +117,36 @@ man_MANS = \ virt-p2v-make-kickstart.1 noinst_DATA = \ - $(top_builddir)/html/virt-p2v.1.html \ - $(top_builddir)/html/virt-p2v-make-disk.1.html \ - $(top_builddir)/html/virt-p2v-make-kickstart.1.html + $(top_builddir)/website/virt-p2v.1.html \ + $(top_builddir)/website/virt-p2v-make-disk.1.html \ + $(top_builddir)/website/virt-p2v-make-kickstart.1.html -virt-p2v.1 $(top_builddir)/html/virt-p2v.1.html: stamp-virt-p2v.pod +virt-p2v.1 $(top_builddir)/website/virt-p2v.1.html: stamp-virt-p2v.pod stamp-virt-p2v.pod: virt-p2v.pod $(PODWRAPPER) \ --man virt-p2v.1 \ - --html $(top_builddir)/html/virt-p2v.1.html \ + --html $(top_builddir)/website/virt-p2v.1.html \ --license GPLv2+ \ $< touch $@ -virt-p2v-make-disk.1 $(top_builddir)/html/virt-p2v-make-disk.1.html: stamp-virt-p2v-make-disk.pod +virt-p2v-make-disk.1 $(top_builddir)/website/virt-p2v-make-disk.1.html: stamp-virt-p2v-make-disk.pod stamp-virt-p2v-make-disk.pod: virt-p2v-make-disk.pod $(PODWRAPPER) \ --man virt-p2v-make-disk.1 \ - --html $(top_builddir)/html/virt-p2v-make-disk.1.html \ + --html $(top_builddir)/website/virt-p2v-make-disk.1.html \ --license GPLv2+ \ $< touch $@ -virt-p2v-make-kickstart.1 $(top_builddir)/html/virt-p2v-make-kickstart.1.html: stamp-virt-p2v-make-kickstart.pod +virt-p2v-make-kickstart.1 $(top_builddir)/website/virt-p2v-make-kickstart.1.html: stamp-virt-p2v-make-kickstart.pod stamp-virt-p2v-make-kickstart.pod: virt-p2v-make-kickstart.pod $(PODWRAPPER) \ --man virt-p2v-make-kickstart.1 \ - --html $(top_builddir)/html/virt-p2v-make-kickstart.1.html \ + --html $(top_builddir)/website/virt-p2v-make-kickstart.1.html \ --license GPLv2+ \ $< touch $@ diff --git a/perl/examples/Makefile.am b/perl/examples/Makefile.am index 9b041237d..8ccef2556 100644 --- a/perl/examples/Makefile.am +++ b/perl/examples/Makefile.am @@ -26,15 +26,15 @@ EXTRA_DIST = \ CLEANFILES = stamp-guestfs-perl.pod man_MANS = guestfs-perl.3 -noinst_DATA = $(top_builddir)/html/guestfs-perl.3.html +noinst_DATA = $(top_builddir)/website/guestfs-perl.3.html -guestfs-perl.3 $(top_builddir)/html/guestfs-perl.3.html: stamp-guestfs-perl.pod +guestfs-perl.3 $(top_builddir)/website/guestfs-perl.3.html: stamp-guestfs-perl.pod stamp-guestfs-perl.pod: guestfs-perl.pod create_disk.pl inspect_vm.pl $(PODWRAPPER) \ --section 3 \ --man guestfs-perl.3 \ - --html $(top_builddir)/html/guestfs-perl.3.html \ + --html $(top_builddir)/website/guestfs-perl.3.html \ --verbatim $(srcdir)/create_disk.pl:@EXAMPLE1@ \ --verbatim $(srcdir)/inspect_vm.pl:@EXAMPLE2@ \ --license examples \ diff --git a/podwrapper.pl.in b/podwrapper.pl.in index 3810f7214..af221230f 100755 --- a/podwrapper.pl.in +++ b/podwrapper.pl.in @@ -39,13 +39,13 @@ podwrapper.pl - Generate libguestfs documentation from POD input files man_MANS = virt-foo.1 - virt-foo.1 $(top_builddir)/html/virt-foo.1.html: stamp-virt-foo.pod + virt-foo.1 $(top_builddir)/website/virt-foo.1.html: stamp-virt-foo.pod stamp-virt-foo.pod: virt-foo.pod $(PODWRAPPER) \ --section 1 \ --man virt-foo.1 \ - --html $(top_builddir)/html/virt-foo.1.html \ + --html $(top_builddir)/website/virt-foo.1.html \ --license GPLv2+ \ $< touch $@ @@ -513,7 +513,7 @@ SUBHTML: { } if ($html) { - mkdir "$abs_top_builddir/html"; + mkdir "$abs_top_builddir/website"; my $parser = Podwrapper::XHTML->new; my $output; diff --git a/python/examples/Makefile.am b/python/examples/Makefile.am index 008a66861..a9293874d 100644 --- a/python/examples/Makefile.am +++ b/python/examples/Makefile.am @@ -26,15 +26,15 @@ EXTRA_DIST = \ CLEANFILES = *.pyc *.pyo stamp-guestfs-python.pod man_MANS = guestfs-python.3 -noinst_DATA = $(top_builddir)/html/guestfs-python.3.html +noinst_DATA = $(top_builddir)/website/guestfs-python.3.html -guestfs-python.3 $(top_builddir)/html/guestfs-python.3.html: stamp-guestfs-python.pod +guestfs-python.3 $(top_builddir)/website/guestfs-python.3.html: stamp-guestfs-python.pod stamp-guestfs-python.pod: guestfs-python.pod create_disk.py inspect_vm.py $(PODWRAPPER) \ --section 3 \ --man guestfs-python.3 \ - --html $(top_builddir)/html/guestfs-python.3.html \ + --html $(top_builddir)/website/guestfs-python.3.html \ --verbatim $(srcdir)/create_disk.py:@EXAMPLE1@ \ --verbatim $(srcdir)/inspect_vm.py:@EXAMPLE2@ \ --license examples \ diff --git a/rescue/Makefile.am b/rescue/Makefile.am index eab06e982..5123eea30 100644 --- a/rescue/Makefile.am +++ b/rescue/Makefile.am @@ -64,14 +64,14 @@ virt_rescue_LDADD = \ # Manual pages and HTML files for the website. man_MANS = virt-rescue.1 -noinst_DATA = $(top_builddir)/html/virt-rescue.1.html +noinst_DATA = $(top_builddir)/website/virt-rescue.1.html -virt-rescue.1 $(top_builddir)/html/virt-rescue.1.html: stamp-virt-rescue.pod +virt-rescue.1 $(top_builddir)/website/virt-rescue.1.html: stamp-virt-rescue.pod stamp-virt-rescue.pod: virt-rescue.pod $(PODWRAPPER) \ --man virt-rescue.1 \ - --html $(top_builddir)/html/virt-rescue.1.html \ + --html $(top_builddir)/website/virt-rescue.1.html \ --license GPLv2+ \ $< touch $@ diff --git a/resize/Makefile.am b/resize/Makefile.am index a013bcbe8..8150a315b 100644 --- a/resize/Makefile.am +++ b/resize/Makefile.am @@ -113,14 +113,14 @@ endif man_MANS = virt-resize.1 -noinst_DATA = $(top_builddir)/html/virt-resize.1.html +noinst_DATA = $(top_builddir)/website/virt-resize.1.html -virt-resize.1 $(top_builddir)/html/virt-resize.1.html: stamp-virt-resize.pod +virt-resize.1 $(top_builddir)/website/virt-resize.1.html: stamp-virt-resize.pod stamp-virt-resize.pod: virt-resize.pod $(PODWRAPPER) \ --man virt-resize.1 \ - --html $(top_builddir)/html/virt-resize.1.html \ + --html $(top_builddir)/website/virt-resize.1.html \ --license GPLv2+ \ $< touch $@ diff --git a/ruby/examples/Makefile.am b/ruby/examples/Makefile.am index 1329a2a85..166d6792b 100644 --- a/ruby/examples/Makefile.am +++ b/ruby/examples/Makefile.am @@ -26,15 +26,15 @@ EXTRA_DIST = \ CLEANFILES = stamp-guestfs-ruby.pod man_MANS = guestfs-ruby.3 -noinst_DATA = $(top_builddir)/html/guestfs-ruby.3.html +noinst_DATA = $(top_builddir)/website/guestfs-ruby.3.html -guestfs-ruby.3 $(top_builddir)/html/guestfs-ruby.3.html: stamp-guestfs-ruby.pod +guestfs-ruby.3 $(top_builddir)/website/guestfs-ruby.3.html: stamp-guestfs-ruby.pod stamp-guestfs-ruby.pod: guestfs-ruby.pod create_disk.rb inspect_vm.rb $(PODWRAPPER) \ --section 3 \ --man guestfs-ruby.3 \ - --html $(top_builddir)/html/guestfs-ruby.3.html \ + --html $(top_builddir)/website/guestfs-ruby.3.html \ --verbatim $(srcdir)/create_disk.rb:@EXAMPLE1@ \ --verbatim $(srcdir)/inspect_vm.rb:@EXAMPLE2@ \ --license examples \ diff --git a/sparsify/Makefile.am b/sparsify/Makefile.am index b785dba97..d6780f30c 100644 --- a/sparsify/Makefile.am +++ b/sparsify/Makefile.am @@ -106,14 +106,14 @@ endif man_MANS = virt-sparsify.1 -noinst_DATA = $(top_builddir)/html/virt-sparsify.1.html +noinst_DATA = $(top_builddir)/website/virt-sparsify.1.html -virt-sparsify.1 $(top_builddir)/html/virt-sparsify.1.html: stamp-virt-sparsify.pod +virt-sparsify.1 $(top_builddir)/website/virt-sparsify.1.html: stamp-virt-sparsify.pod stamp-virt-sparsify.pod: virt-sparsify.pod $(PODWRAPPER) \ --man virt-sparsify.1 \ - --html $(top_builddir)/html/virt-sparsify.1.html \ + --html $(top_builddir)/website/virt-sparsify.1.html \ --license GPLv2+ \ $< touch $@ diff --git a/src/Makefile.am b/src/Makefile.am index f5ecaa6ed..4515c4d8d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -280,9 +280,9 @@ pkgconfig_DATA = libguestfs.pc # Manual page. man_MANS = guestfs.3 libguestfs.3 -noinst_DATA = $(top_builddir)/html/guestfs.3.html +noinst_DATA = $(top_builddir)/website/guestfs.3.html -guestfs.3 $(top_builddir)/html/guestfs.3.html: stamp-guestfs.pod +guestfs.3 $(top_builddir)/website/guestfs.3.html: stamp-guestfs.pod stamp-guestfs.pod: guestfs.pod \ guestfs-actions.pod \ @@ -291,7 +291,7 @@ stamp-guestfs.pod: guestfs.pod \ $(PODWRAPPER) \ --section 3 \ --man guestfs.3 \ - --html $(top_builddir)/html/guestfs.3.html \ + --html $(top_builddir)/website/guestfs.3.html \ --insert $(srcdir)/guestfs-actions.pod:__ACTIONS__ \ --insert $(srcdir)/guestfs-availability.pod:__AVAILABILITY__ \ --insert $(srcdir)/guestfs-structs.pod:__STRUCTS__ \ diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am index a58632721..99e47f5f9 100644 --- a/sysprep/Makefile.am +++ b/sysprep/Makefile.am @@ -176,16 +176,16 @@ endif # Manual pages and HTML files for the website. man_MANS = virt-sysprep.1 -noinst_DATA = $(top_builddir)/html/virt-sysprep.1.html +noinst_DATA = $(top_builddir)/website/virt-sysprep.1.html -virt-sysprep.1 $(top_builddir)/html/virt-sysprep.1.html: stamp-virt-sysprep.pod +virt-sysprep.1 $(top_builddir)/website/virt-sysprep.1.html: stamp-virt-sysprep.pod stamp-virt-sysprep.pod: virt-sysprep.pod sysprep-extra-options.pod sysprep-operations.pod $(PODWRAPPER) \ --man virt-sysprep.1 \ --insert sysprep-extra-options.pod:__EXTRA_OPTIONS__ \ --insert sysprep-operations.pod:__OPERATIONS__ \ - --html $(top_builddir)/html/virt-sysprep.1.html \ + --html $(top_builddir)/website/virt-sysprep.1.html \ --license GPLv2+ \ $< touch $@ diff --git a/test-tool/Makefile.am b/test-tool/Makefile.am index 3053cb274..26ed44bf9 100644 --- a/test-tool/Makefile.am +++ b/test-tool/Makefile.am @@ -40,12 +40,12 @@ libguestfs_test_tool_LDADD = \ $(LTLIBINTL) \ $(top_builddir)/gnulib/lib/libgnu.la -libguestfs-test-tool.1 $(top_builddir)/html/libguestfs-test-tool.1.html: stamp-libguestfs-test-tool.pod +libguestfs-test-tool.1 $(top_builddir)/website/libguestfs-test-tool.1.html: stamp-libguestfs-test-tool.pod stamp-libguestfs-test-tool.pod: libguestfs-test-tool.pod $(PODWRAPPER) \ --man libguestfs-test-tool.1 \ - --html $(top_builddir)/html/libguestfs-test-tool.1.html \ + --html $(top_builddir)/website/libguestfs-test-tool.1.html \ --license GPLv2+ \ $< touch $@ diff --git a/tools/Makefile.am b/tools/Makefile.am index 40ee410ac..05b1a7aa5 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -41,7 +41,7 @@ bin_SCRIPTS = $(tools:%=virt-%) # then the man pages are neither built nor installed. man_MANS = virt-tar.1 $(patsubst %,virt-%.1,$(filter-out tar,$(tools))) -noinst_DATA = $(tools:%=$(top_builddir)/html/virt-%.1.html) +noinst_DATA = $(tools:%=$(top_builddir)/website/virt-%.1.html) virt-%.1: virt-% $(PODWRAPPER) \ @@ -49,7 +49,7 @@ virt-%.1: virt-% --license GPLv2+ \ $< -$(top_builddir)/html/virt-%.1.html: virt-% +$(top_builddir)/website/virt-%.1.html: virt-% $(PODWRAPPER) \ --html $@ \ --license GPLv2+ \ diff --git a/v2v/Makefile.am b/v2v/Makefile.am index 3e81101b3..c371249ee 100644 --- a/v2v/Makefile.am +++ b/v2v/Makefile.am @@ -210,14 +210,14 @@ virttoolsdatadir = $(datadir)/virt-tools man_MANS = virt-v2v.1 -noinst_DATA = $(top_builddir)/html/virt-v2v.1.html +noinst_DATA = $(top_builddir)/website/virt-v2v.1.html -virt-v2v.1 $(top_builddir)/html/virt-v2v.1.html: stamp-virt-v2v.pod +virt-v2v.1 $(top_builddir)/website/virt-v2v.1.html: stamp-virt-v2v.pod stamp-virt-v2v.pod: virt-v2v.pod $(PODWRAPPER) \ --man virt-v2v.1 \ - --html $(top_builddir)/html/virt-v2v.1.html \ + --html $(top_builddir)/website/virt-v2v.1.html \ --license GPLv2+ \ $< touch $@ diff --git a/v2v/test-harness/Makefile.am b/v2v/test-harness/Makefile.am index e562cf483..9513da167 100644 --- a/v2v/test-harness/Makefile.am +++ b/v2v/test-harness/Makefile.am @@ -125,14 +125,14 @@ install-data-hook: man_MANS = virt-v2v-test-harness.1 -noinst_DATA += $(top_builddir)/html/virt-v2v-test-harness.1.html +noinst_DATA += $(top_builddir)/website/virt-v2v-test-harness.1.html -virt-v2v-test-harness.1 $(top_builddir)/html/virt-v2v-test-harness.1.html: stamp-virt-v2v-test-harness.pod +virt-v2v-test-harness.1 $(top_builddir)/website/virt-v2v-test-harness.1.html: stamp-virt-v2v-test-harness.pod stamp-virt-v2v-test-harness.pod: virt-v2v-test-harness.pod $(PODWRAPPER) \ --man virt-v2v-test-harness.1 \ - --html $(top_builddir)/html/virt-v2v-test-harness.1.html \ + --html $(top_builddir)/website/virt-v2v-test-harness.1.html \ --license LGPLv2+ \ $< touch $@ diff --git a/website/bugs.png b/website/bugs.png new file mode 100644 index 000000000..210db8fc0 Binary files /dev/null and b/website/bugs.png differ diff --git a/website/communicate.png b/website/communicate.png new file mode 100644 index 000000000..a51b9bcd6 Binary files /dev/null and b/website/communicate.png differ diff --git a/website/documentation.png b/website/documentation.png new file mode 100644 index 000000000..27acf2d68 Binary files /dev/null and b/website/documentation.png differ diff --git a/website/download.png b/website/download.png new file mode 100644 index 000000000..12148839b Binary files /dev/null and b/website/download.png differ diff --git a/html/draft.png b/website/draft.png similarity index 100% rename from html/draft.png rename to website/draft.png diff --git a/html/draft.svg b/website/draft.svg similarity index 100% rename from html/draft.svg rename to website/draft.svg diff --git a/website/easytoread.css b/website/easytoread.css new file mode 100644 index 000000000..97a06ea55 --- /dev/null +++ b/website/easytoread.css @@ -0,0 +1,7 @@ +/* High contrast, large fonts. + * $Id: easytoread.css,v 1.1 2007/01/23 16:33:28 rjones Exp $ + */ + +body { + font-size: 200%; +} \ No newline at end of file diff --git a/website/feed.css b/website/feed.css new file mode 100644 index 000000000..c2bb3fd0d --- /dev/null +++ b/website/feed.css @@ -0,0 +1,27 @@ +/* styles for the RSS feed from feed2js */ + +.rss-box { + width: 380px; +} + +.rss-title { + display: none; +} + +.rss-items { + list-style: none; + padding: 1em; + margin-left: 1em; +} + +.rss-item { + border-left: none; + padding-left: none; +} + +.rss-item a:link, .rss-item a:visited, .rss-item a:active { +} + +.rss-date { + font-size: x-small; +} \ No newline at end of file diff --git a/website/fish-5yrs.svg b/website/fish-5yrs.svg new file mode 100644 index 000000000..53ea188b5 --- /dev/null +++ b/website/fish-5yrs.svg @@ -0,0 +1,406 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 years2009-2014 + + + diff --git a/website/fish.png b/website/fish.png new file mode 100644 index 000000000..4ecb797ad Binary files /dev/null and b/website/fish.png differ diff --git a/website/git.png b/website/git.png new file mode 100644 index 000000000..3f2fd1667 Binary files /dev/null and b/website/git.png differ diff --git a/website/index.css b/website/index.css new file mode 100644 index 000000000..9ff5fde30 --- /dev/null +++ b/website/index.css @@ -0,0 +1,61 @@ +p { + text-align: justify; +} + +div.right { + border: 1px solid #009df8; + background: #ffe; + width: 30em; + float: right; + clear: right; + font-size: small; + padding: 1em; + margin-left: 1em; + margin-top: 1em; + margin-right: 0.5em; +} + +div.right h2 { + font-size: small; + border-bottom: none; +} + +div.right li, div.right p { + width: 25em; +} + +div.right img { + float: left; + margin-right: 1em; + border: none; +} + +div.right pre { + background: #fcfcee; +} + +p.latest { + text-align: right; +} + +img#logo { + position: absolute; + top: 0px; + right: 0px; +} + +body { + margin: 0px; + padding: 0px; +} + +h1 { + height: 66px; + margin: 0px; + padding: 4px; + margin-right: 162px; + border-bottom: none; + background-color: #009df8; + color: #ffffa0; + text-shadow:0 -0.8px 1px rgba(0,0,0,0.5); +} diff --git a/website/index.html.in b/website/index.html.in new file mode 100644 index 000000000..d0c107f2e --- /dev/null +++ b/website/index.html.in @@ -0,0 +1,280 @@ + + + +libguestfs, library for accessing and modifying VM disk images + + + + + + + + + +

libguestfs
tools for accessing and modifying virtual machine disk images

+ +
+ +

Downloads

+ +

+For source see the downloads directory. +

+ +

+In Fedora +or Red Hat Enterprise Linux: +

+sudo yum install libguestfs-tools
+
+

+ +

+On Debian/Ubuntu: +

+sudo apt-get install libguestfs-tools
+
+

+ +

+Open a disk image: +

+guestfish --ro -i -a disk.img
+
+

+ +

+Other distros, compiling from source ... +

+
+ +
+ +

Mailing list and chat

+ +

+Join us on +the libguestfs +mailing list, or on IRC channel #libguestfs +on FreeNode. +

+ +
+ +
+ +

Documentation

+ +

+Frequently Asked Questions (FAQ) and +recipes page +

+ +

+guestfs(3) — main API documentation
+guestfish(1) — interactive shell
+guestmount(1) — mount guest filesystem in host
+guestunmount(1) — unmount guest filesystem
+virt-alignment-scan(1) — check alignment of virtual machine partitions
+virt-builder(1) — quick image builder
+virt-cat(1) — display a file
+virt-copy-in(1) — copy files and directories into a VM
+virt-copy-out(1) — copy files and directories out of a VM
+virt-customize(1) — customize virtual machines
+virt-df(1) — free space
+virt-dib(1) — safe diskimage-builder
+virt-diff(1) — differences
+virt-edit(1) — edit a file
+virt-filesystems(1) — display information about filesystems, devices, LVM
+virt-format(1) — erase and make blank disks
+virt-get-kernel(1) — get kernel from disk
+virt-inspector(1) — inspect VM images
+virt-list-filesystems(1) — list filesystems
+virt-list-partitions(1) — list partitions
+virt-log(1) — display log files
+virt-ls(1) — list files
+virt-make-fs(1) — make a filesystem
+virt-p2v(1) — convert physical machine to run on KVM
+virt-p2v-make-disk(1) — make P2V ISO
+virt-p2v-make-kickstart(1) — make P2V kickstart
+virt-rescue(1) — rescue shell
+virt-resize(1) — resize virtual machines
+virt-sparsify(1) — make virtual machines sparse (thin-provisioned)
+virt-sysprep(1) — unconfigure a virtual machine before cloning
+virt-tar(1) — archive and upload files
+virt-tar-in(1) — archive and upload files
+virt-tar-out(1) — archive and download files
+virt-v2v(1) — convert guest to run on KVM
+virt-win-reg(1) — export and merge Windows Registry keys
+libguestfs-test-tool(1) — test libguestfs
+libguestfs-make-fixed-appliance(1) — make libguestfs fixed appliance
+hivex(3) — extract Windows Registry hive
+hivexregedit(1) — merge and export Registry changes from regedit-format files
+hivexsh(1) — Windows Registry hive shell
+hivexml(1) — convert Windows Registry hive to XML
+hivexget(1) — extract data from Windows Registry hive
+febootstrap(8) — tool for building supermin appliances
+febootstrap-supermin-helper(8) — febootstrap helper
+supermin(1) — tool for building supermin appliances
+supermin-helper(1) — supermin helper
+guestfsd(8) — guestfs daemon
+
+

+ +

+For programmers: examples in +C/C++, +Erlang, +Golang, +Java, +Lua, +OCaml, +Perl, +Python, +Ruby, +guestfs-performance(1). +

+ +

+For developers: +README, +TODO, +FAQ, +guestfs-release-notes(1). +

+ +

+For testers: +guestfs-testing(1). +

+
+ +
+ +

Bug reports

+ +

+List of bugs in libguestfs and +in Fedora packaging of libguestfs +

+ +

+Enter a new bug report +

+
+ +
+ +

Git repository

+ +
+git clone git://github.com/libguestfs/libguestfs.git
+
+
+ + + +

+ + + Latest development version: @PACKAGE_VERSION@ (released @RELEASE_DATE@).
+ Stable branch: + + 1.30.x, + + Old stable: + + 1.28.x, + 1.26.x, + 1.24.x, + 1.22.x, + 1.20.x + + +

+ +

+libguestfs is a set of tools for accessing and modifying virtual +machine (VM) disk images. You can use this for +viewing and editing files inside guests, +scripting changes to VMs, +monitoring disk used/free statistics, +creating guests, P2V, +V2V, performing backups, +cloning VMs, building VMs, formatting disks, resizing disks, and much +more. +

+ +

+libguestfs can access almost any disk image imaginable. It can +do it securely — without needing root and with multiple layers +of defence against rogue disk images. It can access disk images on +remote machines or on CDs/USB sticks. It can access proprietary +systems like VMware and Hyper-V. +

+ +

+All this functionality is available through a scriptable shell +called guestfish, or an interactive +rescue shell virt-rescue. +

+ +

+libguestfs is a C library that can be linked with +C and C++ management programs and has +bindings for about a dozen other programming languages. Using our +FUSE module you can also +mount guest filesystems on the host. +

+ +

+The hivex subproject lets you +merge changes into the Windows Registry +in Windows guests. +You can examine unknown disk images +to find out what they contain. +

+ +

+libguestfs has been in continuous development since 2009, +with a 250 page manual, deployed in +enterprise environments, and with many happy and successful users. +

+ +

+Dozens of projects are using libguestfs today. +

+ +

Latest blog entries

+ + + + +

Getting started

+ +
+sudo yum install libguestfs-tools      # Fedora/RHEL/CentOS
+sudo apt-get install libguestfs-tools  # Debian/Ubuntu
+guestfish --ro -i -a disk.img
+
+ +

+For examples using guestfish and other tools see the +recipes page. For other examples +see these blog entries. +

+ +
+rjones AT redhat DOT com +
+ + + + + diff --git a/html/pod.css b/website/pod.css similarity index 100% rename from html/pod.css rename to website/pod.css diff --git a/website/standard.css b/website/standard.css new file mode 100644 index 000000000..f4ad99f5f --- /dev/null +++ b/website/standard.css @@ -0,0 +1,181 @@ +/* CSS for et.redhat.com/~rjones/ + * $Id: standard.css,v 1.15 2009/07/22 10:32:02 rjones Exp $ + */ + +body { + margin-left: 1em; +} + +body p, body ul, ol, body dl { + margin-left: 2em; + width: 35em; +} + +li { + padding-bottom: 0.5em; +} + +/* Headings. */ + +h1 { + font-size: 140%; + border-bottom: 1px solid #000; +} + +h2 { + border-bottom: 1px solid #eee; +} + +h1, h2, h3, h4 { + color: #333; +} + +/* Code sections. */ + +code { + font-size: 120%; +} + +pre { + background-color: #fcfcfc; + /*border: 1px dotted #888;*/ + border-left: 6px solid #f0f0f0; + padding: 5px; + margin-left: 1em; + font-size: 120%; +} + +/* Notes. */ + +p.note { + margin-left: 2em; + margin-right: 1em; + /*border: 1px dotted #888;*/ + padding-left: 36px; + background: url(../images/note.png) no-repeat; +} + +p.warning { + margin-left: 2em; + margin-right: 1em; + border: 1px dotted #800; + padding-left: 36px; + background: url(../images/warning.png) no-repeat #fee; +} + +/* Highlighted text. */ + +span.highlight { + color: red; +} + +/* Images. */ + +img.frame_img { + border: 1px solid #888; + padding: 6px; +} + +/* Floating images with text around. */ + +img.leftpara { + float: left; + clear: left; + margin-right: 1em; + margin-bottom: 1em; +} + +img.rightpara { + float: right; + clear: right; + margin-left: 1em; + margin-bottom: 1em; +} + +/* Nice-looking tables. */ + +table.top_table { + border-collapse: collapse; +} + +table.top_table th { + vertical-align: top; + padding: 3px; + border-bottom: 1px solid #ddd; +} + +table.top_table td { + vertical-align: top; + padding: 3px; +} + +table.top_table td.number { + text-align: right; +} + +table.top_table th.divider { + text-align: center; + padding: 6px; + border-top: 1px solid #ddd; + border-bottom: 1px solid #ddd; +} + +table.left_table { + border-collapse: collapse; +} + +table.left_table th { + text-align: right; + vertical-align: top; + padding: 3px; + padding-right: 1em; +} + +table.left_table td { + vertical-align: top; + padding: 3px; +} + +table.left_table td.number { + text-align: right; +} + +table.left_table th.divider { + text-align: center; + padding: 6px; + border-top: 1px solid #eee; + border-bottom: 1px solid #eee; +} + +/*
    styled as menus. */ + +ul.menu { + width: 60em; + padding: 0px; + margin-left: 1em; + list-style: none; +} + +ul.menu li { + display: inline; + border-left: 1px solid #666; + padding-left: 5px; +} + +ul.menu li.first { + border-left: none; + padding-left: 0px; +} + +/* Highlight for Javascript "go" sections. */ + +.jsgo { + border: 1px solid #fff; + cursor: pointer; + cursor: hand; +} + +.jsgo:hover { + border: 1px solid #ccc; + background: #eef; +} \ No newline at end of file