Merge branch 'master' of ssh://sources.redhat.com/git/systemtap

6 files changed, 60 insertions, 12 deletions

diff --git a/doc/SystemTap_Beginners_Guide/Makefile b/doc/SystemTap_Beginners_Guide/Makefile
index 32dc0d50..5c9c2379 100644
--- a/doc/SystemTap_Beginners_Guide/Makefile
+++ b/doc/SystemTap_Beginners_Guide/Makefile
@@ -2,7 +2,7 @@
 
 XML_LANG	= en-US
 
-BRAND = RedHat
+BRAND = fedora
 #	please define the BRAND in the pre:: section below
 #SHOW_REMARKS = 1
 
diff --git a/doc/SystemTap_Beginners_Guide/en-US/Book_Info.xml b/doc/SystemTap_Beginners_Guide/en-US/Book_Info.xml
index acca17ae..fb6bec20 100644
--- a/doc/SystemTap_Beginners_Guide/en-US/Book_Info.xml
+++ b/doc/SystemTap_Beginners_Guide/en-US/Book_Info.xml
@@ -9,7 +9,7 @@
 	<edition>2.0</edition>
 	
 	<productname>Red Hat Enterprise Linux</productname>
-	<productnumber>5</productnumber>
+	<productnumber>5.4</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>
@@ -26,8 +26,9 @@
 	<copyright>
 		<year>&YEAR;</year>
 		<holder>&HOLDER;</holder>
-	</copyright>
+	</copyright> 
  	<xi:include href="Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+<!-- <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>-->
 	<xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </bookinfo>
 
diff --git a/doc/SystemTap_Beginners_Guide/en-US/SystemTap_Beginners_Guide.ent b/doc/SystemTap_Beginners_Guide/en-US/SystemTap_Beginners_Guide.ent
index 6d15d297..454df409 100644
--- a/doc/SystemTap_Beginners_Guide/en-US/SystemTap_Beginners_Guide.ent
+++ b/doc/SystemTap_Beginners_Guide/en-US/SystemTap_Beginners_Guide.ent
@@ -3,4 +3,5 @@
 <!ENTITY YEAR "2009">
 <!ENTITY RHEL "Red Hat Enterprise Linux 5">
 <!ENTITY APH "'">
-<!ENTITY PROD "Red Hat Enterprise Linux 5">
\ No newline at end of file
+<!ENTITY PROD "Red Hat Enterprise Linux 5">
+<!ENTITY HOLDER "Red Hat, Inc">
diff --git a/doc/SystemTap_Beginners_Guide/old-syncandbuild.sh b/doc/SystemTap_Beginners_Guide/old-syncandbuild.sh
new file mode 100755
index 00000000..e6a6c1f4
--- /dev/null
+++ b/doc/SystemTap_Beginners_Guide/old-syncandbuild.sh
@@ -0,0 +1,25 @@
+#!/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
new file mode 100644
index 00000000..cc174563
--- /dev/null
+++ b/doc/SystemTap_Beginners_Guide/publican.cfg
@@ -0,0 +1,8 @@
+# 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/syncandbuild.sh b/doc/SystemTap_Beginners_Guide/syncandbuild.sh
index e6a6c1f4..00084985 100755
--- a/doc/SystemTap_Beginners_Guide/syncandbuild.sh
+++ b/doc/SystemTap_Beginners_Guide/syncandbuild.sh
@@ -4,22 +4,35 @@ 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
+#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/<productnumber>10/g' en-US/Book_Info.xml;
-	sed -i -e 's/BRAND = RedHat/BRAND = fedora/g' Makefile;
-	make $PARM $TARG-en-US post
+	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' Makefile;	
-make post $PARM $TARG-en-US
+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..."
-make post
+rm -rf en-US/extras/testsuite ;
 echo "...done."
\ No newline at end of file