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

Conflicts:

	ChangeLog
	NEWS

5 files changed, 63 insertions, 2 deletions

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 34f5dbe0..01e9dcce 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-02  Stan Cox  <scox@redhat.com>
+
+	* langref.tex: Add process.label.
+
 2009-01-30  Dave Brolley  <brolley@redhat.com>
 
 	* Makefile.in: Regenerated.
diff --git a/doc/SystemTap_Tapset_Reference/.gitignore b/doc/SystemTap_Tapset_Reference/.gitignore
new file mode 100644
index 00000000..af43f913
--- /dev/null
+++ b/doc/SystemTap_Tapset_Reference/.gitignore
@@ -0,0 +1 @@
+/docproc
diff --git a/doc/Tapset_Reference_Guide/en-US/Author_Group.xml b/doc/Tapset_Reference_Guide/en-US/Author_Group.xml
new file mode 100644
index 00000000..d795efba
--- /dev/null
+++ b/doc/Tapset_Reference_Guide/en-US/Author_Group.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0'?>
+<!DOCTYPE authorgroup PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+]>
+
+<authorgroup>
+	<corpauthor>Red Hat Enterprise Linux Documentation</corpauthor>
+	<author>
+		<firstname>Don</firstname>
+		<surname>Domingo</surname>
+		<affiliation>
+			<orgname>Engineering Services and Operations</orgname>
+			<orgdiv>Content Services</orgdiv>
+		</affiliation>
+		<email>ddomingo@redhat.com</email>
+	</author>
+	<author>
+		<firstname>Will</firstname>
+		<surname>Cohen</surname>
+		<affiliation>
+			<orgname>Engineering Services and Operations</orgname>
+			<orgdiv>Performance Tools</orgdiv>
+		</affiliation>
+		<email>wcohen@redhat.com</email>
+	</author>	
+</authorgroup>
diff --git a/doc/Tapset_Reference_Guide/publicanize.sh b/doc/Tapset_Reference_Guide/publicanize.sh
new file mode 100644
index 00000000..b9cd7d8f
--- /dev/null
+++ b/doc/Tapset_Reference_Guide/publicanize.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+#copy the automated tapsets.xml 
+cp ../SystemTap_Tapset_Reference/tapsets.xml en-US/Tapset_Reference_Guide.xml ;
+
+#remove all excess whitespace
+sed -i -e 's/^\s*//g' en-US/Tapset_Reference_Guide.xml ;
+
+#replace header
+
+cat en-US/Tapset_Reference_Guide.xml | perl -p -e 'undef $/;s|<bookinfo>\n<title>SystemTap Tapset Reference Manual</title>|<xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />\n<xi:include href="Preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />|msg' | perl -p -e 'undef $/;s|<authorgroup>\n<author>\n<firstname>William</firstname>\n<surname>Cohen</surname>\n<affiliation>\n<address>\n<email>wcohen\@redhat.com</email>\n</address>\n</affiliation>\n</author>\n</authorgroup>||msg' | perl -p -e 'undef $/;s|<copyright>\n<year>2008, 2009</year>\n<holder>Red Hat, Inc.</holder>\n</copyright>||msg' | perl -p -e 'undef $/;s|<legalnotice>\n<para>\nThis documentation is free software\; you can redistribute\nit and/or modify it under the terms of the GNU General Public\nLicense version 2 as published by the Free Software Foundation.\n</para>||msg' | perl -p -e 'undef $/;s|<para>\nThis program is distributed in the hope that it will be\nuseful, but WITHOUT ANY WARRANTY; without even the implied\nwarranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\nSee the GNU General Public License for more details.\n</para>||msg' | perl -p -e 'undef $/;s|<para>\nYou should have received a copy of the GNU General Public\nLicense along with this program; if not, write to the Free\nSoftware Foundation, Inc., 59 Temple Place, Suite 330, Boston,\nMA 02111-1307 USA\n</para>||msg' | perl -p -e 'undef $/;s|<para>\nFor more details see the file COPYING in the source\ndistribution of Linux.\n</para>\n</legalnotice>\n</bookinfo>||msg' | perl -p -e 'undef $/;s|<toc></toc>||msg' | perl -p -e 'undef $/;s|\n\n\n\n\n\n\n\n\n\n\n\n\n\n||msg' | perl -p -e 'undef $/;s|<programlisting>\n|<programlisting>\n<emphasis>(sfunction) <\/emphasis>|msg' > clean.xml
+
+cp clean.xml en-US/Tapset_Reference_Guide.xml
+
+
+# statements change synopsis tags, as they are still currently unfixed in publican-redhat 
+sed -i -e 's/refsynopsisdiv>/refsect1>/g' en-US/Tapset_Reference_Guide.xml;
+sed -i -e 's/refsect1>/refsection>/g' en-US/Tapset_Reference_Guide.xml;
+sed -i -e 's/synopsis>/programlisting>\n/g' en-US/Tapset_Reference_Guide.xml; 
+
+# re-convert tags 
+
+sed -i  -e 's/&lt;emphasis&gt;/<emphasis>/g' en-US/Tapset_Reference_Guide.xml;
+sed -i  -e 's/&lt;\/emphasis&gt;/<\/emphasis>/g' en-US/Tapset_Reference_Guide.xml;
+
+sed -i  -e 's/&lt;command&gt;/<command>/g' en-US/Tapset_Reference_Guide.xml;
+sed -i  -e 's/&lt;\/command&gt;/<\/command>/g' en-US/Tapset_Reference_Guide.xml;
\ No newline at end of file
diff --git a/doc/langref.tex b/doc/langref.tex
index 3af2bd15..5aefa278 100644
--- a/doc/langref.tex
+++ b/doc/langref.tex
@@ -706,6 +706,7 @@ kernel.function(PATTERN).call
 kernel.function(PATTERN).return
 kernel.function(PATTERN).return.maxactive(VALUE)
 kernel.function(PATTERN).inline
+kernel.function(PATTERN).label(LPATTERN)
 module(MPATTERN).function(PATTERN)
 module(MPATTERN).function(PATTERN).call
 module(MPATTERN).function(PATTERN).return.maxactive(VALUE)
@@ -737,8 +738,11 @@ The \textbf{.statement} variant places a probe at the exact spot, exposing those
 variables that are visible there.
 
 In the above probe descriptions, MPATTERN stands for a string literal
-that identifies the loaded kernel module of interest. It may include asterisk
-({*}), square brackets \char`\"{}{[}]\char`\"{}, and question mark (?) wildcards.
+that identifies the loaded kernel module of interest and LPATTERN
+stands for a source program label. Both MPATTERN and LPATTERN may
+include asterisk ({*}), square brackets \char`\"{}{[}]\char`\"{}, and
+question mark (?) wildcards.
+
 PATTERN stands for a string literal that identifies a point in the program.
 It is composed of three parts: