[master] Added Kea logo to Admin and Developer's guides

    Merged in branch 'trac3702'

doc/Doxyfile

@@ -45,7 +45,7 @@ PROJECT_BRIEF          =
 # exceed 55 pixels and the maximum width should not exceed 200 pixels.
 # Doxygen will copy the logo to the output directory.
 
-PROJECT_LOGO           = images/isc-logo.png
+PROJECT_LOGO           = guide/kea-logo-100x70.png
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.

doc/Makefile.am

@@ -6,8 +6,6 @@ EXTRA_DIST += devel/contribute.dox
 EXTRA_DIST += devel/mainpage.dox
 EXTRA_DIST += devel/qa.dox
 
-EXTRA_DIST += images/isc-logo.png
-
 nobase_dist_doc_DATA  = examples/ddns/sample1.json
 nobase_dist_doc_DATA += examples/ddns/template.json
 nobase_dist_doc_DATA += examples/kea4/hooks.json

doc/guide/Makefile.am

@@ -3,7 +3,7 @@ HTMLDOCS = kea-guide.html kea-messages.html
 DOCS = kea-guide.txt
 
 dist_doc_DATA = $(DOCS)
-dist_html_DATA = $(HTMLDOCS) kea-guide.css
+dist_html_DATA = $(HTMLDOCS) kea-guide.css kea-logo-100x70.png
 
 DOCBOOK = kea-guide.xml intro.xml quickstart.xml install.xml admin.xml config.xml
 DOCBOOK += keactrl.xml dhcp4-srv.xml dhcp6-srv.xml lease-expiration.xml logging.xml
@@ -11,6 +11,7 @@ DOCBOOK += ddns.xml hooks.xml libdhcp.xml lfc.xml stats.xml ctrl-channel.xml faq
 DOCBOOK += classify.xml
 
 EXTRA_DIST = $(DOCBOOK)
+
 DISTCLEANFILES = $(HTMLDOCS) $(DOCS) kea-messages.xml
 
 kea-messages.xml:

doc/guide/kea-guide.xml

@@ -26,13 +26,25 @@
   <?xml-stylesheet href="kea-guide.css" type="text/css"?>
 
   <bookinfo>
-    <title>Kea Administrator Reference Manual</title>
+
+    <title>
+    Kea Administrator Reference Manual
+    <inlinemediaobject>
+        <imageobject>
+            <imagedata fileref="kea-logo-100x70.png" align="left"/>
+        </imageobject>
+    </inlinemediaobject>
+    </title>
+
+    <releaseinfo>This is the reference guide for Kea version
+        &__VERSION__;.</releaseinfo>
 
     <copyright>
       <year>2010-2015</year><holder>Internet Systems Consortium, Inc.</holder>
     </copyright>
 
     <abstract>
+
       <para>
         Kea is an open source implementation of the Dynamic Host Configuration
         Protocol (DHCP) servers, developed and maintained by Internet Systems
@@ -46,9 +58,6 @@
         Kea, can be found at <ulink url="http://kea.isc.org/docs"/>.
         </para> </abstract>
 
-      <releaseinfo>This is the reference guide for Kea version
-        &__VERSION__;.</releaseinfo>
-
   </bookinfo>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intro.xml" />