Merge commit 'v2.6.34-rc7' into tracing/core

[safe/jmp/linux-2.6] / Documentation / trace / events.txt

diff --git a/Documentation/trace/events.txt b/Documentation/trace/events.txt
index 78c45a8..778ddf3 100644 (file)
--- a/Documentation/trace/events.txt
+++ b/Documentation/trace/events.txt
@@ -72,7 +72,7 @@ To enable all events in sched subsystem:
 
        # echo 1 > /sys/kernel/debug/tracing/events/sched/enable
 
-To eanble all events:
+To enable all events:
 
        # echo 1 > /sys/kernel/debug/tracing/events/enable
 
@@ -90,7 +90,8 @@ In order to facilitate early boot debugging, use boot option:
 
        trace_event=[event-list]
 
-The format of this boot option is the same as described in section 2.1.
+event-list is a comma separated list of events. See section 2.1 for event
+format.
 
 3. Defining an event-enabled tracepoint
 =======================================