From a69dded996e6fa1eebd111e3dfe69efcea927baf Mon Sep 17 00:00:00 2001
From: William Cohen <wcohen@redhat.com>
Date: Tue, 9 Mar 2010 11:05:25 -0500
Subject: PR 11210 Eliminate man page collisions

The various man pages for each systemtap probe and function
are prepended with "probe::" and "function::" respectively to avoid
collisions with other man3 pages with the same name.  For example
systemtap's strlen function was colliding with glibc's strlen function.
---
 scripts/kernel-doc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 7f2db03f..164f0eea 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -980,12 +980,12 @@ sub output_probe_xml(%) {
     print " <date>$man_date</date>\n";
     print "</refentryinfo>\n";
     print "<refmeta>\n";
-    print " <refentrytitle><phrase>".$args{'probe'}."</phrase></refentrytitle>\n";
+    print " <refentrytitle><phrase>probe::".$args{'probe'}."</phrase></refentrytitle>\n";
     print " <manvolnum>3stap</manvolnum>\n";
 #    print " <refmiscinfo class=\"version\">" . $kernelversion . "</refmiscinfo>\n";
     print "</refmeta>\n";
     print "<refnamediv>\n";
-    print " <refname>".$args{'probe'}."</refname>\n";
+    print " <refname>probe::".$args{'probe'}."</refname>\n";
     print " <refpurpose>\n";
     print "  ";
     output_highlight ($args{'purpose'});
@@ -1038,12 +1038,12 @@ sub output_sfunction_xml(%) {
     print " <date>$man_date</date>\n";
     print "</refentryinfo>\n";
     print "<refmeta>\n";
-    print " <refentrytitle><phrase>".$args{'sfunction'}."</phrase></refentrytitle>\n";
+    print " <refentrytitle><phrase>function::".$args{'sfunction'}."</phrase></refentrytitle>\n";
     print " <manvolnum>3stap</manvolnum>\n";
 #    print " <refmiscinfo class=\"version\">" . $kernelversion . "</refmiscinfo>\n";
     print "</refmeta>\n";
     print "<refnamediv>\n";
-    print " <refname>".$args{'sfunction'}."</refname>\n";
+    print " <refname>function::".$args{'sfunction'}."</refname>\n";
     print " <refpurpose>\n";
     print "  ";
     output_highlight ($args{'purpose'});
-- 
cgit