diff --git a/doc/Makefile.am b/doc/Makefile.am
index 78c2ccdd92..680f940676 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,120 +1,120 @@
#
# doc: Pacemaker code
#
# Copyright (C) 2008 Andrew Beekhof
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
MAINTAINERCLEANFILES = Makefile.in
helpdir = $(datadir)/$(PACKAGE)
ascii = crm_cli.txt crm_fencing.txt
help_DATA = crm_cli.txt
docbook = Pacemaker_Explained Clusters_from_Scratch
doc_DATA = README.hb2openais $(ascii) $(generated_docs)
publican_docs =
generated_docs =
DOCBOOK_FORMATS := html-desktop,txt
SVG := $(wildcard */en-US/images/pcmk-*.svg)
PNGS = $(SVG:%.svg=%-small.png) $(SVG:%.svg=%.png) $(SVG:%.svg=%-large.png)
-BRAND_PNGS = publican-clusterlabs/en-US/images/pacemaker-logo.png \
+BRAND_PNGS = publican-clusterlabs/en-US/images/title_logo.png \
publican-clusterlabs/en-US/images/image_left.png \
publican-clusterlabs/en-US/images/image_right.png \
publican-clusterlabs/en-US/images/h1-bg.png
graphics: $(PNGS)
%.png: %.svg
inkscape --file=$< --export-dpi=90 -C --export-png=$@
%-small.png: %.svg
inkscape --file=$< --export-dpi=45 -C --export-png=$@
%-large.png: %.svg
inkscape --file=$< --export-dpi=180 -C --export-png=$@
XML_FILES := $(wildcard *.xml)
PNG_FILES := $(wildcard images/*.png)
if BUILD_ASCIIDOC
generated_docs += $(ascii:%.txt=%.html)
endif
if BUILD_DOCBOOK
publican_docs += $(docbook)
endif
EXTRA_DIST = $(docbook:%=%.xml)
%.html: %.txt
$(ASCIIDOC) --unsafe --backend=xhtml11 $<
%.txt: $(wildcard %/en-US/*.xml)
@echo Building $*
rm -rf $*/publish/*
cd $* && $(PUBLICAN) build --publish --langs=all --formats=$(DOCBOOK_FORMATS)
touch $@
if BUILD_DOCBOOK
docbook_txt = $(docbook:%=%.txt)
all-local: $(docbook_txt) */publican.cfg
#install-data-local: all-local
install-data-local: all-local
for book in $(docbook); do \
filelist=`find $$book/publish/* -print`; \
for f in $$filelist; do \
p=`echo $$f | sed s:publish/:: | sed s:Pacemaker/::`; \
if [ -d $$f ]; then \
$(INSTALL) -d 775 $(DESTDIR)$(docdir)/$$p; \
else \
$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir)/$$p; \
fi \
done; \
done
endif
brand: $(BRAND_PNGS) $(wildcard publican-clusterlabs/en-US/*.xml)
cd publican-clusterlabs && publican build --formats=xml --langs=all --publish
echo "Installing..."
cd publican-clusterlabs && sudo publican install_brand --path=$(datadir)/publican/Common_Content
# find publican-clusterlabs -name "*.noarch.rpm" -exec rm -f \{\} \;
# cd publican-clusterlabs && $(PUBLICAN) package --binary
# find publican-clusterlabs -name "*.noarch.rpm" -exec sudo rpm -Uvh --force \{\} \;
www:
rm -f $(docbook_txt)
make DOCBOOK_FORMATS="pdf,html,html-single,txt,epub" all-local $(generated_docs) $(ascii)
echo Uploading current documentation set to clusterlabs.org
rsync -rtz --progress $(generated_docs) $(ascii) root@oss.clusterlabs.org:/var/www/html/doc/
if BUILD_DOCBOOK
for book in $(docbook); do \
echo Uploading $$book...; \
echo "Generated on `date` from version: $(BUILD_VERSION)" > $$book/publish/build-$(PACKAGE_SERIES).txt; \
rsync -rtz --progress $$book/publish/* root@oss.clusterlabs.org:/var/www/html/doc/; \
done
endif
clean-local:
-rm -rf $(generated_docs) $(docbook_txt)
for book in $(docbook); do rm -rf $$book/tmp $$book/publish; done
diff --git a/doc/publican-clusterlabs/en-US/images/pacemaker-logo.svg b/doc/publican-clusterlabs/en-US/images/pacemaker-logo.svg
deleted file mode 100644
index d6cfda0ca0..0000000000
--- a/doc/publican-clusterlabs/en-US/images/pacemaker-logo.svg
+++ /dev/null
@@ -1,726 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/doc/publican-clusterlabs/en-US/images/title_logo.png b/doc/publican-clusterlabs/en-US/images/title_logo.png
index aa7915a690..0362d9c234 100644
Binary files a/doc/publican-clusterlabs/en-US/images/title_logo.png and b/doc/publican-clusterlabs/en-US/images/title_logo.png differ
diff --git a/doc/publican-clusterlabs/en-US/images/title_logo.svg b/doc/publican-clusterlabs/en-US/images/title_logo.svg
index a86bea1b06..d6cfda0ca0 100644
--- a/doc/publican-clusterlabs/en-US/images/title_logo.svg
+++ b/doc/publican-clusterlabs/en-US/images/title_logo.svg
@@ -1,145 +1,726 @@
+ inkscape:current-layer="svg2" />
\ No newline at end of file