Don't output output, exits, status line in indexes (mentioned in descriptions).

8 files changed, 200 insertions, 372 deletions

diff --git a/testsuite/systemtap.examples/ChangeLog b/testsuite/systemtap.examples/ChangeLog
index 31a981aa..8f425995 100644
--- a/testsuite/systemtap.examples/ChangeLog
+++ b/testsuite/systemtap.examples/ChangeLog
@@ -1,5 +1,13 @@
 2008-08-08  Mark Wielaard  <mwielaard@redhat.com>
 
+	* examples-index-gen.pl (add_meta_txt): Don't output output, exits,
+	status line.
+	(add_meta_html): Likewise.
+	* *index.html: Regenerated.
+	* *index.txt: Likewise.
+
+2008-08-08  Mark Wielaard  <mwielaard@redhat.com>
+
 	* examples-index-gen.pl (inputdir): Make absolute.
 	(outputdir): Likewise.
 	(supportfiles): Copy from new html dir. Add README. Make sure
diff --git a/testsuite/systemtap.examples/examples-index-gen.pl b/testsuite/systemtap.examples/examples-index-gen.pl
index 726df973..e105f3fc 100644
--- a/testsuite/systemtap.examples/examples-index-gen.pl
+++ b/testsuite/systemtap.examples/examples-index-gen.pl
@@ -48,11 +48,12 @@ sub add_meta_txt(*;$) {
 
     print $file "$scripts{$meta}{name} - $scripts{$meta}{title}\n";
 
-    print $file "output: $scripts{$meta}{output}, ";
-    print $file "exits: $scripts{$meta}{exit}, ";
-    print $file "status: $scripts{$meta}{status}\n";
+    # Don't output these, the description mentions all these in general.
+    #print $file "output: $scripts{$meta}{output}, ";
+    #print $file "exits: $scripts{$meta}{exit}, ";
+    #print $file "status: $scripts{$meta}{status}\n";
 
-    print $file "subsystem: $scripts{$meta}{subsystem}, ";
+    print $file "subsystems: $scripts{$meta}{subsystem}, ";
     print $file "keywords: $scripts{$meta}{keywords}\n\n";
 
     $Text::Wrap::columns = 72;
@@ -68,11 +69,12 @@ sub add_meta_html(*;$) {
     print $file "<li><a href=\"$name\">$name</a> ";
     print $file "- $scripts{$meta}{title}<br>\n";
 
-    print $file "output: $scripts{$meta}{output}, ";
-    print $file "exits: $scripts{$meta}{exit}, ";
-    print $file "status: $scripts{$meta}{status}<br>\n";
+    # Don't output these, the description mentions all these in general.
+    #print $file "output: $scripts{$meta}{output}, ";
+    #print $file "exits: $scripts{$meta}{exit}, ";
+    #print $file "status: $scripts{$meta}{status}<br>\n";
 
-    print $file "subsystem: $scripts{$meta}{subsystem}, ";
+    print $file "subsystems: $scripts{$meta}{subsystem}, ";
     print $file "keywords: $scripts{$meta}{keywords}<br>\n";
 
     print $file "<p>$scripts{$meta}{description}";
diff --git a/testsuite/systemtap.examples/index.html b/testsuite/systemtap.examples/index.html
index 7557fffe..327e9ef9 100644
--- a/testsuite/systemtap.examples/index.html
+++ b/testsuite/systemtap.examples/index.html
@@ -42,100 +42,76 @@
 <h2>All Examples</h2>
 <ul>
 <li><a href="general/graphs.stp">general/graphs.stp</a> - Graphing Disk and CPU Utilization<br>
-output: plot data, exits: user-controlled, status: production<br>
-subsystem: disk cpu, keywords: disk cpu use graph<br>
+subsystems: disk cpu, keywords: disk cpu use graph<br>
 <p>The script tracks the disk and CPU utilization. The resulting output of the script can be piped into gnuplot to generate a graph of disk and CPU USE.</p></li>
 <li><a href="general/helloworld.stp">general/helloworld.stp</a> - SystemTap "Hello World" Program<br>
-output: text, exits: fixed, status: production<br>
-subsystem: none, keywords: simple<br>
+subsystems: none, keywords: simple<br>
 <p>A basic "Hello World" program implemented in SystemTap script. It prints out "hello world" message and then immediately exits.</p></li>
 <li><a href="general/para-callgraph.stp">general/para-callgraph.stp</a> - Tracing Calls for Sections of Code<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: kernel, keywords: trace callgraph<br>
+subsystems: kernel, keywords: trace callgraph<br>
 <p>The script takes two arguments: the first argument is the function to starts/stops the per thread call graph traces and the second argument is the list of functions to generate trace information on. The script prints out a timestap for the thread, the function name and pid, followed by entry or exit symboly and function name.</p></li>
 <li><a href="io/disktop.stp">io/disktop.stp</a> - Summarize Disk Read/Write Traffic<br>
-output: timed, exits: user-controlled, status: production<br>
-subsystem: disk, keywords: disk<br>
+subsystems: disk, keywords: disk<br>
 <p>Get the status of reading/writing disk every 5 seconds, output top ten entries during that period.</p></li>
 <li><a href="io/io_submit.stp">io/io_submit.stp</a> - Tally Reschedule Reason During AIO io_submit Call<br>
-output: sorted on-exit, exits: user-controlled, status: production<br>
-subsystem: io, keywords: io backtrace<br>
+subsystems: io, keywords: io backtrace<br>
 <p>When a reschedule occurs during an AIO io_submit call, accumulate the traceback in a histogram. When the script exits prints out a sorted list from most common to least common backtrace.</p></li>
 <li><a href="io/iotime.stp">io/iotime.stp</a> - Trace Time Spent in Read and Write for Files <br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall read write time io<br>
+subsystems: syscall, keywords: syscall read write time io<br>
 <p>The script watches each open, close, read, and write syscalls on the system. For each file the scripts observes opened it accumulates the amount of wall clock time spend in read and write operations and the number of bytes read and written. When a file is closed the script prints out a pair of lines for the file. Both lines begin with a timestamp in microseconds, the PID number, and the executable name in parenthesese. The first line with the "access" keyword lists the file name, the attempted number of bytes for the read and write operations. The second line with the "iotime" keyword list the file name and the number of microseconds accumulated in the read and write syscalls.</p></li>
 <li><a href="io/iotop.stp">io/iotop.stp</a> - Periodically Print I/O Activity by Process Name<br>
-output: timed, exits: user-controlled, status: production<br>
-subsystem: io, keywords: io<br>
+subsystems: io, keywords: io<br>
 <p>Every five seconds print out the top ten executables generating I/O traffic during that interval sorted in descending order.</p></li>
 <li><a href="io/traceio.stp">io/traceio.stp</a> - Track Cumulative I/O Activity by Process Name<br>
-output: timed, exits: user-controlled, status: production<br>
-subsystem: io, keywords: io<br>
+subsystems: io, keywords: io<br>
 <p>Every second print out the top ten executables sorted in descending order based on cumulative I/O traffic observed.</p></li>
 <li><a href="io/traceio2.stp">io/traceio2.stp</a> - Watch I/O Activity on a Particular Device<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: io, keywords: io<br>
+subsystems: io, keywords: io<br>
 <p>Print out the executable name and process number as reads and writes to the specified device occur.</p></li>
 <li><a href="network/nettop.stp">network/nettop.stp</a> - Periodic Listing of Processes Using Network Interfaces<br>
-output: timed, exits: user-controlled, status: production<br>
-subsystem: network, keywords: network traffic per-process<br>
+subsystems: network, keywords: network traffic per-process<br>
 <p>Every five seconds the nettop.stp script prints out a list of processed (PID and command) with the number of packets sent/received and the amount of data sent/received by the process during that interval.</p></li>
 <li><a href="network/socket-trace.stp">network/socket-trace.stp</a> - Trace Functions called in Network Socket Code<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: network, keywords: network socket<br>
+subsystems: network, keywords: network socket<br>
 <p>The script instrument each of the functions inn the Linux kernel's net/socket.c file. The script prints out trace. The first element of a line is  time delta in microseconds from the previous entry. This is followed by the command name and the PID. The "->" and "<-" indicates function entry and  function exit, respectively. The last element of the line is the function name.</p></li>
 <li><a href="process/futexes.stp">process/futexes.stp</a> - System-Wide Futex Contention<br>
-output: sorted-list on-exit, exits: user-controlled, status: production<br>
-subsystem: locking, keywords: syscall locking futex<br>
+subsystems: locking, keywords: syscall locking futex<br>
 <p>The script watches the futex syscall on the system. On exit the futexes address, the number of contentions, and the average time for each contention on the futex are printed from lowest pid number to highest.</p></li>
 <li><a href="process/pf2.stp">process/pf2.stp</a> - Profile kernel functions<br>
-output: sorted-list, exits: user-controlled, status: production<br>
-subsystem: kernel, keywords: profiling<br>
+subsystems: kernel, keywords: profiling<br>
 <p>The pf2.stp script sets up time-based sampling. Every five seconds it prints out a sorted list with the top ten kernel functions with samples.</p></li>
 <li><a href="process/sig_by_pid.stp">process/sig_by_pid.stp</a> -  Signal Counts by Process ID<br>
-output: sorted-list on-exit, exits: user-controlled, status: experimental<br>
-subsystem: signals, keywords: signals<br>
+subsystems: signals, keywords: signals<br>
 <p>Print signal counts by process ID in descending order.</p></li>
 <li><a href="process/sig_by_proc.stp">process/sig_by_proc.stp</a> -  Signal Counts by Process Name<br>
-output: sorted-list on-exit, exits: user-controlled, status: experimental<br>
-subsystem: signals, keywords: signals<br>
+subsystems: signals, keywords: signals<br>
 <p>Print signal counts by process name in descending order.</p></li>
 <li><a href="process/sigkill.stp">process/sigkill.stp</a> - Track SIGKILL Signals<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: signals, keywords: signals<br>
+subsystems: signals, keywords: signals<br>
 <p>The script traces any SIGKILL signals. When that SIGKILL signal is sent to a process, the script prints out the signal name, the desination executable and process ID, the executable name user ID that sent the signal.</p></li>
 <li><a href="process/syscalls_by_pid.stp">process/syscalls_by_pid.stp</a> - System-Wide Count of Syscalls by PID<br>
-output: trace, exits: user-controlled, status: experimental<br>
-subsystem: signals, keywords: signals<br>
+subsystems: signals, keywords: signals<br>
 <p>The script watches for a particular signal sent to a specific process. When that signal is sent to the specified process, the script prints out the PID and executable of the process sending the signal, the PID and executable name of the process receiving the signal, and the signal number and name.</p></li>
 <li><a href="process/sleepingBeauties.stp">process/sleepingBeauties.stp</a> - Generating Backtraces of Threads Waiting for IO Operations<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: scheduler, keywords: io scheduler<br>
+subsystems: scheduler, keywords: io scheduler<br>
 <p>The script monitor time threads spend waiting for IO operations (in "D" state) in the wait_for_completion function. If a thread spends over 10ms wall-clock time waiting, information is printed out describing the thread number and executable name. When slow the wait_for_completion function complete, backtraces for the long duration calls are printed out.</p></li>
 <li><a href="process/sleeptime.stp">process/sleeptime.stp</a> - Trace Time Spent in nanosleep Syscalls<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall sleep<br>
+subsystems: syscall, keywords: syscall sleep<br>
 <p>The script watches each nanosleep syscall on the system. At the end of each nanosleep syscall the script prints out a line with a timestamp in microseconds, the pid, the executable name in paretheses, the "nanosleep:" key, and the duration of the sleep in microseconds.</p></li>
 <li><a href="process/syscalls_by_pid.stp">process/syscalls_by_pid.stp</a> - System-Wide Count of Syscalls by PID<br>
-output: sorted-list on-exit, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall<br>
+subsystems: syscall, keywords: syscall<br>
 <p>The script watches all syscall on the system. On exit the script prints a list showing the number of systemcalls executed by each PID ordered from greatest to least number of syscalls.</p></li>
 <li><a href="process/syscalls_by_proc.stp">process/syscalls_by_proc.stp</a> - System-Wide Count of Syscalls by Executable<br>
-output: sorted-list on-exit, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall<br>
+subsystems: syscall, keywords: syscall<br>
 <p>The script watches all syscall on the system. On exit the script prints a list showing the number of systemcalls executed by each executable ordered from greates to least number of syscalls.</p></li>
 <li><a href="process/wait4time.stp">process/wait4time.stp</a> - Trace Time Spent in wait4 Syscalls<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall wait4<br>
+subsystems: syscall, keywords: syscall wait4<br>
 <p>The script watches each wait4 syscall on the system. At the end of each wait4 syscall the script prints out a line with a timestamp in microseconds, the pid, the executable name in paretheses, the "wait4:" key, the duration of the wait and the PID that the wait4 was waiting for. If the waited for PID is not specified , it is "-1".</p></li>
 <li><a href="profiling/functioncallcount.stp">profiling/functioncallcount.stp</a> - Count Times Functions Called<br>
-output: sorted-list on-exit, exits: user-controlled, status: production<br>
-subsystem: kernel, keywords: profiling functions<br>
+subsystems: kernel, keywords: profiling functions<br>
 <p>The functioncallcount.stp script takes one argument, a list of functions to probe. The script will run and count the number of times that each of the functions on the list is called. On exit the script will print a sorted list from most frequently to least frequently called function.</p></li>
 <li><a href="profiling/thread-times.stp">profiling/thread-times.stp</a> - Profile kernel functions<br>
-output: sorted-list, exits: user-controlled, status: production<br>
-subsystem: kernel, keywords: profiling<br>
+subsystems: kernel, keywords: profiling<br>
 <p>The thread-times.stp script sets up time-based sampling. Every five seconds it prints out a sorted list with the top twenty processes with samples broken down into percentage total time spent in user-space and kernel-space.</p></li>
 </ul>
        	</td>
diff --git a/testsuite/systemtap.examples/index.txt b/testsuite/systemtap.examples/index.txt
index e90cf2c6..aed6f457 100644
--- a/testsuite/systemtap.examples/index.txt
+++ b/testsuite/systemtap.examples/index.txt
@@ -2,8 +2,7 @@ SYSTEMTAP EXAMPLES INDEX
 (see also subsystem-index.txt, keyword-index.txt)
 
 general/graphs.stp - Graphing Disk and CPU Utilization
-output: plot data, exits: user-controlled, status: production
-subsystem: disk cpu, keywords: disk cpu use graph
+subsystems: disk cpu, keywords: disk cpu use graph
 
   The script tracks the disk and CPU utilization. The resulting output
   of the script can be piped into gnuplot to generate a graph of disk
@@ -11,16 +10,14 @@ subsystem: disk cpu, keywords: disk cpu use graph
 
 
 general/helloworld.stp - SystemTap "Hello World" Program
-output: text, exits: fixed, status: production
-subsystem: none, keywords: simple
+subsystems: none, keywords: simple
 
   A basic "Hello World" program implemented in SystemTap script. It
   prints out "hello world" message and then immediately exits.
 
 
 general/para-callgraph.stp - Tracing Calls for Sections of Code
-output: trace, exits: user-controlled, status: production
-subsystem: kernel, keywords: trace callgraph
+subsystems: kernel, keywords: trace callgraph
 
   The script takes two arguments: the first argument is the function to
   starts/stops the per thread call graph traces and the second argument
@@ -30,16 +27,14 @@ subsystem: kernel, keywords: trace callgraph
 
 
 io/disktop.stp - Summarize Disk Read/Write Traffic
-output: timed, exits: user-controlled, status: production
-subsystem: disk, keywords: disk
+subsystems: disk, keywords: disk
 
   Get the status of reading/writing disk every 5 seconds, output top
   ten entries during that period.
 
 
 io/io_submit.stp - Tally Reschedule Reason During AIO io_submit Call
-output: sorted on-exit, exits: user-controlled, status: production
-subsystem: io, keywords: io backtrace
+subsystems: io, keywords: io backtrace
 
   When a reschedule occurs during an AIO io_submit call, accumulate the
   traceback in a histogram. When the script exits prints out a sorted
@@ -47,8 +42,7 @@ subsystem: io, keywords: io backtrace
 
 
 io/iotime.stp - Trace Time Spent in Read and Write for Files 
-output: trace, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall read write time io
+subsystems: syscall, keywords: syscall read write time io
 
   The script watches each open, close, read, and write syscalls on the
   system. For each file the scripts observes opened it accumulates the
@@ -64,32 +58,28 @@ subsystem: syscall, keywords: syscall read write time io
 
 
 io/iotop.stp - Periodically Print I/O Activity by Process Name
-output: timed, exits: user-controlled, status: production
-subsystem: io, keywords: io
+subsystems: io, keywords: io
 
   Every five seconds print out the top ten executables generating I/O
   traffic during that interval sorted in descending order.
 
 
 io/traceio.stp - Track Cumulative I/O Activity by Process Name
-output: timed, exits: user-controlled, status: production
-subsystem: io, keywords: io
+subsystems: io, keywords: io
 
   Every second print out the top ten executables sorted in descending
   order based on cumulative I/O traffic observed.
 
 
 io/traceio2.stp - Watch I/O Activity on a Particular Device
-output: trace, exits: user-controlled, status: production
-subsystem: io, keywords: io
+subsystems: io, keywords: io
 
   Print out the executable name and process number as reads and writes
   to the specified device occur.
 
 
 network/nettop.stp - Periodic Listing of Processes Using Network Interfaces
-output: timed, exits: user-controlled, status: production
-subsystem: network, keywords: network traffic per-process
+subsystems: network, keywords: network traffic per-process
 
   Every five seconds the nettop.stp script prints out a list of
   processed (PID and command) with the number of packets sent/received
@@ -98,8 +88,7 @@ subsystem: network, keywords: network traffic per-process
 
 
 network/socket-trace.stp - Trace Functions called in Network Socket Code
-output: trace, exits: user-controlled, status: production
-subsystem: network, keywords: network socket
+subsystems: network, keywords: network socket
 
   The script instrument each of the functions inn the Linux kernel's
   net/socket.c file. The script prints out trace. The first element of
@@ -110,8 +99,7 @@ subsystem: network, keywords: network socket
 
 
 process/futexes.stp - System-Wide Futex Contention
-output: sorted-list on-exit, exits: user-controlled, status: production
-subsystem: locking, keywords: syscall locking futex
+subsystems: locking, keywords: syscall locking futex
 
   The script watches the futex syscall on the system. On exit the
   futexes address, the number of contentions, and the average time for
@@ -120,8 +108,7 @@ subsystem: locking, keywords: syscall locking futex
 
 
 process/pf2.stp - Profile kernel functions
-output: sorted-list, exits: user-controlled, status: production
-subsystem: kernel, keywords: profiling
+subsystems: kernel, keywords: profiling
 
   The pf2.stp script sets up time-based sampling. Every five seconds it
   prints out a sorted list with the top ten kernel functions with
@@ -129,22 +116,19 @@ subsystem: kernel, keywords: profiling
 
 
 process/sig_by_pid.stp -  Signal Counts by Process ID
-output: sorted-list on-exit, exits: user-controlled, status: experimental
-subsystem: signals, keywords: signals
+subsystems: signals, keywords: signals
 
   Print signal counts by process ID in descending order.
 
 
 process/sig_by_proc.stp -  Signal Counts by Process Name
-output: sorted-list on-exit, exits: user-controlled, status: experimental
-subsystem: signals, keywords: signals
+subsystems: signals, keywords: signals
 
   Print signal counts by process name in descending order.
 
 
 process/sigkill.stp - Track SIGKILL Signals
-output: trace, exits: user-controlled, status: production
-subsystem: signals, keywords: signals
+subsystems: signals, keywords: signals
 
   The script traces any SIGKILL signals. When that SIGKILL signal is
   sent to a process, the script prints out the signal name, the
@@ -153,8 +137,7 @@ subsystem: signals, keywords: signals
 
 
 process/syscalls_by_pid.stp - System-Wide Count of Syscalls by PID
-output: trace, exits: user-controlled, status: experimental
-subsystem: signals, keywords: signals
+subsystems: signals, keywords: signals
 
   The script watches for a particular signal sent to a specific
   process. When that signal is sent to the specified process, the
@@ -164,8 +147,7 @@ subsystem: signals, keywords: signals
 
 
 process/sleepingBeauties.stp - Generating Backtraces of Threads Waiting for IO Operations
-output: trace, exits: user-controlled, status: production
-subsystem: scheduler, keywords: io scheduler
+subsystems: scheduler, keywords: io scheduler
 
   The script monitor time threads spend waiting for IO operations (in
   "D" state) in the wait_for_completion function. If a thread spends
@@ -176,8 +158,7 @@ subsystem: scheduler, keywords: io scheduler
 
 
 process/sleeptime.stp - Trace Time Spent in nanosleep Syscalls
-output: trace, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall sleep
+subsystems: syscall, keywords: syscall sleep
 
   The script watches each nanosleep syscall on the system. At the end
   of each nanosleep syscall the script prints out a line with a
@@ -187,8 +168,7 @@ subsystem: syscall, keywords: syscall sleep
 
 
 process/syscalls_by_pid.stp - System-Wide Count of Syscalls by PID
-output: sorted-list on-exit, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall
+subsystems: syscall, keywords: syscall
 
   The script watches all syscall on the system. On exit the script
   prints a list showing the number of systemcalls executed by each PID
@@ -196,8 +176,7 @@ subsystem: syscall, keywords: syscall
 
 
 process/syscalls_by_proc.stp - System-Wide Count of Syscalls by Executable
-output: sorted-list on-exit, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall
+subsystems: syscall, keywords: syscall
 
   The script watches all syscall on the system. On exit the script
   prints a list showing the number of systemcalls executed by each
@@ -205,8 +184,7 @@ subsystem: syscall, keywords: syscall
 
 
 process/wait4time.stp - Trace Time Spent in wait4 Syscalls
-output: trace, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall wait4
+subsystems: syscall, keywords: syscall wait4
 
   The script watches each wait4 syscall on the system. At the end of
   each wait4 syscall the script prints out a line with a timestamp in
@@ -216,8 +194,7 @@ subsystem: syscall, keywords: syscall wait4
 
 
 profiling/functioncallcount.stp - Count Times Functions Called
-output: sorted-list on-exit, exits: user-controlled, status: production
-subsystem: kernel, keywords: profiling functions
+subsystems: kernel, keywords: profiling functions
 
   The functioncallcount.stp script takes one argument, a list of
   functions to probe. The script will run and count the number of times
@@ -227,8 +204,7 @@ subsystem: kernel, keywords: profiling functions
 
 
 profiling/thread-times.stp - Profile kernel functions
-output: sorted-list, exits: user-controlled, status: production
-subsystem: kernel, keywords: profiling
+subsystems: kernel, keywords: profiling
 
   The thread-times.stp script sets up time-based sampling. Every five
   seconds it prints out a sorted list with the top twenty processes
diff --git a/testsuite/systemtap.examples/keyword-index.html b/testsuite/systemtap.examples/keyword-index.html
index 07cca25b..c48465cc 100644
--- a/testsuite/systemtap.examples/keyword-index.html
+++ b/testsuite/systemtap.examples/keyword-index.html
@@ -43,244 +43,202 @@
 <h3>BACKTRACE</h3>
 <ul>
 <li><a href="io/io_submit.stp">io/io_submit.stp</a> - Tally Reschedule Reason During AIO io_submit Call<br>
-output: sorted on-exit, exits: user-controlled, status: production<br>
-subsystem: io, keywords: io backtrace<br>
+subsystems: io, keywords: io backtrace<br>
 <p>When a reschedule occurs during an AIO io_submit call, accumulate the traceback in a histogram. When the script exits prints out a sorted list from most common to least common backtrace.</p></li>
 </ul>
 <h3>CALLGRAPH</h3>
 <ul>
 <li><a href="general/para-callgraph.stp">general/para-callgraph.stp</a> - Tracing Calls for Sections of Code<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: kernel, keywords: trace callgraph<br>
+subsystems: kernel, keywords: trace callgraph<br>
 <p>The script takes two arguments: the first argument is the function to starts/stops the per thread call graph traces and the second argument is the list of functions to generate trace information on. The script prints out a timestap for the thread, the function name and pid, followed by entry or exit symboly and function name.</p></li>
 </ul>
 <h3>CPU</h3>
 <ul>
 <li><a href="general/graphs.stp">general/graphs.stp</a> - Graphing Disk and CPU Utilization<br>
-output: plot data, exits: user-controlled, status: production<br>
-subsystem: disk cpu, keywords: disk cpu use graph<br>
+subsystems: disk cpu, keywords: disk cpu use graph<br>
 <p>The script tracks the disk and CPU utilization. The resulting output of the script can be piped into gnuplot to generate a graph of disk and CPU USE.</p></li>
 </ul>
 <h3>DISK</h3>
 <ul>
 <li><a href="general/graphs.stp">general/graphs.stp</a> - Graphing Disk and CPU Utilization<br>
-output: plot data, exits: user-controlled, status: production<br>
-subsystem: disk cpu, keywords: disk cpu use graph<br>
+subsystems: disk cpu, keywords: disk cpu use graph<br>
 <p>The script tracks the disk and CPU utilization. The resulting output of the script can be piped into gnuplot to generate a graph of disk and CPU USE.</p></li>
 <li><a href="io/disktop.stp">io/disktop.stp</a> - Summarize Disk Read/Write Traffic<br>
-output: timed, exits: user-controlled, status: production<br>
-subsystem: disk, keywords: disk<br>
+subsystems: disk, keywords: disk<br>
 <p>Get the status of reading/writing disk every 5 seconds, output top ten entries during that period.</p></li>
 </ul>
 <h3>FUNCTIONS</h3>
 <ul>
 <li><a href="profiling/functioncallcount.stp">profiling/functioncallcount.stp</a> - Count Times Functions Called<br>
-output: sorted-list on-exit, exits: user-controlled, status: production<br>
-subsystem: kernel, keywords: profiling functions<br>
+subsystems: kernel, keywords: profiling functions<br>
 <p>The functioncallcount.stp script takes one argument, a list of functions to probe. The script will run and count the number of times that each of the functions on the list is called. On exit the script will print a sorted list from most frequently to least frequently called function.</p></li>
 </ul>
 <h3>FUTEX</h3>
 <ul>
 <li><a href="process/futexes.stp">process/futexes.stp</a> - System-Wide Futex Contention<br>
-output: sorted-list on-exit, exits: user-controlled, status: production<br>
-subsystem: locking, keywords: syscall locking futex<br>
+subsystems: locking, keywords: syscall locking futex<br>
 <p>The script watches the futex syscall on the system. On exit the futexes address, the number of contentions, and the average time for each contention on the futex are printed from lowest pid number to highest.</p></li>
 </ul>
 <h3>GRAPH</h3>
 <ul>
 <li><a href="general/graphs.stp">general/graphs.stp</a> - Graphing Disk and CPU Utilization<br>
-output: plot data, exits: user-controlled, status: production<br>
-subsystem: disk cpu, keywords: disk cpu use graph<br>
+subsystems: disk cpu, keywords: disk cpu use graph<br>
 <p>The script tracks the disk and CPU utilization. The resulting output of the script can be piped into gnuplot to generate a graph of disk and CPU USE.</p></li>
 </ul>
 <h3>IO</h3>
 <ul>
 <li><a href="io/io_submit.stp">io/io_submit.stp</a> - Tally Reschedule Reason During AIO io_submit Call<br>
-output: sorted on-exit, exits: user-controlled, status: production<br>
-subsystem: io, keywords: io backtrace<br>
+subsystems: io, keywords: io backtrace<br>
 <p>When a reschedule occurs during an AIO io_submit call, accumulate the traceback in a histogram. When the script exits prints out a sorted list from most common to least common backtrace.</p></li>
 <li><a href="io/iotime.stp">io/iotime.stp</a> - Trace Time Spent in Read and Write for Files <br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall read write time io<br>
+subsystems: syscall, keywords: syscall read write time io<br>
 <p>The script watches each open, close, read, and write syscalls on the system. For each file the scripts observes opened it accumulates the amount of wall clock time spend in read and write operations and the number of bytes read and written. When a file is closed the script prints out a pair of lines for the file. Both lines begin with a timestamp in microseconds, the PID number, and the executable name in parenthesese. The first line with the "access" keyword lists the file name, the attempted number of bytes for the read and write operations. The second line with the "iotime" keyword list the file name and the number of microseconds accumulated in the read and write syscalls.</p></li>
 <li><a href="io/iotop.stp">io/iotop.stp</a> - Periodically Print I/O Activity by Process Name<br>
-output: timed, exits: user-controlled, status: production<br>
-subsystem: io, keywords: io<br>
+subsystems: io, keywords: io<br>
 <p>Every five seconds print out the top ten executables generating I/O traffic during that interval sorted in descending order.</p></li>
 <li><a href="io/traceio.stp">io/traceio.stp</a> - Track Cumulative I/O Activity by Process Name<br>
-output: timed, exits: user-controlled, status: production<br>
-subsystem: io, keywords: io<br>
+subsystems: io, keywords: io<br>
 <p>Every second print out the top ten executables sorted in descending order based on cumulative I/O traffic observed.</p></li>
 <li><a href="io/traceio2.stp">io/traceio2.stp</a> - Watch I/O Activity on a Particular Device<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: io, keywords: io<br>
+subsystems: io, keywords: io<br>
 <p>Print out the executable name and process number as reads and writes to the specified device occur.</p></li>
 <li><a href="process/sleepingBeauties.stp">process/sleepingBeauties.stp</a> - Generating Backtraces of Threads Waiting for IO Operations<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: scheduler, keywords: io scheduler<br>
+subsystems: scheduler, keywords: io scheduler<br>
 <p>The script monitor time threads spend waiting for IO operations (in "D" state) in the wait_for_completion function. If a thread spends over 10ms wall-clock time waiting, information is printed out describing the thread number and executable name. When slow the wait_for_completion function complete, backtraces for the long duration calls are printed out.</p></li>
 </ul>
 <h3>LOCKING</h3>
 <ul>
 <li><a href="process/futexes.stp">process/futexes.stp</a> - System-Wide Futex Contention<br>
-output: sorted-list on-exit, exits: user-controlled, status: production<br>
-subsystem: locking, keywords: syscall locking futex<br>
+subsystems: locking, keywords: syscall locking futex<br>
 <p>The script watches the futex syscall on the system. On exit the futexes address, the number of contentions, and the average time for each contention on the futex are printed from lowest pid number to highest.</p></li>
 </ul>
 <h3>NETWORK</h3>
 <ul>
 <li><a href="network/nettop.stp">network/nettop.stp</a> - Periodic Listing of Processes Using Network Interfaces<br>
-output: timed, exits: user-controlled, status: production<br>
-subsystem: network, keywords: network traffic per-process<br>
+subsystems: network, keywords: network traffic per-process<br>
 <p>Every five seconds the nettop.stp script prints out a list of processed (PID and command) with the number of packets sent/received and the amount of data sent/received by the process during that interval.</p></li>
 <li><a href="network/socket-trace.stp">network/socket-trace.stp</a> - Trace Functions called in Network Socket Code<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: network, keywords: network socket<br>
+subsystems: network, keywords: network socket<br>
 <p>The script instrument each of the functions inn the Linux kernel's net/socket.c file. The script prints out trace. The first element of a line is  time delta in microseconds from the previous entry. This is followed by the command name and the PID. The "->" and "<-" indicates function entry and  function exit, respectively. The last element of the line is the function name.</p></li>
 </ul>
 <h3>PER-PROCESS</h3>
 <ul>
 <li><a href="network/nettop.stp">network/nettop.stp</a> - Periodic Listing of Processes Using Network Interfaces<br>
-output: timed, exits: user-controlled, status: production<br>
-subsystem: network, keywords: network traffic per-process<br>
+subsystems: network, keywords: network traffic per-process<br>
 <p>Every five seconds the nettop.stp script prints out a list of processed (PID and command) with the number of packets sent/received and the amount of data sent/received by the process during that interval.</p></li>
 </ul>
 <h3>PROFILING</h3>
 <ul>
 <li><a href="process/pf2.stp">process/pf2.stp</a> - Profile kernel functions<br>
-output: sorted-list, exits: user-controlled, status: production<br>
-subsystem: kernel, keywords: profiling<br>
+subsystems: kernel, keywords: profiling<br>
 <p>The pf2.stp script sets up time-based sampling. Every five seconds it prints out a sorted list with the top ten kernel functions with samples.</p></li>
 <li><a href="profiling/functioncallcount.stp">profiling/functioncallcount.stp</a> - Count Times Functions Called<br>
-output: sorted-list on-exit, exits: user-controlled, status: production<br>
-subsystem: kernel, keywords: profiling functions<br>
+subsystems: kernel, keywords: profiling functions<br>
 <p>The functioncallcount.stp script takes one argument, a list of functions to probe. The script will run and count the number of times that each of the functions on the list is called. On exit the script will print a sorted list from most frequently to least frequently called function.</p></li>
 <li><a href="profiling/thread-times.stp">profiling/thread-times.stp</a> - Profile kernel functions<br>
-output: sorted-list, exits: user-controlled, status: production<br>
-subsystem: kernel, keywords: profiling<br>
+subsystems: kernel, keywords: profiling<br>
 <p>The thread-times.stp script sets up time-based sampling. Every five seconds it prints out a sorted list with the top twenty processes with samples broken down into percentage total time spent in user-space and kernel-space.</p></li>
 </ul>
 <h3>READ</h3>
 <ul>
 <li><a href="io/iotime.stp">io/iotime.stp</a> - Trace Time Spent in Read and Write for Files <br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall read write time io<br>
+subsystems: syscall, keywords: syscall read write time io<br>
 <p>The script watches each open, close, read, and write syscalls on the system. For each file the scripts observes opened it accumulates the amount of wall clock time spend in read and write operations and the number of bytes read and written. When a file is closed the script prints out a pair of lines for the file. Both lines begin with a timestamp in microseconds, the PID number, and the executable name in parenthesese. The first line with the "access" keyword lists the file name, the attempted number of bytes for the read and write operations. The second line with the "iotime" keyword list the file name and the number of microseconds accumulated in the read and write syscalls.</p></li>
 </ul>
 <h3>SCHEDULER</h3>
 <ul>
 <li><a href="process/sleepingBeauties.stp">process/sleepingBeauties.stp</a> - Generating Backtraces of Threads Waiting for IO Operations<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: scheduler, keywords: io scheduler<br>
+subsystems: scheduler, keywords: io scheduler<br>
 <p>The script monitor time threads spend waiting for IO operations (in "D" state) in the wait_for_completion function. If a thread spends over 10ms wall-clock time waiting, information is printed out describing the thread number and executable name. When slow the wait_for_completion function complete, backtraces for the long duration calls are printed out.</p></li>
 </ul>
 <h3>SIGNALS</h3>
 <ul>
 <li><a href="process/sig_by_pid.stp">process/sig_by_pid.stp</a> -  Signal Counts by Process ID<br>
-output: sorted-list on-exit, exits: user-controlled, status: experimental<br>
-subsystem: signals, keywords: signals<br>
+subsystems: signals, keywords: signals<br>
 <p>Print signal counts by process ID in descending order.</p></li>
 <li><a href="process/sig_by_proc.stp">process/sig_by_proc.stp</a> -  Signal Counts by Process Name<br>
-output: sorted-list on-exit, exits: user-controlled, status: experimental<br>
-subsystem: signals, keywords: signals<br>
+subsystems: signals, keywords: signals<br>
 <p>Print signal counts by process name in descending order.</p></li>
 <li><a href="process/sigkill.stp">process/sigkill.stp</a> - Track SIGKILL Signals<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: signals, keywords: signals<br>
+subsystems: signals, keywords: signals<br>
 <p>The script traces any SIGKILL signals. When that SIGKILL signal is sent to a process, the script prints out the signal name, the desination executable and process ID, the executable name user ID that sent the signal.</p></li>
 <li><a href="process/syscalls_by_pid.stp">process/syscalls_by_pid.stp</a> - System-Wide Count of Syscalls by PID<br>
-output: trace, exits: user-controlled, status: experimental<br>
-subsystem: signals, keywords: signals<br>
+subsystems: signals, keywords: signals<br>
 <p>The script watches for a particular signal sent to a specific process. When that signal is sent to the specified process, the script prints out the PID and executable of the process sending the signal, the PID and executable name of the process receiving the signal, and the signal number and name.</p></li>
 </ul>
 <h3>SIMPLE</h3>
 <ul>
 <li><a href="general/helloworld.stp">general/helloworld.stp</a> - SystemTap "Hello World" Program<br>
-output: text, exits: fixed, status: production<br>
-subsystem: none, keywords: simple<br>
+subsystems: none, keywords: simple<br>
 <p>A basic "Hello World" program implemented in SystemTap script. It prints out "hello world" message and then immediately exits.</p></li>
 </ul>
 <h3>SLEEP</h3>
 <ul>
 <li><a href="process/sleeptime.stp">process/sleeptime.stp</a> - Trace Time Spent in nanosleep Syscalls<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall sleep<br>
+subsystems: syscall, keywords: syscall sleep<br>
 <p>The script watches each nanosleep syscall on the system. At the end of each nanosleep syscall the script prints out a line with a timestamp in microseconds, the pid, the executable name in paretheses, the "nanosleep:" key, and the duration of the sleep in microseconds.</p></li>
 </ul>
 <h3>SOCKET</h3>
 <ul>
 <li><a href="network/socket-trace.stp">network/socket-trace.stp</a> - Trace Functions called in Network Socket Code<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: network, keywords: network socket<br>
+subsystems: network, keywords: network socket<br>
 <p>The script instrument each of the functions inn the Linux kernel's net/socket.c file. The script prints out trace. The first element of a line is  time delta in microseconds from the previous entry. This is followed by the command name and the PID. The "->" and "<-" indicates function entry and  function exit, respectively. The last element of the line is the function name.</p></li>
 </ul>
 <h3>SYSCALL</h3>
 <ul>
 <li><a href="io/iotime.stp">io/iotime.stp</a> - Trace Time Spent in Read and Write for Files <br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall read write time io<br>
+subsystems: syscall, keywords: syscall read write time io<br>
 <p>The script watches each open, close, read, and write syscalls on the system. For each file the scripts observes opened it accumulates the amount of wall clock time spend in read and write operations and the number of bytes read and written. When a file is closed the script prints out a pair of lines for the file. Both lines begin with a timestamp in microseconds, the PID number, and the executable name in parenthesese. The first line with the "access" keyword lists the file name, the attempted number of bytes for the read and write operations. The second line with the "iotime" keyword list the file name and the number of microseconds accumulated in the read and write syscalls.</p></li>
 <li><a href="process/futexes.stp">process/futexes.stp</a> - System-Wide Futex Contention<br>
-output: sorted-list on-exit, exits: user-controlled, status: production<br>
-subsystem: locking, keywords: syscall locking futex<br>
+subsystems: locking, keywords: syscall locking futex<br>
 <p>The script watches the futex syscall on the system. On exit the futexes address, the number of contentions, and the average time for each contention on the futex are printed from lowest pid number to highest.</p></li>
 <li><a href="process/sleeptime.stp">process/sleeptime.stp</a> - Trace Time Spent in nanosleep Syscalls<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall sleep<br>
+subsystems: syscall, keywords: syscall sleep<br>
 <p>The script watches each nanosleep syscall on the system. At the end of each nanosleep syscall the script prints out a line with a timestamp in microseconds, the pid, the executable name in paretheses, the "nanosleep:" key, and the duration of the sleep in microseconds.</p></li>
 <li><a href="process/syscalls_by_pid.stp">process/syscalls_by_pid.stp</a> - System-Wide Count of Syscalls by PID<br>
-output: sorted-list on-exit, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall<br>
+subsystems: syscall, keywords: syscall<br>
 <p>The script watches all syscall on the system. On exit the script prints a list showing the number of systemcalls executed by each PID ordered from greatest to least number of syscalls.</p></li>
 <li><a href="process/syscalls_by_proc.stp">process/syscalls_by_proc.stp</a> - System-Wide Count of Syscalls by Executable<br>
-output: sorted-list on-exit, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall<br>
+subsystems: syscall, keywords: syscall<br>
 <p>The script watches all syscall on the system. On exit the script prints a list showing the number of systemcalls executed by each executable ordered from greates to least number of syscalls.</p></li>
 <li><a href="process/wait4time.stp">process/wait4time.stp</a> - Trace Time Spent in wait4 Syscalls<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall wait4<br>
+subsystems: syscall, keywords: syscall wait4<br>
 <p>The script watches each wait4 syscall on the system. At the end of each wait4 syscall the script prints out a line with a timestamp in microseconds, the pid, the executable name in paretheses, the "wait4:" key, the duration of the wait and the PID that the wait4 was waiting for. If the waited for PID is not specified , it is "-1".</p></li>
 </ul>
 <h3>TIME</h3>
 <ul>
 <li><a href="io/iotime.stp">io/iotime.stp</a> - Trace Time Spent in Read and Write for Files <br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall read write time io<br>
+subsystems: syscall, keywords: syscall read write time io<br>
 <p>The script watches each open, close, read, and write syscalls on the system. For each file the scripts observes opened it accumulates the amount of wall clock time spend in read and write operations and the number of bytes read and written. When a file is closed the script prints out a pair of lines for the file. Both lines begin with a timestamp in microseconds, the PID number, and the executable name in parenthesese. The first line with the "access" keyword lists the file name, the attempted number of bytes for the read and write operations. The second line with the "iotime" keyword list the file name and the number of microseconds accumulated in the read and write syscalls.</p></li>
 </ul>
 <h3>TRACE</h3>
 <ul>
 <li><a href="general/para-callgraph.stp">general/para-callgraph.stp</a> - Tracing Calls for Sections of Code<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: kernel, keywords: trace callgraph<br>
+subsystems: kernel, keywords: trace callgraph<br>
 <p>The script takes two arguments: the first argument is the function to starts/stops the per thread call graph traces and the second argument is the list of functions to generate trace information on. The script prints out a timestap for the thread, the function name and pid, followed by entry or exit symboly and function name.</p></li>
 </ul>
 <h3>TRAFFIC</h3>
 <ul>
 <li><a href="network/nettop.stp">network/nettop.stp</a> - Periodic Listing of Processes Using Network Interfaces<br>
-output: timed, exits: user-controlled, status: production<br>
-subsystem: network, keywords: network traffic per-process<br>
+subsystems: network, keywords: network traffic per-process<br>
 <p>Every five seconds the nettop.stp script prints out a list of processed (PID and command) with the number of packets sent/received and the amount of data sent/received by the process during that interval.</p></li>
 </ul>
 <h3>USE</h3>
 <ul>
 <li><a href="general/graphs.stp">general/graphs.stp</a> - Graphing Disk and CPU Utilization<br>
-output: plot data, exits: user-controlled, status: production<br>
-subsystem: disk cpu, keywords: disk cpu use graph<br>
+subsystems: disk cpu, keywords: disk cpu use graph<br>
 <p>The script tracks the disk and CPU utilization. The resulting output of the script can be piped into gnuplot to generate a graph of disk and CPU USE.</p></li>
 </ul>
 <h3>WAIT4</h3>
 <ul>
 <li><a href="process/wait4time.stp">process/wait4time.stp</a> - Trace Time Spent in wait4 Syscalls<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall wait4<br>
+subsystems: syscall, keywords: syscall wait4<br>
 <p>The script watches each wait4 syscall on the system. At the end of each wait4 syscall the script prints out a line with a timestamp in microseconds, the pid, the executable name in paretheses, the "wait4:" key, the duration of the wait and the PID that the wait4 was waiting for. If the waited for PID is not specified , it is "-1".</p></li>
 </ul>
 <h3>WRITE</h3>
 <ul>
 <li><a href="io/iotime.stp">io/iotime.stp</a> - Trace Time Spent in Read and Write for Files <br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall read write time io<br>
+subsystems: syscall, keywords: syscall read write time io<br>
 <p>The script watches each open, close, read, and write syscalls on the system. For each file the scripts observes opened it accumulates the amount of wall clock time spend in read and write operations and the number of bytes read and written. When a file is closed the script prints out a pair of lines for the file. Both lines begin with a timestamp in microseconds, the PID number, and the executable name in parenthesese. The first line with the "access" keyword lists the file name, the attempted number of bytes for the read and write operations. The second line with the "iotime" keyword list the file name and the number of microseconds accumulated in the read and write syscalls.</p></li>
 </ul>
        	</td>
diff --git a/testsuite/systemtap.examples/keyword-index.txt b/testsuite/systemtap.examples/keyword-index.txt
index 606430f2..d2e20148 100644
--- a/testsuite/systemtap.examples/keyword-index.txt
+++ b/testsuite/systemtap.examples/keyword-index.txt
@@ -4,8 +4,7 @@ SYSTEMTAP EXAMPLES INDEX BY KEYWORD
 = BACKTRACE =
 
 io/io_submit.stp - Tally Reschedule Reason During AIO io_submit Call
-output: sorted on-exit, exits: user-controlled, status: production
-subsystem: io, keywords: io backtrace
+subsystems: io, keywords: io backtrace
 
   When a reschedule occurs during an AIO io_submit call, accumulate the
   traceback in a histogram. When the script exits prints out a sorted
@@ -15,8 +14,7 @@ subsystem: io, keywords: io backtrace
 = CALLGRAPH =
 
 general/para-callgraph.stp - Tracing Calls for Sections of Code
-output: trace, exits: user-controlled, status: production
-subsystem: kernel, keywords: trace callgraph
+subsystems: kernel, keywords: trace callgraph
 
   The script takes two arguments: the first argument is the function to
   starts/stops the per thread call graph traces and the second argument
@@ -28,8 +26,7 @@ subsystem: kernel, keywords: trace callgraph
 = CPU =
 
 general/graphs.stp - Graphing Disk and CPU Utilization
-output: plot data, exits: user-controlled, status: production
-subsystem: disk cpu, keywords: disk cpu use graph
+subsystems: disk cpu, keywords: disk cpu use graph
 
   The script tracks the disk and CPU utilization. The resulting output
   of the script can be piped into gnuplot to generate a graph of disk
@@ -39,8 +36,7 @@ subsystem: disk cpu, keywords: disk cpu use graph
 = DISK =
 
 general/graphs.stp - Graphing Disk and CPU Utilization
-output: plot data, exits: user-controlled, status: production
-subsystem: disk cpu, keywords: disk cpu use graph
+subsystems: disk cpu, keywords: disk cpu use graph
 
   The script tracks the disk and CPU utilization. The resulting output
   of the script can be piped into gnuplot to generate a graph of disk
@@ -48,8 +44,7 @@ subsystem: disk cpu, keywords: disk cpu use graph
 
 
 io/disktop.stp - Summarize Disk Read/Write Traffic
-output: timed, exits: user-controlled, status: production
-subsystem: disk, keywords: disk
+subsystems: disk, keywords: disk
 
   Get the status of reading/writing disk every 5 seconds, output top
   ten entries during that period.
@@ -58,8 +53,7 @@ subsystem: disk, keywords: disk
 = FUNCTIONS =
 
 profiling/functioncallcount.stp - Count Times Functions Called
-output: sorted-list on-exit, exits: user-controlled, status: production
-subsystem: kernel, keywords: profiling functions
+subsystems: kernel, keywords: profiling functions
 
   The functioncallcount.stp script takes one argument, a list of
   functions to probe. The script will run and count the number of times
@@ -71,8 +65,7 @@ subsystem: kernel, keywords: profiling functions
 = FUTEX =
 
 process/futexes.stp - System-Wide Futex Contention
-output: sorted-list on-exit, exits: user-controlled, status: production
-subsystem: locking, keywords: syscall locking futex
+subsystems: locking, keywords: syscall locking futex
 
   The script watches the futex syscall on the system. On exit the
   futexes address, the number of contentions, and the average time for
@@ -83,8 +76,7 @@ subsystem: locking, keywords: syscall locking futex
 = GRAPH =
 
 general/graphs.stp - Graphing Disk and CPU Utilization
-output: plot data, exits: user-controlled, status: production
-subsystem: disk cpu, keywords: disk cpu use graph
+subsystems: disk cpu, keywords: disk cpu use graph
 
   The script tracks the disk and CPU utilization. The resulting output
   of the script can be piped into gnuplot to generate a graph of disk
@@ -94,8 +86,7 @@ subsystem: disk cpu, keywords: disk cpu use graph
 = IO =
 
 io/io_submit.stp - Tally Reschedule Reason During AIO io_submit Call
-output: sorted on-exit, exits: user-controlled, status: production
-subsystem: io, keywords: io backtrace
+subsystems: io, keywords: io backtrace
 
   When a reschedule occurs during an AIO io_submit call, accumulate the
   traceback in a histogram. When the script exits prints out a sorted
@@ -103,8 +94,7 @@ subsystem: io, keywords: io backtrace
 
 
 io/iotime.stp - Trace Time Spent in Read and Write for Files 
-output: trace, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall read write time io
+subsystems: syscall, keywords: syscall read write time io
 
   The script watches each open, close, read, and write syscalls on the
   system. For each file the scripts observes opened it accumulates the
@@ -120,32 +110,28 @@ subsystem: syscall, keywords: syscall read write time io
 
 
 io/iotop.stp - Periodically Print I/O Activity by Process Name
-output: timed, exits: user-controlled, status: production
-subsystem: io, keywords: io
+subsystems: io, keywords: io
 
   Every five seconds print out the top ten executables generating I/O
   traffic during that interval sorted in descending order.
 
 
 io/traceio.stp - Track Cumulative I/O Activity by Process Name
-output: timed, exits: user-controlled, status: production
-subsystem: io, keywords: io
+subsystems: io, keywords: io
 
   Every second print out the top ten executables sorted in descending
   order based on cumulative I/O traffic observed.
 
 
 io/traceio2.stp - Watch I/O Activity on a Particular Device
-output: trace, exits: user-controlled, status: production
-subsystem: io, keywords: io
+subsystems: io, keywords: io
 
   Print out the executable name and process number as reads and writes
   to the specified device occur.
 
 
 process/sleepingBeauties.stp - Generating Backtraces of Threads Waiting for IO Operations
-output: trace, exits: user-controlled, status: production
-subsystem: scheduler, keywords: io scheduler
+subsystems: scheduler, keywords: io scheduler
 
   The script monitor time threads spend waiting for IO operations (in
   "D" state) in the wait_for_completion function. If a thread spends
@@ -158,8 +144,7 @@ subsystem: scheduler, keywords: io scheduler
 = LOCKING =
 
 process/futexes.stp - System-Wide Futex Contention
-output: sorted-list on-exit, exits: user-controlled, status: production
-subsystem: locking, keywords: syscall locking futex
+subsystems: locking, keywords: syscall locking futex
 
   The script watches the futex syscall on the system. On exit the
   futexes address, the number of contentions, and the average time for
@@ -170,8 +155,7 @@ subsystem: locking, keywords: syscall locking futex
 = NETWORK =
 
 network/nettop.stp - Periodic Listing of Processes Using Network Interfaces
-output: timed, exits: user-controlled, status: production
-subsystem: network, keywords: network traffic per-process
+subsystems: network, keywords: network traffic per-process
 
   Every five seconds the nettop.stp script prints out a list of
   processed (PID and command) with the number of packets sent/received
@@ -180,8 +164,7 @@ subsystem: network, keywords: network traffic per-process
 
 
 network/socket-trace.stp - Trace Functions called in Network Socket Code
-output: trace, exits: user-controlled, status: production
-subsystem: network, keywords: network socket
+subsystems: network, keywords: network socket
 
   The script instrument each of the functions inn the Linux kernel's
   net/socket.c file. The script prints out trace. The first element of
@@ -194,8 +177,7 @@ subsystem: network, keywords: network socket
 = PER-PROCESS =
 
 network/nettop.stp - Periodic Listing of Processes Using Network Interfaces
-output: timed, exits: user-controlled, status: production
-subsystem: network, keywords: network traffic per-process
+subsystems: network, keywords: network traffic per-process
 
   Every five seconds the nettop.stp script prints out a list of
   processed (PID and command) with the number of packets sent/received
@@ -206,8 +188,7 @@ subsystem: network, keywords: network traffic per-process
 = PROFILING =
 
 process/pf2.stp - Profile kernel functions
-output: sorted-list, exits: user-controlled, status: production
-subsystem: kernel, keywords: profiling
+subsystems: kernel, keywords: profiling
 
   The pf2.stp script sets up time-based sampling. Every five seconds it
   prints out a sorted list with the top ten kernel functions with
@@ -215,8 +196,7 @@ subsystem: kernel, keywords: profiling
 
 
 profiling/functioncallcount.stp - Count Times Functions Called
-output: sorted-list on-exit, exits: user-controlled, status: production
-subsystem: kernel, keywords: profiling functions
+subsystems: kernel, keywords: profiling functions
 
   The functioncallcount.stp script takes one argument, a list of
   functions to probe. The script will run and count the number of times
@@ -226,8 +206,7 @@ subsystem: kernel, keywords: profiling functions
 
 
 profiling/thread-times.stp - Profile kernel functions
-output: sorted-list, exits: user-controlled, status: production
-subsystem: kernel, keywords: profiling
+subsystems: kernel, keywords: profiling
 
   The thread-times.stp script sets up time-based sampling. Every five
   seconds it prints out a sorted list with the top twenty processes
@@ -238,8 +217,7 @@ subsystem: kernel, keywords: profiling
 = READ =
 
 io/iotime.stp - Trace Time Spent in Read and Write for Files 
-output: trace, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall read write time io
+subsystems: syscall, keywords: syscall read write time io
 
   The script watches each open, close, read, and write syscalls on the
   system. For each file the scripts observes opened it accumulates the
@@ -257,8 +235,7 @@ subsystem: syscall, keywords: syscall read write time io
 = SCHEDULER =
 
 process/sleepingBeauties.stp - Generating Backtraces of Threads Waiting for IO Operations
-output: trace, exits: user-controlled, status: production
-subsystem: scheduler, keywords: io scheduler
+subsystems: scheduler, keywords: io scheduler
 
   The script monitor time threads spend waiting for IO operations (in
   "D" state) in the wait_for_completion function. If a thread spends
@@ -271,22 +248,19 @@ subsystem: scheduler, keywords: io scheduler
 = SIGNALS =
 
 process/sig_by_pid.stp -  Signal Counts by Process ID
-output: sorted-list on-exit, exits: user-controlled, status: experimental
-subsystem: signals, keywords: signals
+subsystems: signals, keywords: signals
 
   Print signal counts by process ID in descending order.
 
 
 process/sig_by_proc.stp -  Signal Counts by Process Name
-output: sorted-list on-exit, exits: user-controlled, status: experimental
-subsystem: signals, keywords: signals
+subsystems: signals, keywords: signals
 
   Print signal counts by process name in descending order.
 
 
 process/sigkill.stp - Track SIGKILL Signals
-output: trace, exits: user-controlled, status: production
-subsystem: signals, keywords: signals
+subsystems: signals, keywords: signals
 
   The script traces any SIGKILL signals. When that SIGKILL signal is
   sent to a process, the script prints out the signal name, the
@@ -295,8 +269,7 @@ subsystem: signals, keywords: signals
 
 
 process/syscalls_by_pid.stp - System-Wide Count of Syscalls by PID
-output: trace, exits: user-controlled, status: experimental
-subsystem: signals, keywords: signals
+subsystems: signals, keywords: signals
 
   The script watches for a particular signal sent to a specific
   process. When that signal is sent to the specified process, the
@@ -308,8 +281,7 @@ subsystem: signals, keywords: signals
 = SIMPLE =
 
 general/helloworld.stp - SystemTap "Hello World" Program
-output: text, exits: fixed, status: production
-subsystem: none, keywords: simple
+subsystems: none, keywords: simple
 
   A basic "Hello World" program implemented in SystemTap script. It
   prints out "hello world" message and then immediately exits.
@@ -318,8 +290,7 @@ subsystem: none, keywords: simple
 = SLEEP =
 
 process/sleeptime.stp - Trace Time Spent in nanosleep Syscalls
-output: trace, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall sleep
+subsystems: syscall, keywords: syscall sleep
 
   The script watches each nanosleep syscall on the system. At the end
   of each nanosleep syscall the script prints out a line with a
@@ -331,8 +302,7 @@ subsystem: syscall, keywords: syscall sleep
 = SOCKET =
 
 network/socket-trace.stp - Trace Functions called in Network Socket Code
-output: trace, exits: user-controlled, status: production
-subsystem: network, keywords: network socket
+subsystems: network, keywords: network socket
 
   The script instrument each of the functions inn the Linux kernel's
   net/socket.c file. The script prints out trace. The first element of
@@ -345,8 +315,7 @@ subsystem: network, keywords: network socket
 = SYSCALL =
 
 io/iotime.stp - Trace Time Spent in Read and Write for Files 
-output: trace, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall read write time io
+subsystems: syscall, keywords: syscall read write time io
 
   The script watches each open, close, read, and write syscalls on the
   system. For each file the scripts observes opened it accumulates the
@@ -362,8 +331,7 @@ subsystem: syscall, keywords: syscall read write time io
 
 
 process/futexes.stp - System-Wide Futex Contention
-output: sorted-list on-exit, exits: user-controlled, status: production
-subsystem: locking, keywords: syscall locking futex
+subsystems: locking, keywords: syscall locking futex
 
   The script watches the futex syscall on the system. On exit the
   futexes address, the number of contentions, and the average time for
@@ -372,8 +340,7 @@ subsystem: locking, keywords: syscall locking futex
 
 
 process/sleeptime.stp - Trace Time Spent in nanosleep Syscalls
-output: trace, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall sleep
+subsystems: syscall, keywords: syscall sleep
 
   The script watches each nanosleep syscall on the system. At the end
   of each nanosleep syscall the script prints out a line with a
@@ -383,8 +350,7 @@ subsystem: syscall, keywords: syscall sleep
 
 
 process/syscalls_by_pid.stp - System-Wide Count of Syscalls by PID
-output: sorted-list on-exit, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall
+subsystems: syscall, keywords: syscall
 
   The script watches all syscall on the system. On exit the script
   prints a list showing the number of systemcalls executed by each PID
@@ -392,8 +358,7 @@ subsystem: syscall, keywords: syscall
 
 
 process/syscalls_by_proc.stp - System-Wide Count of Syscalls by Executable
-output: sorted-list on-exit, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall
+subsystems: syscall, keywords: syscall
 
   The script watches all syscall on the system. On exit the script
   prints a list showing the number of systemcalls executed by each
@@ -401,8 +366,7 @@ subsystem: syscall, keywords: syscall
 
 
 process/wait4time.stp - Trace Time Spent in wait4 Syscalls
-output: trace, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall wait4
+subsystems: syscall, keywords: syscall wait4
 
   The script watches each wait4 syscall on the system. At the end of
   each wait4 syscall the script prints out a line with a timestamp in
@@ -414,8 +378,7 @@ subsystem: syscall, keywords: syscall wait4
 = TIME =
 
 io/iotime.stp - Trace Time Spent in Read and Write for Files 
-output: trace, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall read write time io
+subsystems: syscall, keywords: syscall read write time io
 
   The script watches each open, close, read, and write syscalls on the
   system. For each file the scripts observes opened it accumulates the
@@ -433,8 +396,7 @@ subsystem: syscall, keywords: syscall read write time io
 = TRACE =
 
 general/para-callgraph.stp - Tracing Calls for Sections of Code
-output: trace, exits: user-controlled, status: production
-subsystem: kernel, keywords: trace callgraph
+subsystems: kernel, keywords: trace callgraph
 
   The script takes two arguments: the first argument is the function to
   starts/stops the per thread call graph traces and the second argument
@@ -446,8 +408,7 @@ subsystem: kernel, keywords: trace callgraph
 = TRAFFIC =
 
 network/nettop.stp - Periodic Listing of Processes Using Network Interfaces
-output: timed, exits: user-controlled, status: production
-subsystem: network, keywords: network traffic per-process
+subsystems: network, keywords: network traffic per-process
 
   Every five seconds the nettop.stp script prints out a list of
   processed (PID and command) with the number of packets sent/received
@@ -458,8 +419,7 @@ subsystem: network, keywords: network traffic per-process
 = USE =
 
 general/graphs.stp - Graphing Disk and CPU Utilization
-output: plot data, exits: user-controlled, status: production
-subsystem: disk cpu, keywords: disk cpu use graph
+subsystems: disk cpu, keywords: disk cpu use graph
 
   The script tracks the disk and CPU utilization. The resulting output
   of the script can be piped into gnuplot to generate a graph of disk
@@ -469,8 +429,7 @@ subsystem: disk cpu, keywords: disk cpu use graph
 = WAIT4 =
 
 process/wait4time.stp - Trace Time Spent in wait4 Syscalls
-output: trace, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall wait4
+subsystems: syscall, keywords: syscall wait4
 
   The script watches each wait4 syscall on the system. At the end of
   each wait4 syscall the script prints out a line with a timestamp in
@@ -482,8 +441,7 @@ subsystem: syscall, keywords: syscall wait4
 = WRITE =
 
 io/iotime.stp - Trace Time Spent in Read and Write for Files 
-output: trace, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall read write time io
+subsystems: syscall, keywords: syscall read write time io
 
   The script watches each open, close, read, and write syscalls on the
   system. For each file the scripts observes opened it accumulates the
diff --git a/testsuite/systemtap.examples/subsystem-index.html b/testsuite/systemtap.examples/subsystem-index.html
index c868d340..f2767f31 100644
--- a/testsuite/systemtap.examples/subsystem-index.html
+++ b/testsuite/systemtap.examples/subsystem-index.html
@@ -43,131 +43,106 @@
 <h3>CPU</h3>
 <ul>
 <li><a href="general/graphs.stp">general/graphs.stp</a> - Graphing Disk and CPU Utilization<br>
-output: plot data, exits: user-controlled, status: production<br>
-subsystem: disk cpu, keywords: disk cpu use graph<br>
+subsystems: disk cpu, keywords: disk cpu use graph<br>
 <p>The script tracks the disk and CPU utilization. The resulting output of the script can be piped into gnuplot to generate a graph of disk and CPU USE.</p></li>
 </ul>
 <h3>DISK</h3>
 <ul>
 <li><a href="general/graphs.stp">general/graphs.stp</a> - Graphing Disk and CPU Utilization<br>
-output: plot data, exits: user-controlled, status: production<br>
-subsystem: disk cpu, keywords: disk cpu use graph<br>
+subsystems: disk cpu, keywords: disk cpu use graph<br>
 <p>The script tracks the disk and CPU utilization. The resulting output of the script can be piped into gnuplot to generate a graph of disk and CPU USE.</p></li>
 <li><a href="io/disktop.stp">io/disktop.stp</a> - Summarize Disk Read/Write Traffic<br>
-output: timed, exits: user-controlled, status: production<br>
-subsystem: disk, keywords: disk<br>
+subsystems: disk, keywords: disk<br>
 <p>Get the status of reading/writing disk every 5 seconds, output top ten entries during that period.</p></li>
 </ul>
 <h3>IO</h3>
 <ul>
 <li><a href="io/io_submit.stp">io/io_submit.stp</a> - Tally Reschedule Reason During AIO io_submit Call<br>
-output: sorted on-exit, exits: user-controlled, status: production<br>
-subsystem: io, keywords: io backtrace<br>
+subsystems: io, keywords: io backtrace<br>
 <p>When a reschedule occurs during an AIO io_submit call, accumulate the traceback in a histogram. When the script exits prints out a sorted list from most common to least common backtrace.</p></li>
 <li><a href="io/iotop.stp">io/iotop.stp</a> - Periodically Print I/O Activity by Process Name<br>
-output: timed, exits: user-controlled, status: production<br>
-subsystem: io, keywords: io<br>
+subsystems: io, keywords: io<br>
 <p>Every five seconds print out the top ten executables generating I/O traffic during that interval sorted in descending order.</p></li>
 <li><a href="io/traceio.stp">io/traceio.stp</a> - Track Cumulative I/O Activity by Process Name<br>
-output: timed, exits: user-controlled, status: production<br>
-subsystem: io, keywords: io<br>
+subsystems: io, keywords: io<br>
 <p>Every second print out the top ten executables sorted in descending order based on cumulative I/O traffic observed.</p></li>
 <li><a href="io/traceio2.stp">io/traceio2.stp</a> - Watch I/O Activity on a Particular Device<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: io, keywords: io<br>
+subsystems: io, keywords: io<br>
 <p>Print out the executable name and process number as reads and writes to the specified device occur.</p></li>
 </ul>
 <h3>KERNEL</h3>
 <ul>
 <li><a href="general/para-callgraph.stp">general/para-callgraph.stp</a> - Tracing Calls for Sections of Code<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: kernel, keywords: trace callgraph<br>
+subsystems: kernel, keywords: trace callgraph<br>
 <p>The script takes two arguments: the first argument is the function to starts/stops the per thread call graph traces and the second argument is the list of functions to generate trace information on. The script prints out a timestap for the thread, the function name and pid, followed by entry or exit symboly and function name.</p></li>
 <li><a href="process/pf2.stp">process/pf2.stp</a> - Profile kernel functions<br>
-output: sorted-list, exits: user-controlled, status: production<br>
-subsystem: kernel, keywords: profiling<br>
+subsystems: kernel, keywords: profiling<br>
 <p>The pf2.stp script sets up time-based sampling. Every five seconds it prints out a sorted list with the top ten kernel functions with samples.</p></li>
 <li><a href="profiling/functioncallcount.stp">profiling/functioncallcount.stp</a> - Count Times Functions Called<br>
-output: sorted-list on-exit, exits: user-controlled, status: production<br>
-subsystem: kernel, keywords: profiling functions<br>
+subsystems: kernel, keywords: profiling functions<br>
 <p>The functioncallcount.stp script takes one argument, a list of functions to probe. The script will run and count the number of times that each of the functions on the list is called. On exit the script will print a sorted list from most frequently to least frequently called function.</p></li>
 <li><a href="profiling/thread-times.stp">profiling/thread-times.stp</a> - Profile kernel functions<br>
-output: sorted-list, exits: user-controlled, status: production<br>
-subsystem: kernel, keywords: profiling<br>
+subsystems: kernel, keywords: profiling<br>
 <p>The thread-times.stp script sets up time-based sampling. Every five seconds it prints out a sorted list with the top twenty processes with samples broken down into percentage total time spent in user-space and kernel-space.</p></li>
 </ul>
 <h3>LOCKING</h3>
 <ul>
 <li><a href="process/futexes.stp">process/futexes.stp</a> - System-Wide Futex Contention<br>
-output: sorted-list on-exit, exits: user-controlled, status: production<br>
-subsystem: locking, keywords: syscall locking futex<br>
+subsystems: locking, keywords: syscall locking futex<br>
 <p>The script watches the futex syscall on the system. On exit the futexes address, the number of contentions, and the average time for each contention on the futex are printed from lowest pid number to highest.</p></li>
 </ul>
 <h3>NETWORK</h3>
 <ul>
 <li><a href="network/nettop.stp">network/nettop.stp</a> - Periodic Listing of Processes Using Network Interfaces<br>
-output: timed, exits: user-controlled, status: production<br>
-subsystem: network, keywords: network traffic per-process<br>
+subsystems: network, keywords: network traffic per-process<br>
 <p>Every five seconds the nettop.stp script prints out a list of processed (PID and command) with the number of packets sent/received and the amount of data sent/received by the process during that interval.</p></li>
 <li><a href="network/socket-trace.stp">network/socket-trace.stp</a> - Trace Functions called in Network Socket Code<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: network, keywords: network socket<br>
+subsystems: network, keywords: network socket<br>
 <p>The script instrument each of the functions inn the Linux kernel's net/socket.c file. The script prints out trace. The first element of a line is  time delta in microseconds from the previous entry. This is followed by the command name and the PID. The "->" and "<-" indicates function entry and  function exit, respectively. The last element of the line is the function name.</p></li>
 </ul>
 <h3>NONE</h3>
 <ul>
 <li><a href="general/helloworld.stp">general/helloworld.stp</a> - SystemTap "Hello World" Program<br>
-output: text, exits: fixed, status: production<br>
-subsystem: none, keywords: simple<br>
+subsystems: none, keywords: simple<br>
 <p>A basic "Hello World" program implemented in SystemTap script. It prints out "hello world" message and then immediately exits.</p></li>
 </ul>
 <h3>SCHEDULER</h3>
 <ul>
 <li><a href="process/sleepingBeauties.stp">process/sleepingBeauties.stp</a> - Generating Backtraces of Threads Waiting for IO Operations<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: scheduler, keywords: io scheduler<br>
+subsystems: scheduler, keywords: io scheduler<br>
 <p>The script monitor time threads spend waiting for IO operations (in "D" state) in the wait_for_completion function. If a thread spends over 10ms wall-clock time waiting, information is printed out describing the thread number and executable name. When slow the wait_for_completion function complete, backtraces for the long duration calls are printed out.</p></li>
 </ul>
 <h3>SIGNALS</h3>
 <ul>
 <li><a href="process/sig_by_pid.stp">process/sig_by_pid.stp</a> -  Signal Counts by Process ID<br>
-output: sorted-list on-exit, exits: user-controlled, status: experimental<br>
-subsystem: signals, keywords: signals<br>
+subsystems: signals, keywords: signals<br>
 <p>Print signal counts by process ID in descending order.</p></li>
 <li><a href="process/sig_by_proc.stp">process/sig_by_proc.stp</a> -  Signal Counts by Process Name<br>
-output: sorted-list on-exit, exits: user-controlled, status: experimental<br>
-subsystem: signals, keywords: signals<br>
+subsystems: signals, keywords: signals<br>
 <p>Print signal counts by process name in descending order.</p></li>
 <li><a href="process/sigkill.stp">process/sigkill.stp</a> - Track SIGKILL Signals<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: signals, keywords: signals<br>
+subsystems: signals, keywords: signals<br>
 <p>The script traces any SIGKILL signals. When that SIGKILL signal is sent to a process, the script prints out the signal name, the desination executable and process ID, the executable name user ID that sent the signal.</p></li>
 <li><a href="process/syscalls_by_pid.stp">process/syscalls_by_pid.stp</a> - System-Wide Count of Syscalls by PID<br>
-output: trace, exits: user-controlled, status: experimental<br>
-subsystem: signals, keywords: signals<br>
+subsystems: signals, keywords: signals<br>
 <p>The script watches for a particular signal sent to a specific process. When that signal is sent to the specified process, the script prints out the PID and executable of the process sending the signal, the PID and executable name of the process receiving the signal, and the signal number and name.</p></li>
 </ul>
 <h3>SYSCALL</h3>
 <ul>
 <li><a href="io/iotime.stp">io/iotime.stp</a> - Trace Time Spent in Read and Write for Files <br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall read write time io<br>
+subsystems: syscall, keywords: syscall read write time io<br>
 <p>The script watches each open, close, read, and write syscalls on the system. For each file the scripts observes opened it accumulates the amount of wall clock time spend in read and write operations and the number of bytes read and written. When a file is closed the script prints out a pair of lines for the file. Both lines begin with a timestamp in microseconds, the PID number, and the executable name in parenthesese. The first line with the "access" keyword lists the file name, the attempted number of bytes for the read and write operations. The second line with the "iotime" keyword list the file name and the number of microseconds accumulated in the read and write syscalls.</p></li>
 <li><a href="process/sleeptime.stp">process/sleeptime.stp</a> - Trace Time Spent in nanosleep Syscalls<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall sleep<br>
+subsystems: syscall, keywords: syscall sleep<br>
 <p>The script watches each nanosleep syscall on the system. At the end of each nanosleep syscall the script prints out a line with a timestamp in microseconds, the pid, the executable name in paretheses, the "nanosleep:" key, and the duration of the sleep in microseconds.</p></li>
 <li><a href="process/syscalls_by_pid.stp">process/syscalls_by_pid.stp</a> - System-Wide Count of Syscalls by PID<br>
-output: sorted-list on-exit, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall<br>
+subsystems: syscall, keywords: syscall<br>
 <p>The script watches all syscall on the system. On exit the script prints a list showing the number of systemcalls executed by each PID ordered from greatest to least number of syscalls.</p></li>
 <li><a href="process/syscalls_by_proc.stp">process/syscalls_by_proc.stp</a> - System-Wide Count of Syscalls by Executable<br>
-output: sorted-list on-exit, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall<br>
+subsystems: syscall, keywords: syscall<br>
 <p>The script watches all syscall on the system. On exit the script prints a list showing the number of systemcalls executed by each executable ordered from greates to least number of syscalls.</p></li>
 <li><a href="process/wait4time.stp">process/wait4time.stp</a> - Trace Time Spent in wait4 Syscalls<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall wait4<br>
+subsystems: syscall, keywords: syscall wait4<br>
 <p>The script watches each wait4 syscall on the system. At the end of each wait4 syscall the script prints out a line with a timestamp in microseconds, the pid, the executable name in paretheses, the "wait4:" key, the duration of the wait and the PID that the wait4 was waiting for. If the waited for PID is not specified , it is "-1".</p></li>
 </ul>
        	</td>
diff --git a/testsuite/systemtap.examples/subsystem-index.txt b/testsuite/systemtap.examples/subsystem-index.txt
index 9f83a544..98e75e98 100644
--- a/testsuite/systemtap.examples/subsystem-index.txt
+++ b/testsuite/systemtap.examples/subsystem-index.txt
@@ -4,8 +4,7 @@ SYSTEMTAP EXAMPLES INDEX BY SUBSYSTEM
 = CPU =
 
 general/graphs.stp - Graphing Disk and CPU Utilization
-output: plot data, exits: user-controlled, status: production
-subsystem: disk cpu, keywords: disk cpu use graph
+subsystems: disk cpu, keywords: disk cpu use graph
 
   The script tracks the disk and CPU utilization. The resulting output
   of the script can be piped into gnuplot to generate a graph of disk
@@ -15,8 +14,7 @@ subsystem: disk cpu, keywords: disk cpu use graph
 = DISK =
 
 general/graphs.stp - Graphing Disk and CPU Utilization
-output: plot data, exits: user-controlled, status: production
-subsystem: disk cpu, keywords: disk cpu use graph
+subsystems: disk cpu, keywords: disk cpu use graph
 
   The script tracks the disk and CPU utilization. The resulting output
   of the script can be piped into gnuplot to generate a graph of disk
@@ -24,8 +22,7 @@ subsystem: disk cpu, keywords: disk cpu use graph
 
 
 io/disktop.stp - Summarize Disk Read/Write Traffic
-output: timed, exits: user-controlled, status: production
-subsystem: disk, keywords: disk
+subsystems: disk, keywords: disk
 
   Get the status of reading/writing disk every 5 seconds, output top
   ten entries during that period.
@@ -34,8 +31,7 @@ subsystem: disk, keywords: disk
 = IO =
 
 io/io_submit.stp - Tally Reschedule Reason During AIO io_submit Call
-output: sorted on-exit, exits: user-controlled, status: production
-subsystem: io, keywords: io backtrace
+subsystems: io, keywords: io backtrace
 
   When a reschedule occurs during an AIO io_submit call, accumulate the
   traceback in a histogram. When the script exits prints out a sorted
@@ -43,24 +39,21 @@ subsystem: io, keywords: io backtrace
 
 
 io/iotop.stp - Periodically Print I/O Activity by Process Name
-output: timed, exits: user-controlled, status: production
-subsystem: io, keywords: io
+subsystems: io, keywords: io
 
   Every five seconds print out the top ten executables generating I/O
   traffic during that interval sorted in descending order.
 
 
 io/traceio.stp - Track Cumulative I/O Activity by Process Name
-output: timed, exits: user-controlled, status: production
-subsystem: io, keywords: io
+subsystems: io, keywords: io
 
   Every second print out the top ten executables sorted in descending
   order based on cumulative I/O traffic observed.
 
 
 io/traceio2.stp - Watch I/O Activity on a Particular Device
-output: trace, exits: user-controlled, status: production
-subsystem: io, keywords: io
+subsystems: io, keywords: io
 
   Print out the executable name and process number as reads and writes
   to the specified device occur.
@@ -69,8 +62,7 @@ subsystem: io, keywords: io
 = KERNEL =
 
 general/para-callgraph.stp - Tracing Calls for Sections of Code
-output: trace, exits: user-controlled, status: production
-subsystem: kernel, keywords: trace callgraph
+subsystems: kernel, keywords: trace callgraph
 
   The script takes two arguments: the first argument is the function to
   starts/stops the per thread call graph traces and the second argument
@@ -80,8 +72,7 @@ subsystem: kernel, keywords: trace callgraph
 
 
 process/pf2.stp - Profile kernel functions
-output: sorted-list, exits: user-controlled, status: production
-subsystem: kernel, keywords: profiling
+subsystems: kernel, keywords: profiling
 
   The pf2.stp script sets up time-based sampling. Every five seconds it
   prints out a sorted list with the top ten kernel functions with
@@ -89,8 +80,7 @@ subsystem: kernel, keywords: profiling
 
 
 profiling/functioncallcount.stp - Count Times Functions Called
-output: sorted-list on-exit, exits: user-controlled, status: production
-subsystem: kernel, keywords: profiling functions
+subsystems: kernel, keywords: profiling functions
 
   The functioncallcount.stp script takes one argument, a list of
   functions to probe. The script will run and count the number of times
@@ -100,8 +90,7 @@ subsystem: kernel, keywords: profiling functions
 
 
 profiling/thread-times.stp - Profile kernel functions
-output: sorted-list, exits: user-controlled, status: production
-subsystem: kernel, keywords: profiling
+subsystems: kernel, keywords: profiling
 
   The thread-times.stp script sets up time-based sampling. Every five
   seconds it prints out a sorted list with the top twenty processes
@@ -112,8 +101,7 @@ subsystem: kernel, keywords: profiling
 = LOCKING =
 
 process/futexes.stp - System-Wide Futex Contention
-output: sorted-list on-exit, exits: user-controlled, status: production
-subsystem: locking, keywords: syscall locking futex
+subsystems: locking, keywords: syscall locking futex
 
   The script watches the futex syscall on the system. On exit the
   futexes address, the number of contentions, and the average time for
@@ -124,8 +112,7 @@ subsystem: locking, keywords: syscall locking futex
 = NETWORK =
 
 network/nettop.stp - Periodic Listing of Processes Using Network Interfaces
-output: timed, exits: user-controlled, status: production
-subsystem: network, keywords: network traffic per-process
+subsystems: network, keywords: network traffic per-process
 
   Every five seconds the nettop.stp script prints out a list of
   processed (PID and command) with the number of packets sent/received
@@ -134,8 +121,7 @@ subsystem: network, keywords: network traffic per-process
 
 
 network/socket-trace.stp - Trace Functions called in Network Socket Code
-output: trace, exits: user-controlled, status: production
-subsystem: network, keywords: network socket
+subsystems: network, keywords: network socket
 
   The script instrument each of the functions inn the Linux kernel's
   net/socket.c file. The script prints out trace. The first element of
@@ -148,8 +134,7 @@ subsystem: network, keywords: network socket
 = NONE =
 
 general/helloworld.stp - SystemTap "Hello World" Program
-output: text, exits: fixed, status: production
-subsystem: none, keywords: simple
+subsystems: none, keywords: simple
 
   A basic "Hello World" program implemented in SystemTap script. It
   prints out "hello world" message and then immediately exits.
@@ -158,8 +143,7 @@ subsystem: none, keywords: simple
 = SCHEDULER =
 
 process/sleepingBeauties.stp - Generating Backtraces of Threads Waiting for IO Operations
-output: trace, exits: user-controlled, status: production
-subsystem: scheduler, keywords: io scheduler
+subsystems: scheduler, keywords: io scheduler
 
   The script monitor time threads spend waiting for IO operations (in
   "D" state) in the wait_for_completion function. If a thread spends
@@ -172,22 +156,19 @@ subsystem: scheduler, keywords: io scheduler
 = SIGNALS =
 
 process/sig_by_pid.stp -  Signal Counts by Process ID
-output: sorted-list on-exit, exits: user-controlled, status: experimental
-subsystem: signals, keywords: signals
+subsystems: signals, keywords: signals
 
   Print signal counts by process ID in descending order.
 
 
 process/sig_by_proc.stp -  Signal Counts by Process Name
-output: sorted-list on-exit, exits: user-controlled, status: experimental
-subsystem: signals, keywords: signals
+subsystems: signals, keywords: signals
 
   Print signal counts by process name in descending order.
 
 
 process/sigkill.stp - Track SIGKILL Signals
-output: trace, exits: user-controlled, status: production
-subsystem: signals, keywords: signals
+subsystems: signals, keywords: signals
 
   The script traces any SIGKILL signals. When that SIGKILL signal is
   sent to a process, the script prints out the signal name, the
@@ -196,8 +177,7 @@ subsystem: signals, keywords: signals
 
 
 process/syscalls_by_pid.stp - System-Wide Count of Syscalls by PID
-output: trace, exits: user-controlled, status: experimental
-subsystem: signals, keywords: signals
+subsystems: signals, keywords: signals
 
   The script watches for a particular signal sent to a specific
   process. When that signal is sent to the specified process, the
@@ -209,8 +189,7 @@ subsystem: signals, keywords: signals
 = SYSCALL =
 
 io/iotime.stp - Trace Time Spent in Read and Write for Files 
-output: trace, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall read write time io
+subsystems: syscall, keywords: syscall read write time io
 
   The script watches each open, close, read, and write syscalls on the
   system. For each file the scripts observes opened it accumulates the
@@ -226,8 +205,7 @@ subsystem: syscall, keywords: syscall read write time io
 
 
 process/sleeptime.stp - Trace Time Spent in nanosleep Syscalls
-output: trace, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall sleep
+subsystems: syscall, keywords: syscall sleep
 
   The script watches each nanosleep syscall on the system. At the end
   of each nanosleep syscall the script prints out a line with a
@@ -237,8 +215,7 @@ subsystem: syscall, keywords: syscall sleep
 
 
 process/syscalls_by_pid.stp - System-Wide Count of Syscalls by PID
-output: sorted-list on-exit, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall
+subsystems: syscall, keywords: syscall
 
   The script watches all syscall on the system. On exit the script
   prints a list showing the number of systemcalls executed by each PID
@@ -246,8 +223,7 @@ subsystem: syscall, keywords: syscall
 
 
 process/syscalls_by_proc.stp - System-Wide Count of Syscalls by Executable
-output: sorted-list on-exit, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall
+subsystems: syscall, keywords: syscall
 
   The script watches all syscall on the system. On exit the script
   prints a list showing the number of systemcalls executed by each
@@ -255,8 +231,7 @@ subsystem: syscall, keywords: syscall
 
 
 process/wait4time.stp - Trace Time Spent in wait4 Syscalls
-output: trace, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall wait4
+subsystems: syscall, keywords: syscall wait4
 
   The script watches each wait4 syscall on the system. At the end of
   each wait4 syscall the script prints out a line with a timestamp in