Add SystemTap_Beginners_Guide to build.

* configure.ac: Add --enable-publican and --with-publican-brand.
  Setup "shadow" directory doc/beginners.
* Makefile.in: Regenerated.
* configure: Regenerated.
* doc/Makefile.am (SUBDIRS): Add beginners.
* doc/Makefile.in: Regenerated.
* doc/SystemTap_Beginners_Guide/en-US/Book_Info.xml (productname):
  Set to Systemtap.
  (productnumber): Set to 1.0.
* SystemTap_Beginners_Guide/en-US/*.xml: Replace includes from
  extras/testsuite to ../testsuite,
* doc/SystemTap_Beginners_Guide/publican.cfg: Moved to ...
* doc/SystemTap_Beginners_Guide/publican.cfg.in: ... here.
* doc/SystemTap_Beginners_Guide/Makefile: Removed.
* doc/SystemTap_Beginners_Guide/old-syncandbuild.sh: Removed.
* doc/SystemTap_Beginners_Guide/syncandbuild.sh: Removed.
* doc/SystemTap_Tapset_Reference/Makefile.in: Regenerated.
* doc/beginners/Makefile.am: New makefile.
* doc/beginners/Makefile.in: New generated file.
* grapher/Makefile.in: Regenerated.
* systemtap.spec: Add with_publican and publican_brand.

32 files changed, 667 insertions, 122 deletions

diff --git a/Makefile.in b/Makefile.in
index 89046421..3230757d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -65,10 +65,9 @@ pkglibexec_PROGRAMS = stapio$(EXEEXT) $(am__EXEEXT_2) $(am__EXEEXT_3)
 @HAVE_NSS_TRUE@am__append_21 = -lnss3 -lnspr4
 @BUILD_TRANSLATOR_TRUE@noinst_PROGRAMS = loc2c-test$(EXEEXT)
 subdir = .
-DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
-	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/config.in $(srcdir)/stap.1.in \
+DIST_COMMON = INSTALL NEWS README AUTHORS $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(srcdir)/config.in $(srcdir)/stap.1.in \
 	$(srcdir)/stapprobes.3stap.in $(srcdir)/stapfuncs.3stap.in \
 	$(srcdir)/stapvars.3stap.in $(srcdir)/stapex.3stap.in \
 	$(srcdir)/staprun.8.in $(srcdir)/stap-client.8.in \
@@ -325,6 +324,7 @@ PIECFLAGS = @PIECFLAGS@
 PIECXXFLAGS = @PIECXXFLAGS@
 PIELDFLAGS = @PIELDFLAGS@
 PKG_CONFIG = @PKG_CONFIG@
+PUBLICAN_BRAND = @PUBLICAN_BRAND@
 RANLIB = @RANLIB@
 RPM_CFLAGS = @RPM_CFLAGS@
 RPM_LIBS = @RPM_LIBS@
@@ -360,6 +360,7 @@ have_dvips = @have_dvips@
 have_latex = @have_latex@
 have_latex2html = @have_latex2html@
 have_ps2pdf = @have_ps2pdf@
+have_publican = @have_publican@
 have_xmlto = @have_xmlto@
 host_alias = @host_alias@
 htmldir = @htmldir@
diff --git a/configure b/configure
index e738e909..e3e358a6 100755
--- a/configure
+++ b/configure
@@ -672,6 +672,10 @@ XMLTO_STRINGPARAM_TRUE
 BUILD_REFDOCS_FALSE
 BUILD_REFDOCS_TRUE
 have_xmlto
+PUBLICAN_BRAND
+BUILD_PUBLICAN_FALSE
+BUILD_PUBLICAN_TRUE
+have_publican
 BUILD_DOCS_FALSE
 BUILD_DOCS_TRUE
 have_latex2html
@@ -795,6 +799,8 @@ enable_sqlite
 enable_translator
 enable_crash
 enable_docs
+enable_publican
+with_publican_brand
 enable_refdocs
 enable_server
 enable_grapher
@@ -1470,6 +1476,9 @@ Optional Features:
                           location).
   --enable-docs           enable building documentation (default on if latex
                           etc. found).
+  --enable-publican       enable building publican documentation guides
+                          (default on if publican found and other
+                          documentation built).
   --enable-refdocs        enable building reference documentation (default on
                           if xmlto etc. found and other documentation built).
   --enable-server         enable building of stap-server/client (default on if
@@ -1480,6 +1489,9 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-publican-brand=BRAND
+                          building publican documentation guides using given
+                          brand (defaults to "fedora").
   --with-rpm              query rpm database for missing debuginfos [yes/no,
                           def. auto=librpm.so]
   --with-elfutils=DIRECTORY
@@ -6758,6 +6770,87 @@ else
 fi
 
 
+building_publican="no"
+# Check whether --enable-publican was given.
+if test "${enable_publican+set}" = set; then
+  enableval=$enable_publican; enable_publican=$enableval
+else
+  enable_publican="check"
+fi
+
+if test "$building_docs" == "no" -a "$enable_publican" == "yes" ; then
+   { { $as_echo "$as_me:$LINENO: error: must use --enable-docs with --enable-publican" >&5
+$as_echo "$as_me: error: must use --enable-docs with --enable-publican" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+# Extract the first word of "publican", so it can be a program name with args.
+set dummy publican; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_have_publican+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$have_publican"; then
+  ac_cv_prog_have_publican="$have_publican" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_have_publican="yes"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_prog_have_publican" && ac_cv_prog_have_publican="no"
+fi
+fi
+have_publican=$ac_cv_prog_have_publican
+if test -n "$have_publican"; then
+  { $as_echo "$as_me:$LINENO: result: $have_publican" >&5
+$as_echo "$have_publican" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+if test "$enable_publican" == "yes"; then
+   if test "x${have_publican}" != "xyes"; then
+      { { $as_echo "$as_me:$LINENO: error: cannot find publican for building publican guides" >&5
+$as_echo "$as_me: error: cannot find publican for building publican guides" >&2;}
+   { (exit 1); exit 1; }; }
+   fi
+fi
+if test "x${have_publican}" == "xyes" -a "$enable_publican" != "no" -a "${building_docs}" == "yes"; then
+   building_publican="yes"
+fi
+ if test "$building_publican" == "yes"; then
+  BUILD_PUBLICAN_TRUE=
+  BUILD_PUBLICAN_FALSE='#'
+else
+  BUILD_PUBLICAN_TRUE='#'
+  BUILD_PUBLICAN_FALSE=
+fi
+
+publican_brand="fedora"
+
+# Check whether --with-publican-brand was given.
+if test "${with_publican_brand+set}" = set; then
+  withval=$with_publican_brand; publican_brand=$withval
+else
+  publican_brand="fedora"
+fi
+
+PUBLICAN_BRAND=$publican_brand
+
+
 building_refdocs="no"
 # Check whether --enable-refdocs was given.
 if test "${enable_refdocs+set}" = set; then
@@ -9603,7 +9696,7 @@ _ACEOF
 
 ac_config_headers="$ac_config_headers config.h:config.in"
 
-ac_config_files="$ac_config_files Makefile doc/Makefile doc/SystemTap_Tapset_Reference/Makefile grapher/Makefile grapher/stapgraph.1 stap.1 stapprobes.3stap stapfuncs.3stap stapvars.3stap stapex.3stap staprun.8 stap-client.8 stap-server.8 stap-authorize-server-cert.8 stap-authorize-signing-cert.8 man/stapprobes.iosched.3stap man/stapprobes.irq.3stap man/stapprobes.netdev.3stap man/stapprobes.nfs.3stap man/stapprobes.nfsd.3stap man/stapprobes.pagefault.3stap man/stapprobes.kprocess.3stap man/stapprobes.rpc.3stap man/stapprobes.scsi.3stap man/stapprobes.signal.3stap man/stapprobes.socket.3stap man/stapprobes.tcp.3stap man/stapprobes.udp.3stap man/stapprobes.snmp.3stap initscript/systemtap initscript/stap-server"
+ac_config_files="$ac_config_files Makefile doc/Makefile doc/beginners/Makefile doc/SystemTap_Tapset_Reference/Makefile grapher/Makefile grapher/stapgraph.1 stap.1 stapprobes.3stap stapfuncs.3stap stapvars.3stap stapex.3stap staprun.8 stap-client.8 stap-server.8 stap-authorize-server-cert.8 stap-authorize-signing-cert.8 man/stapprobes.iosched.3stap man/stapprobes.irq.3stap man/stapprobes.netdev.3stap man/stapprobes.nfs.3stap man/stapprobes.nfsd.3stap man/stapprobes.pagefault.3stap man/stapprobes.kprocess.3stap man/stapprobes.rpc.3stap man/stapprobes.scsi.3stap man/stapprobes.signal.3stap man/stapprobes.socket.3stap man/stapprobes.tcp.3stap man/stapprobes.udp.3stap man/stapprobes.snmp.3stap initscript/systemtap initscript/stap-server"
 
 
 
@@ -9617,6 +9710,16 @@ ac_config_files="$ac_config_files run-staprun"
 
 ac_config_files="$ac_config_files dtrace"
 
+
+# Setup "shadow" directory doc/beginners that has everything setup for
+# publican in one directory (through directory links if necessary).
+# It would be nice to use AC_CONFIG_LINKS, but automake complains when
+# the src is a directory and not a file.
+ac_config_files="$ac_config_files doc/beginners/publican.cfg:doc/SystemTap_Beginners_Guide/publican.cfg.in"
+
+ac_config_commands="$ac_config_commands doc/beginners"
+
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -9778,6 +9881,13 @@ $as_echo "$as_me: error: conditional \"BUILD_DOCS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${BUILD_PUBLICAN_TRUE}" && test -z "${BUILD_PUBLICAN_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_PUBLICAN\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"BUILD_PUBLICAN\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${BUILD_REFDOCS_TRUE}" && test -z "${BUILD_REFDOCS_FALSE}"; then
   { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_REFDOCS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -10339,6 +10449,7 @@ do
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+    "doc/beginners/Makefile") CONFIG_FILES="$CONFIG_FILES doc/beginners/Makefile" ;;
     "doc/SystemTap_Tapset_Reference/Makefile") CONFIG_FILES="$CONFIG_FILES doc/SystemTap_Tapset_Reference/Makefile" ;;
     "grapher/Makefile") CONFIG_FILES="$CONFIG_FILES grapher/Makefile" ;;
     "grapher/stapgraph.1") CONFIG_FILES="$CONFIG_FILES grapher/stapgraph.1" ;;
@@ -10371,6 +10482,8 @@ do
     "run-stap") CONFIG_FILES="$CONFIG_FILES run-stap" ;;
     "run-staprun") CONFIG_FILES="$CONFIG_FILES run-staprun" ;;
     "dtrace") CONFIG_FILES="$CONFIG_FILES dtrace" ;;
+    "doc/beginners/publican.cfg") CONFIG_FILES="$CONFIG_FILES doc/beginners/publican.cfg:doc/SystemTap_Beginners_Guide/publican.cfg.in" ;;
+    "doc/beginners") CONFIG_COMMANDS="$CONFIG_COMMANDS doc/beginners" ;;
 
   *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 $as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
@@ -11163,6 +11276,7 @@ $as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
     "run-stap":F) chmod +x run-stap ;;
     "run-staprun":F) chmod +x run-staprun ;;
     "dtrace":F) chmod +x dtrace ;;
+    "doc/beginners":C) rm -f $ac_abs_top_builddir/doc/beginners/en-US $ac_abs_top_builddir/doc/beginners/build/en-US/testsuite && mkdir -p $ac_abs_top_builddir/doc/beginners/build/en-US && ln -s $ac_abs_top_srcdir/doc/SystemTap_Beginners_Guide/en-US $ac_abs_top_builddir/doc/beginners/en-US && ln -s $ac_abs_top_srcdir/testsuite $ac_abs_top_builddir/doc/beginners/build/en-US/testsuite ;;
 
   esac
 done # for ac_tag
diff --git a/configure.ac b/configure.ac
index f14fdc91..2c1cfa2e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -187,6 +187,35 @@ if test "x${have_latex}${have_dvips}${have_ps2pdf}${have_latex2html}" == "xyesye
 fi
 AM_CONDITIONAL([BUILD_DOCS], [test "$building_docs" == "yes"])
 
+dnl Handle the options to build the publican options
+building_publican="no"
+AC_ARG_ENABLE([publican],
+  AS_HELP_STRING([--enable-publican],
+    [enable building publican documentation guides (default on if publican found and other documentation built).]),
+  [enable_publican=$enableval],
+  [enable_publican="check"])
+if test "$building_docs" == "no" -a "$enable_publican" == "yes" ; then
+   AC_MSG_ERROR([must use --enable-docs with --enable-publican])
+fi
+AC_CHECK_PROG(have_publican, publican, yes, no)
+if test "$enable_publican" == "yes"; then
+   if test "x${have_publican}" != "xyes"; then
+      AC_MSG_ERROR([cannot find publican for building publican guides])
+   fi
+fi
+if test "x${have_publican}" == "xyes" -a "$enable_publican" != "no" -a "${building_docs}" == "yes"; then
+   building_publican="yes"
+fi
+AM_CONDITIONAL([BUILD_PUBLICAN], [test "$building_publican" == "yes"])
+publican_brand="fedora"
+AC_ARG_WITH([publican-brand],
+  AS_HELP_STRING([--with-publican-brand=BRAND],
+    [building publican documentation guides using given brand (defaults to "fedora").]),
+  [publican_brand=$withval],
+  [publican_brand="fedora"])
+PUBLICAN_BRAND=$publican_brand
+AC_SUBST(PUBLICAN_BRAND)
+
 dnl Handle the option to build the reference documentation
 building_refdocs="no"
 AC_ARG_ENABLE([refdocs],
@@ -646,13 +675,22 @@ dnl Don't use this directly (when not given it is set to NONE).
 AC_DEFINE_UNQUOTED(STAP_PREFIX, "$prefix", [configure prefix location])
 
 AC_CONFIG_HEADERS([config.h:config.in])
-AC_CONFIG_FILES(Makefile doc/Makefile doc/SystemTap_Tapset_Reference/Makefile grapher/Makefile grapher/stapgraph.1 stap.1 stapprobes.3stap stapfuncs.3stap stapvars.3stap stapex.3stap staprun.8 stap-client.8 stap-server.8 stap-authorize-server-cert.8 stap-authorize-signing-cert.8 man/stapprobes.iosched.3stap man/stapprobes.irq.3stap man/stapprobes.netdev.3stap man/stapprobes.nfs.3stap man/stapprobes.nfsd.3stap man/stapprobes.pagefault.3stap man/stapprobes.kprocess.3stap man/stapprobes.rpc.3stap man/stapprobes.scsi.3stap man/stapprobes.signal.3stap man/stapprobes.socket.3stap man/stapprobes.tcp.3stap man/stapprobes.udp.3stap man/stapprobes.snmp.3stap initscript/systemtap initscript/stap-server)
+AC_CONFIG_FILES(Makefile doc/Makefile doc/beginners/Makefile doc/SystemTap_Tapset_Reference/Makefile grapher/Makefile grapher/stapgraph.1 stap.1 stapprobes.3stap stapfuncs.3stap stapvars.3stap stapex.3stap staprun.8 stap-client.8 stap-server.8 stap-authorize-server-cert.8 stap-authorize-signing-cert.8 man/stapprobes.iosched.3stap man/stapprobes.irq.3stap man/stapprobes.netdev.3stap man/stapprobes.nfs.3stap man/stapprobes.nfsd.3stap man/stapprobes.pagefault.3stap man/stapprobes.kprocess.3stap man/stapprobes.rpc.3stap man/stapprobes.scsi.3stap man/stapprobes.signal.3stap man/stapprobes.socket.3stap man/stapprobes.tcp.3stap man/stapprobes.udp.3stap man/stapprobes.snmp.3stap initscript/systemtap initscript/stap-server)
 AC_CONFIG_SUBDIRS(testsuite)
 if test $enable_translator == "yes"; then
 	AC_CONFIG_FILES([run-stap], [chmod +x run-stap])
 fi
 AC_CONFIG_FILES([run-staprun], [chmod +x run-staprun])
 AC_CONFIG_FILES([dtrace], [chmod +x dtrace])
+
+# Setup "shadow" directory doc/beginners that has everything setup for
+# publican in one directory (through directory links if necessary).
+# It would be nice to use AC_CONFIG_LINKS, but automake complains when
+# the src is a directory and not a file.
+AC_CONFIG_FILES([doc/beginners/publican.cfg:doc/SystemTap_Beginners_Guide/publican.cfg.in])
+AC_CONFIG_COMMANDS([doc/beginners],
+                   [rm -f $ac_abs_top_builddir/doc/beginners/en-US $ac_abs_top_builddir/doc/beginners/build/en-US/testsuite && mkdir -p $ac_abs_top_builddir/doc/beginners/build/en-US && ln -s $ac_abs_top_srcdir/doc/SystemTap_Beginners_Guide/en-US $ac_abs_top_builddir/doc/beginners/en-US && ln -s $ac_abs_top_srcdir/testsuite $ac_abs_top_builddir/doc/beginners/build/en-US/testsuite])
+
 AC_OUTPUT
 
 if test "${prefix}" = "/usr/local"; then
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 55291f7f..ae129c4f 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -3,7 +3,7 @@
 
 PDF_FILES = tutorial.pdf langref.pdf
 DOC_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap
-SUBDIRS = SystemTap_Tapset_Reference
+SUBDIRS = SystemTap_Tapset_Reference beginners
 
 if BUILD_DOCS
 all-local: $(PDF_FILES)
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 71004965..6ba0e04e 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -143,6 +143,7 @@ PIECFLAGS = @PIECFLAGS@
 PIECXXFLAGS = @PIECXXFLAGS@
 PIELDFLAGS = @PIELDFLAGS@
 PKG_CONFIG = @PKG_CONFIG@
+PUBLICAN_BRAND = @PUBLICAN_BRAND@
 RANLIB = @RANLIB@
 RPM_CFLAGS = @RPM_CFLAGS@
 RPM_LIBS = @RPM_LIBS@
@@ -178,6 +179,7 @@ have_dvips = @have_dvips@
 have_latex = @have_latex@
 have_latex2html = @have_latex2html@
 have_ps2pdf = @have_ps2pdf@
+have_publican = @have_publican@
 have_xmlto = @have_xmlto@
 host_alias = @host_alias@
 htmldir = @htmldir@
@@ -214,7 +216,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 PDF_FILES = tutorial.pdf langref.pdf
 DOC_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap
-SUBDIRS = SystemTap_Tapset_Reference
+SUBDIRS = SystemTap_Tapset_Reference beginners
 SUFFIXES = ps pdf dvi ps tex
 all: all-recursive
 
diff --git a/doc/SystemTap_Beginners_Guide/Makefile b/doc/SystemTap_Beginners_Guide/Makefile
deleted file mode 100644
index 5c9c2379..00000000
--- a/doc/SystemTap_Beginners_Guide/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-#Makefile for SystemTap_Beginners_Guide
-
-XML_LANG	= en-US
-
-BRAND = fedora
-#	please define the BRAND in the pre:: section below
-#SHOW_REMARKS = 1
-
-#OTHER_LANGS	= as-IN bn-IN de-DE es-ES fr-FR gu-IN hi-IN it-IT ja-JP kn-IN ko-KR ml-IN mr-IN or-IN pa-IN pt-BR ru-RU si-LK ta-IN te-IN zh-CN zh-TW
-
-CONDITION=$(BRAND)
-
-COMMON_CONFIG  = /usr/share/publican
-include $(COMMON_CONFIG)/make/Makefile.common
-
-pre::
-	cp -a ../../testsuite en-US/extras/;
-
-post::
-	rm -rf en-US/extras/testsuite
-	sed -i -e 's/<productname>Fedora/<productname>Red Hat Enterprise Linux/g' en-US/Book_Info.xml;
-	sed -i -e 's/<productnumber>10/<productnumber>5/g' en-US/Book_Info.xml;
diff --git a/doc/SystemTap_Beginners_Guide/en-US/Book_Info.xml b/doc/SystemTap_Beginners_Guide/en-US/Book_Info.xml
index fb6bec20..6c847140 100644
--- a/doc/SystemTap_Beginners_Guide/en-US/Book_Info.xml
+++ b/doc/SystemTap_Beginners_Guide/en-US/Book_Info.xml
@@ -5,11 +5,11 @@
 <bookinfo id="SystemTap_Beginners_Guide">
 	<title>SystemTap Beginners Guide</title>
 	<subtitle condition="RedHat">Introduction to SystemTap (for Red Hat Enterprise Linux 5.4)</subtitle>
-<!--	<subtitle condition="fedora">Introduction to SystemTap (for Fedora 10)</subtitle> -->
+	<subtitle condition="fedora">Introduction to SystemTap (for Fedora 10)</subtitle>
 	<edition>2.0</edition>
 	
-	<productname>Red Hat Enterprise Linux</productname>
-	<productnumber>5.4</productnumber>
+	<productname>Systemtap</productname>
+	<productnumber>1.0</productnumber>
 	
 	<pubsnumber>2</pubsnumber>
 	<abstract condition="RedHat"><para>This guide provides basic instructions on how to use SystemTap to monitor different subsystems of &PRODUCT; in finer detail. The <citetitle>SystemTap Beginners Guide</citetitle> is recommended for users who have taken <ulink url="https://www.redhat.com/courses/rh133_red_hat_linux_system_administration_and_rhct_exam/">RHCT</ulink> or have a similar level of expertise in &PRODUCT;.</para></abstract>
diff --git a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-disktop.xml b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-disktop.xml
index 8a786d82..781ea949 100644
--- a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-disktop.xml
+++ b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-disktop.xml
@@ -65,7 +65,7 @@
 	<title>disktop.stp</title>
 <para>
 <programlisting>
-<xi:include parse="text" href="extras/testsuite/systemtap.examples/io/disktop.stp" xmlns:xi="http://www.w3.org/2001/XInclude" />
+<xi:include parse="text" href="../testsuite/systemtap.examples/io/disktop.stp" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </programlisting>
 </para>
 </formalpara>		
diff --git a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-dropwatch.xml b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-dropwatch.xml
index 3bc69899..53891bed 100644
--- a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-dropwatch.xml
+++ b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-dropwatch.xml
@@ -49,7 +49,7 @@ discard packets every five-second interval.
 		<title>dropwatch.stp</title>
 <para>
 <programlisting>
-<xi:include parse="text" href="extras/testsuite/systemtap.examples/network/dropwatch.stp" xmlns:xi="http://www.w3.org/2001/XInclude" />
+<xi:include parse="text" href="../testsuite/systemtap.examples/network/dropwatch.stp" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </programlisting>
 </para>
 </formalpara>	
diff --git a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-functioncalls.xml b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-functioncalls.xml
index 6a5c8f4d..0d0aa947 100644
--- a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-functioncalls.xml
+++ b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-functioncalls.xml
@@ -47,7 +47,7 @@ no script in examples
 	<title>functioncallcount.stp</title>
 <para>
 <programlisting>
-<xi:include parse="text" href="extras/testsuite/systemtap.examples/profiling/functioncallcount.stp" xmlns:xi="http://www.w3.org/2001/XInclude" />
+<xi:include parse="text" href="../testsuite/systemtap.examples/profiling/functioncallcount.stp" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </programlisting>
 </para>
 </formalpara>		
diff --git a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-futexes.xml b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-futexes.xml
index 82bb762b..2426da8d 100644
--- a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-futexes.xml
+++ b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-futexes.xml
@@ -87,7 +87,7 @@ no script in examples
 		<title>futexes.stp</title>
 <para>
 <programlisting>
-<xi:include parse="text" href="extras/testsuite/systemtap.examples/process/futexes.stp" xmlns:xi="http://www.w3.org/2001/XInclude" />
+<xi:include parse="text" href="../testsuite/systemtap.examples/process/futexes.stp" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </programlisting>
 </para>
 </formalpara>		
diff --git a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-ioblktime.xml b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-ioblktime.xml
index e586d81a..b3753e0c 100644
--- a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-ioblktime.xml
+++ b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-ioblktime.xml
@@ -39,7 +39,7 @@
 	<title>ioblktime.stp</title>
 <para>
 <programlisting>
-<xi:include parse="text" href="extras/testsuite/systemtap.examples/io/ioblktime.stp" xmlns:xi="http://www.w3.org/2001/XInclude" />
+<xi:include parse="text" href="../testsuite/systemtap.examples/io/ioblktime.stp" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </programlisting>
 </para>
 </formalpara>
diff --git a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-iotop.xml b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-iotop.xml
index c5bbb480..2bb0c778 100644
--- a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-iotop.xml
+++ b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-iotop.xml
@@ -35,7 +35,7 @@
 	<title>iotop.stp</title>
 <para>
 <programlisting>
-<xi:include parse="text" href="extras/testsuite/systemtap.examples/io/iotop.stp" xmlns:xi="http://www.w3.org/2001/XInclude" />
+<xi:include parse="text" href="../testsuite/systemtap.examples/io/iotop.stp" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </programlisting>
 </para>
 </formalpara>
diff --git a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-nettop.xml b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-nettop.xml
index 2d7e3595..1a9978dc 100644
--- a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-nettop.xml
+++ b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-nettop.xml
@@ -44,7 +44,7 @@
 		<title>nettop.stp</title>
 <para>
 <programlisting>
-<xi:include parse="text" href="extras/testsuite/systemtap.examples/network/nettop.stp" xmlns:xi="http://www.w3.org/2001/XInclude" />
+<xi:include parse="text" href="../testsuite/systemtap.examples/network/nettop.stp" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </programlisting>
 </para>
 </formalpara>	
diff --git a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-sockettrace.xml b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-sockettrace.xml
index 6e913b48..8bce5a41 100644
--- a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-sockettrace.xml
+++ b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-sockettrace.xml
@@ -51,7 +51,7 @@
 		<title>socket-trace.stp</title>
 <para>
 <programlisting>
-<xi:include parse="text" href="extras/testsuite/systemtap.examples/network/socket-trace.stp" xmlns:xi="http://www.w3.org/2001/XInclude" />
+<xi:include parse="text" href="../testsuite/systemtap.examples/network/socket-trace.stp" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </programlisting>
 </para>
 </formalpara>		
diff --git a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-syscallsbyprocpid.xml b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-syscallsbyprocpid.xml
index d8fe4b39..92727821 100644
--- a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-syscallsbyprocpid.xml
+++ b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-syscallsbyprocpid.xml
@@ -53,7 +53,7 @@ uses systemtap/testsuite/systemtap.examples/process/syscalls_by_p*.stp
 	<title>syscalls_by_proc.stp</title>
 <para>
 <programlisting>
-<xi:include parse="text" href="extras/testsuite/systemtap.examples/process/syscalls_by_proc.stp" xmlns:xi="http://www.w3.org/2001/XInclude" />
+<xi:include parse="text" href="../testsuite/systemtap.examples/process/syscalls_by_proc.stp" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </programlisting>
 </para>
 </formalpara>		
@@ -97,7 +97,7 @@ Collecting data... Type Ctrl-C to exit and display results
 	<title>syscalls_by_pid.stp</title>
 <para>
 <programlisting>
-<xi:include parse="text" href="extras/testsuite/systemtap.examples/process/syscalls_by_pid.stp" xmlns:xi="http://www.w3.org/2001/XInclude" />
+<xi:include parse="text" href="../testsuite/systemtap.examples/process/syscalls_by_pid.stp" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </programlisting>
 </para>
 </formalpara>	
diff --git a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-tcp_connections.xml b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-tcp_connections.xml
index c25465b4..6dc2d2b1 100644
--- a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-tcp_connections.xml
+++ b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-tcp_connections.xml
@@ -54,7 +54,7 @@
 		<title>tcp_connections.stp</title>
 <para>
 <programlisting>
-<xi:include parse="text" href="extras/testsuite/systemtap.examples/network/tcp_connections.stp" xmlns:xi="http://www.w3.org/2001/XInclude" />
+<xi:include parse="text" href="../testsuite/systemtap.examples/network/tcp_connections.stp" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </programlisting>
 </para>
 </formalpara>		
diff --git a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-tcpdumplike.xml b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-tcpdumplike.xml
index cd42edc6..dfd3fac8 100644
--- a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-tcpdumplike.xml
+++ b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-tcpdumplike.xml
@@ -54,7 +54,7 @@
 		<title>tcpdumplike.stp</title>
 <para>
 <programlisting>
-	<xi:include parse="text" href="extras/testsuite/systemtap.examples/network/tcpdumplike.stp" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	<xi:include parse="text" href="../testsuite/systemtap.examples/network/tcpdumplike.stp" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </programlisting>
 </para>
 </formalpara>		
diff --git a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-threadtimes.xml b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-threadtimes.xml
index 3bddf067..193012ea 100644
--- a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-threadtimes.xml
+++ b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-threadtimes.xml
@@ -43,7 +43,7 @@
 		<title>thread-times.stp</title>
 <para>
 <programlisting>
-<xi:include parse="text" href="extras/testsuite/systemtap.examples/profiling/thread-times.stp" xmlns:xi="http://www.w3.org/2001/XInclude" />
+<xi:include parse="text" href="../testsuite/systemtap.examples/profiling/thread-times.stp" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </programlisting>
 </para>
 </formalpara>		
diff --git a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-timeout.xml b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-timeout.xml
index 719f5c6d..1f7b7a11 100644
--- a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-timeout.xml
+++ b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-timeout.xml
@@ -47,7 +47,7 @@ uses systemtap/testsuite/systemtap.examples/profiling/timeout.stp
 	<title>timeout.stp</title>
 <para>
 <programlisting>
-<xi:include parse="text" href="extras/testsuite/systemtap.examples/profiling/timeout.stp" xmlns:xi="http://www.w3.org/2001/XInclude" />
+<xi:include parse="text" href="../testsuite/systemtap.examples/profiling/timeout.stp" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </programlisting>
 </para>
 </formalpara>
diff --git a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-topsys.xml b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-topsys.xml
index 700ef4ed..ba814d5e 100644
--- a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-topsys.xml
+++ b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-topsys.xml
@@ -62,7 +62,7 @@ uses systemtap/testsuite/systemtap.examples/profiling/topsys.stp
 	<title>topsys.stp</title>
 <para>
 <programlisting>
-<xi:include parse="text" href="extras/testsuite/systemtap.examples/profiling/topsys.stp" xmlns:xi="http://www.w3.org/2001/XInclude" />
+<xi:include parse="text" href="../testsuite/systemtap.examples/profiling/topsys.stp" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </programlisting>
 </para>
 </formalpara>		
diff --git a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-traceio.xml b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-traceio.xml
index 1af1475d..d3e04eff 100644
--- a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-traceio.xml
+++ b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-traceio.xml
@@ -42,7 +42,7 @@
 	<title>traceio.stp</title>
 <para>
 <programlisting>
-<xi:include parse="text" href="extras/testsuite/systemtap.examples/io/traceio.stp" xmlns:xi="http://www.w3.org/2001/XInclude" />
+<xi:include parse="text" href="../testsuite/systemtap.examples/io/traceio.stp" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </programlisting>
 </para>
 </formalpara>
diff --git a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-traceio2.xml b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-traceio2.xml
index 7451de98..aed8c508 100644
--- a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-traceio2.xml
+++ b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-traceio2.xml
@@ -53,7 +53,7 @@
 	<title>traceio2.stp</title>
 <para>
 <programlisting>
-<xi:include parse="text" href="extras/testsuite/systemtap.examples/io/traceio2.stp" xmlns:xi="http://www.w3.org/2001/XInclude" />
+<xi:include parse="text" href="../testsuite/systemtap.examples/io/traceio2.stp" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </programlisting>
 </para>
 </formalpara>
diff --git a/doc/SystemTap_Beginners_Guide/old-syncandbuild.sh b/doc/SystemTap_Beginners_Guide/old-syncandbuild.sh
deleted file mode 100755
index e6a6c1f4..00000000
--- a/doc/SystemTap_Beginners_Guide/old-syncandbuild.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-# Instead of running the original makefile to build the document, run this script instead
-echo -n "Please specify your build target (e.g. html, pdf, or html-single)	"
-read TARG
-echo -n "Please specify the product you are building for (enter 1 for Fedora, 2 for RHEL)	"
-read PROD
-echo -n "Please specify any build parameters you'd like to use (skip this step for none).	"
-read PARM
-
-if [ $PROD = 1 ]; 
-then 	
-	sed -i -e 's/<productname>Red Hat Enterprise Linux/<productname>Fedora/g' en-US/Book_Info.xml;
-	sed -i -e 's/<productnumber>5/<productnumber>10/g' en-US/Book_Info.xml;
-	sed -i -e 's/BRAND = RedHat/BRAND = fedora/g' Makefile;
-	make $PARM $TARG-en-US post
-
-else 
-sed -i -e 's/BRAND = fedora/BRAND = RedHat/g' Makefile;	
-make post $PARM $TARG-en-US
-fi
-
-echo "done."
-echo "Cleaning sync'd files..."
-make post
-echo "...done."
\ No newline at end of file
diff --git a/doc/SystemTap_Beginners_Guide/publican.cfg b/doc/SystemTap_Beginners_Guide/publican.cfg
deleted file mode 100644
index cc174563..00000000
--- a/doc/SystemTap_Beginners_Guide/publican.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Config::Simple 4.59
-# Tue Dec  1 09:26:42 2009
-
-debug: 1
-xml_lang: en-US
-brand: fedora
-condition: fedora
-
diff --git a/doc/SystemTap_Beginners_Guide/publican.cfg.in b/doc/SystemTap_Beginners_Guide/publican.cfg.in
new file mode 100644
index 00000000..d6cbacde
--- /dev/null
+++ b/doc/SystemTap_Beginners_Guide/publican.cfg.in
@@ -0,0 +1,5 @@
+debug: 0
+xml_lang: en-US
+brand: @PUBLICAN_BRAND@
+condition: @PUBLICAN_BRAND@
+tmp_dir: build
diff --git a/doc/SystemTap_Beginners_Guide/syncandbuild.sh b/doc/SystemTap_Beginners_Guide/syncandbuild.sh
deleted file mode 100755
index 00084985..00000000
--- a/doc/SystemTap_Beginners_Guide/syncandbuild.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-# Instead of running the original makefile to build the document, run this script instead
-echo -n "Please specify your build target (e.g. html, pdf, or html-single)	"
-read TARG
-echo -n "Please specify the product you are building for (enter 1 for Fedora, 2 for RHEL)	"
-read PROD
-#echo -n "Please specify any build parameters you'd like to use (skip this step for none).	"
-#read PARM
-#copy scripts from testsuite
-cp -a ../../testsuite en-US/extras/;
-
-if [ $PROD = 1 ]; 
-then 	
-	sed -i -e 's/<productname>Red Hat Enterprise Linux/<productname>Fedora/g' en-US/Book_Info.xml;
-	sed -i -e 's/<productnumber>5.4/<productnumber>10/g' en-US/Book_Info.xml;
-	sed -i -e 's/brand: RedHat/brand: fedora/g' publican.cfg;
-	sed -i -e 's/condition: RedHat/condition: fedora/g' publican.cfg;
-	publican build --formats=$TARG --langs=en-US;
-#	rm -rf en-US/extras/testsuite
-	sed -i -e 's/<productname>Fedora/<productname>Red Hat Enterprise Linux/g' en-US/Book_Info.xml;
-	sed -i -e 's/<productnumber>10/<productnumber>5.4/g' en-US/Book_Info.xml;
-
-
-else 
-sed -i -e 's/brand: fedora/brand: RedHat/g' publican.cfg;
-sed -i -e 's/brand: fedora/brand: RedHat/g' publican.cfg;		
-#make post $PARM $TARG-en-US
-publican build --formats=$TARG --langs=en-US;
-#rm -rf en-US/extras/testsuite
-sed -i -e 's/<productname>Fedora/<productname>Red Hat Enterprise Linux/g' en-US/Book_Info.xml;
-sed -i -e 's/<productnumber>10/<productnumber>5.4/g' en-US/Book_Info.xml;
-
-fi
-
-echo "done."
-echo "Cleaning sync'd files..."
-rm -rf en-US/extras/testsuite ;
-echo "...done."
\ No newline at end of file
diff --git a/doc/SystemTap_Tapset_Reference/Makefile.in b/doc/SystemTap_Tapset_Reference/Makefile.in
index 158c9b6b..cb5002ae 100644
--- a/doc/SystemTap_Tapset_Reference/Makefile.in
+++ b/doc/SystemTap_Tapset_Reference/Makefile.in
@@ -125,6 +125,7 @@ PIECFLAGS = @PIECFLAGS@
 PIECXXFLAGS = @PIECXXFLAGS@
 PIELDFLAGS = @PIELDFLAGS@
 PKG_CONFIG = @PKG_CONFIG@
+PUBLICAN_BRAND = @PUBLICAN_BRAND@
 RANLIB = @RANLIB@
 RPM_CFLAGS = @RPM_CFLAGS@
 RPM_LIBS = @RPM_LIBS@
@@ -160,6 +161,7 @@ have_dvips = @have_dvips@
 have_latex = @have_latex@
 have_latex2html = @have_latex2html@
 have_ps2pdf = @have_ps2pdf@
+have_publican = @have_publican@
 have_xmlto = @have_xmlto@
 host_alias = @host_alias@
 htmldir = @htmldir@
diff --git a/doc/beginners/Makefile.am b/doc/beginners/Makefile.am
new file mode 100644
index 00000000..29ffeaba
--- /dev/null
+++ b/doc/beginners/Makefile.am
@@ -0,0 +1,48 @@
+# Makefile.am --- automake input file for systemtap tapset reference manual
+## process this file with automake to produce Makefile.in
+
+# publican will create a pdf file and a directory with *.html files,
+# a directory called images that contain *.png and *.svg files, a
+# Common_Content/images with more *.png and *.svg files and a
+# Common_Content/css directory with *.css files.
+
+DOC_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap
+SBG = SystemTap_Beginners_Guide
+BEGIN_INSTALL_DIR = $(DOC_INSTALL_DIR)/$(SBG)
+
+if BUILD_PUBLICAN
+all: $(SBG).pdf $(SBG)/index.html
+
+$(SBG).pdf:
+	publican build --formats=pdf --langs=en-US && \
+	mv build/en-US/pdf/*$(SBG)*.pdf $(SBG).pdf
+
+$(SBG)/index.html:
+	publican build --formats=html --langs=en-US  && \
+	mv build/en-US/html $(SBG)
+
+clean-local:
+	publican clean
+	rm -f $(SBG).pdf
+	rm -rf $(SBG)
+
+install-data-hook:
+	$(MKDIR_P) $(DOC_INSTALL_DIR)
+	$(INSTALL_DATA) $(SBG).pdf $(DOC_INSTALL_DIR)
+	$(MKDIR_P) $(DOC_INSTALL_DIR)/$(SBG)
+	$(INSTALL_DATA) $(SBG)/*.html $(DOC_INSTALL_DIR)/$(SBG)
+	$(MKDIR_P) $(DOC_INSTALL_DIR)/$(SBG)/images
+	$(INSTALL_DATA) $(SBG)/images/*.png $(SBG)/images/*.svg \
+			$(DOC_INSTALL_DIR)/$(SBG)/images
+	$(MKDIR_P) $(DOC_INSTALL_DIR)/$(SBG)/Common_Content/css
+	$(MKDIR_P) $(DOC_INSTALL_DIR)/$(SBG)/Common_Content/images
+	$(INSTALL_DATA) $(SBG)/Common_Content/css/*.css \
+			$(DOC_INSTALL_DIR)/$(SBG)/Common_Content/css
+	$(INSTALL_DATA) $(SBG)/Common_Content/images/*.png \
+			$(SBG)/Common_Content/images/*.svg \
+			$(DOC_INSTALL_DIR)/$(SBG)/Common_Content/images
+
+uninstall-local:
+	rm -f $(DOC_INSTALL_DIR)/$(SBG).pdf
+	rm -rf $(DOC_INSTALL_DIR)/$(SBG)
+endif
diff --git a/doc/beginners/Makefile.in b/doc/beginners/Makefile.in
new file mode 100644
index 00000000..2bae95f3
--- /dev/null
+++ b/doc/beginners/Makefile.in
@@ -0,0 +1,408 @@
+# Makefile.in generated by automake 1.11 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Makefile.am --- automake input file for systemtap tapset reference manual
+
+# publican will create a pdf file and a directory with *.html files,
+# a directory called images that contain *.png and *.svg files, a
+# Common_Content/images with more *.png and *.svg files and a
+# Common_Content/css directory with *.css files.
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = doc/beginners
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/doc/SystemTap_Beginners_Guide/publican.cfg.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES = publican.cfg
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATE = @DATE@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PIECFLAGS = @PIECFLAGS@
+PIECXXFLAGS = @PIECXXFLAGS@
+PIELDFLAGS = @PIELDFLAGS@
+PKG_CONFIG = @PKG_CONFIG@
+PUBLICAN_BRAND = @PUBLICAN_BRAND@
+RANLIB = @RANLIB@
+RPM_CFLAGS = @RPM_CFLAGS@
+RPM_LIBS = @RPM_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+U = @U@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+elfutils_abs_srcdir = @elfutils_abs_srcdir@
+exec_prefix = @exec_prefix@
+gtkmm_CFLAGS = @gtkmm_CFLAGS@
+gtkmm_LIBS = @gtkmm_LIBS@
+have_certutil = @have_certutil@
+have_dvips = @have_dvips@
+have_latex = @have_latex@
+have_latex2html = @have_latex2html@
+have_ps2pdf = @have_ps2pdf@
+have_publican = @have_publican@
+have_xmlto = @have_xmlto@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libglade_CFLAGS = @libglade_CFLAGS@
+libglade_LIBS = @libglade_LIBS@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+nspr_CFLAGS = @nspr_CFLAGS@
+nss_CFLAGS = @nss_CFLAGS@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+rpm_LIBS = @rpm_LIBS@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sqlite3_LIBS = @sqlite3_LIBS@
+srcdir = @srcdir@
+stap_LIBS = @stap_LIBS@
+staplog_CPPFLAGS = @staplog_CPPFLAGS@
+subdirs = @subdirs@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+DOC_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap
+SBG = SystemTap_Beginners_Guide
+BEGIN_INSTALL_DIR = $(DOC_INSTALL_DIR)/$(SBG)
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/beginners/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu doc/beginners/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+publican.cfg: $(top_builddir)/config.status $(top_srcdir)/doc/SystemTap_Beginners_Guide/publican.cfg.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+@BUILD_PUBLICAN_FALSE@uninstall-local:
+@BUILD_PUBLICAN_FALSE@clean-local:
+@BUILD_PUBLICAN_FALSE@install-data-hook:
+clean: clean-am
+
+clean-am: clean-generic clean-local mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-local
+
+.MAKE: install-am install-data-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-local \
+	distclean distclean-generic distdir dvi dvi-am html html-am \
+	info info-am install install-am install-data install-data-am \
+	install-data-hook install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am uninstall uninstall-am uninstall-local
+
+
+@BUILD_PUBLICAN_TRUE@all: $(SBG).pdf $(SBG)/index.html
+
+@BUILD_PUBLICAN_TRUE@$(SBG).pdf:
+@BUILD_PUBLICAN_TRUE@	publican build --formats=pdf --langs=en-US && \
+@BUILD_PUBLICAN_TRUE@	mv build/en-US/pdf/*$(SBG)*.pdf $(SBG).pdf
+
+@BUILD_PUBLICAN_TRUE@$(SBG)/index.html:
+@BUILD_PUBLICAN_TRUE@	publican build --formats=html --langs=en-US  && \
+@BUILD_PUBLICAN_TRUE@	mv build/en-US/html $(SBG)
+
+@BUILD_PUBLICAN_TRUE@clean-local:
+@BUILD_PUBLICAN_TRUE@	publican clean
+@BUILD_PUBLICAN_TRUE@	rm -f $(SBG).pdf
+@BUILD_PUBLICAN_TRUE@	rm -rf $(SBG)
+
+@BUILD_PUBLICAN_TRUE@install-data-hook:
+@BUILD_PUBLICAN_TRUE@	$(MKDIR_P) $(DOC_INSTALL_DIR)
+@BUILD_PUBLICAN_TRUE@	$(INSTALL_DATA) $(SBG).pdf $(DOC_INSTALL_DIR)
+@BUILD_PUBLICAN_TRUE@	$(MKDIR_P) $(DOC_INSTALL_DIR)/$(SBG)
+@BUILD_PUBLICAN_TRUE@	$(INSTALL_DATA) $(SBG)/*.html $(DOC_INSTALL_DIR)/$(SBG)
+@BUILD_PUBLICAN_TRUE@	$(MKDIR_P) $(DOC_INSTALL_DIR)/$(SBG)/images
+@BUILD_PUBLICAN_TRUE@	$(INSTALL_DATA) $(SBG)/images/*.png $(SBG)/images/*.svg \
+@BUILD_PUBLICAN_TRUE@			$(DOC_INSTALL_DIR)/$(SBG)/images
+@BUILD_PUBLICAN_TRUE@	$(MKDIR_P) $(DOC_INSTALL_DIR)/$(SBG)/Common_Content/css
+@BUILD_PUBLICAN_TRUE@	$(MKDIR_P) $(DOC_INSTALL_DIR)/$(SBG)/Common_Content/images
+@BUILD_PUBLICAN_TRUE@	$(INSTALL_DATA) $(SBG)/Common_Content/css/*.css \
+@BUILD_PUBLICAN_TRUE@			$(DOC_INSTALL_DIR)/$(SBG)/Common_Content/css
+@BUILD_PUBLICAN_TRUE@	$(INSTALL_DATA) $(SBG)/Common_Content/images/*.png \
+@BUILD_PUBLICAN_TRUE@			$(SBG)/Common_Content/images/*.svg \
+@BUILD_PUBLICAN_TRUE@			$(DOC_INSTALL_DIR)/$(SBG)/Common_Content/images
+
+@BUILD_PUBLICAN_TRUE@uninstall-local:
+@BUILD_PUBLICAN_TRUE@	rm -f $(DOC_INSTALL_DIR)/$(SBG).pdf
+@BUILD_PUBLICAN_TRUE@	rm -rf $(DOC_INSTALL_DIR)/$(SBG)
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/grapher/Makefile.in b/grapher/Makefile.in
index c608e516..81b81150 100644
--- a/grapher/Makefile.in
+++ b/grapher/Makefile.in
@@ -169,6 +169,7 @@ PIECFLAGS = @PIECFLAGS@
 PIECXXFLAGS = @PIECXXFLAGS@
 PIELDFLAGS = @PIELDFLAGS@
 PKG_CONFIG = @PKG_CONFIG@
+PUBLICAN_BRAND = @PUBLICAN_BRAND@
 RANLIB = @RANLIB@
 RPM_CFLAGS = @RPM_CFLAGS@
 RPM_LIBS = @RPM_LIBS@
@@ -204,6 +205,7 @@ have_dvips = @have_dvips@
 have_latex = @have_latex@
 have_latex2html = @have_latex2html@
 have_ps2pdf = @have_ps2pdf@
+have_publican = @have_publican@
 have_xmlto = @have_xmlto@
 host_alias = @host_alias@
 htmldir = @htmldir@
diff --git a/systemtap.spec b/systemtap.spec
index 4a60b00b..2ae99e58 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -7,6 +7,8 @@
 %{!?pie_supported: %define pie_supported 1}
 %{!?with_grapher: %define with_grapher 1}
 %{!?with_boost: %define with_boost 0}
+%{!?with_publican: %define with_publican 1}
+%{!?publican_brand: %define publican_brand fedora}
 
 Name: systemtap
 Version: 1.1
@@ -60,6 +62,10 @@ BuildRequires: /usr/bin/latex /usr/bin/dvips /usr/bin/ps2pdf latex2html
 # called 'xmlto-tex'.  To avoid a specific F10 BuildReq, we'll do a
 # file-based buildreq on '/usr/share/xmlto/format/fo/pdf'.
 BuildRequires: xmlto /usr/share/xmlto/format/fo/pdf
+%if %{with_publican}
+BuildRequires: publican
+BuildRequires: publican-%{publican_brand}
+%endif
 %endif
 
 %if %{with_grapher}
@@ -240,8 +246,14 @@ cd ..
 %define grapher_config --disable-grapher
 %endif
 
+%if %{with_publican}
+%define publican_config --enable-publican --with-publican-brand=%{publican_brand}
+%else
+%define publican_config --disable-publican
+%endif
+
 
-%configure %{?elfutils_config} %{sqlite_config} %{crash_config} %{docs_config} %{pie_config} %{grapher_config} %{rpm_config} --disable-silent-rules
+%configure %{?elfutils_config} %{sqlite_config} %{crash_config} %{docs_config} %{pie_config} %{grapher_config} %{publican_config} %{rpm_config} --disable-silent-rules
 make %{?_smp_mflags}
 
 %install
@@ -274,6 +286,9 @@ cp -rp testsuite $RPM_BUILD_ROOT%{_datadir}/systemtap
 mkdir docs.installed
 mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/*.pdf docs.installed/
 mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/tapsets docs.installed/
+%if %{with_publican}
+mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/SystemTap_Beginners_Guide docs.installed/
+%endif
 %endif
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/
@@ -381,6 +396,9 @@ exit 0
 %if %{with_docs}
 %doc docs.installed/*.pdf
 %doc docs.installed/tapsets
+%if %{with_publican}
+%doc docs.installed/SystemTap_Beginners_Guide
+%endif
 %endif
 
 %{_bindir}/stap