14 files changed, 9 insertions, 7 deletions
diff --git a/openlmi-providers.spec b/openlmi-providers.spec
index 96bd7a8..282b733 100644
--- a/openlmi-providers.spec
+++ b/openlmi-providers.spec
@@ -372,7 +372,7 @@ install -m 755 -d $RPM_BUILD_ROOT/%{_docdir}/%{name}/account/admin_guide
 cp README COPYING $RPM_BUILD_ROOT/%{_docdir}/%{name}
 cp -pr src/account/doc/build/html/* $RPM_BUILD_ROOT/%{_docdir}/%{name}/account/admin_guide
 install -m 755 -d $RPM_BUILD_ROOT/%{_docdir}/%{name}/software/admin_guide
-cp -pr src/software/doc/admin/_build/html/* $RPM_BUILD_ROOT/%{_docdir}/%{name}/software/admin_guide
+cp -pr src/software/doc/admin/build/html/* $RPM_BUILD_ROOT/%{_docdir}/%{name}/software/admin_guide
 install -m 755 -d $RPM_BUILD_ROOT/%{_docdir}/%{name}/realmd/admin_guide
 cp -pr src/realmd/doc/build/html/* $RPM_BUILD_ROOT/%{_docdir}/%{name}/realmd/admin_guide
 install -m 755 -d $RPM_BUILD_ROOT/%{_docdir}/%{name}/service/admin_guide
diff --git a/src/software/doc/admin/mof/header.txt b/src/fan/doc/source/mof/header.txt
index cc06402..cc06402 100644
--- a/src/software/doc/admin/mof/header.txt
+++ b/src/fan/doc/source/mof/header.txt
diff --git a/src/software/doc/admin/Makefile b/src/software/doc/admin/Makefile
index bad1f79..65c445e 100644
--- a/src/software/doc/admin/Makefile
+++ b/src/software/doc/admin/Makefile
@@ -5,14 +5,14 @@
 SPHINXOPTS    =
 SPHINXBUILD   = sphinx-build
 PAPER         =
-BUILDDIR      = _build
+BUILDDIR      = build
 
 # Internal variables.
 PAPEROPT_a4     = -D latex_paper_size=a4
 PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
 # the i18n builder cannot share the environment and doctrees with the others
-I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
 
 .PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp \
 	devhelp epub latex latexpdf text man changes linkcheck doctest \
@@ -41,11 +41,11 @@ help:
 	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
 
 mof:
-	make -C mof
+	make -C source/mof
 
 clean:
 	-rm -rf $(BUILDDIR)/*
-	make -C mof clean
+	make -C source/mof clean
 
 html: 	mof
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
diff --git a/src/software/doc/admin/_static/Makefile b/src/software/doc/admin/source/_static/Makefile
index 6603451..6603451 100644
--- a/src/software/doc/admin/_static/Makefile
+++ b/src/software/doc/admin/source/_static/Makefile
diff --git a/src/software/doc/admin/_static/software-profile.dia b/src/software/doc/admin/source/_static/software-profile.dia
index 35638d3..35638d3 100644
--- a/src/software/doc/admin/_static/software-profile.dia
+++ b/src/software/doc/admin/source/_static/software-profile.dia
diff --git a/src/software/doc/admin/_static/software-profile.svg b/src/software/doc/admin/source/_static/software-profile.svg
index 42c2103..42c2103 100644
--- a/src/software/doc/admin/_static/software-profile.svg
+++ b/src/software/doc/admin/source/_static/software-profile.svg
diff --git a/src/software/doc/admin/conf.py b/src/software/doc/admin/source/conf.py
index 16381bb..16381bb 100644
--- a/src/software/doc/admin/conf.py
+++ b/src/software/doc/admin/source/conf.py
diff --git a/src/software/doc/admin/configuration.rst b/src/software/doc/admin/source/configuration.rst
index 028f399..028f399 100644
--- a/src/software/doc/admin/configuration.rst
+++ b/src/software/doc/admin/source/configuration.rst
diff --git a/src/software/doc/admin/dmtf.rst b/src/software/doc/admin/source/dmtf.rst
index 9aa460c..9aa460c 100644
--- a/src/software/doc/admin/dmtf.rst
+++ b/src/software/doc/admin/source/dmtf.rst
diff --git a/src/software/doc/admin/index.rst b/src/software/doc/admin/source/index.rst
index 1fd392a..1fd392a 100644
--- a/src/software/doc/admin/index.rst
+++ b/src/software/doc/admin/source/index.rst
diff --git a/src/software/doc/admin/introduction.rst b/src/software/doc/admin/source/introduction.rst
index 68923a8..68923a8 100644
--- a/src/software/doc/admin/introduction.rst
+++ b/src/software/doc/admin/source/introduction.rst
diff --git a/src/software/doc/admin/mof/Makefile b/src/software/doc/admin/source/mof/Makefile
index 8884274..9ced62d 100644
--- a/src/software/doc/admin/mof/Makefile
+++ b/src/software/doc/admin/source/mof/Makefile
@@ -1,6 +1,6 @@
 src: index.rst
 
-TOPDIR=../../../../..
+TOPDIR=../../../../../..
 MOFS=$(TOPDIR)/mof/60_LMI_Software.mof
 
 index.rst: $(MOFS)
diff --git a/src/software/doc/admin/source/mof/header.txt b/src/software/doc/admin/source/mof/header.txt
new file mode 100644
index 0000000..cc06402
--- /dev/null
+++ b/src/software/doc/admin/source/mof/header.txt
@@ -0,0 +1,2 @@
+Class reference
+===============
diff --git a/src/software/doc/admin/usage.rst b/src/software/doc/admin/source/usage.rst
index 5bc034f..5bc034f 100644
--- a/src/software/doc/admin/usage.rst
+++ b/src/software/doc/admin/source/usage.rst