strace.1.in: try to be more clear with -e trace=class deprecation notice

It was reported that the current way of labelling of the percent-less
-e trace=class syntax variant may be confusing, as it can be read
as deprecation of the whole option and not specific syntax; try to be
more clear by moving the deprecation notices into the option
descriptions.

* strace.1.in (.SS Filtering): Move the deprecation notice
of -e trace={file,process,network,signal,ipc,desc,memory} syntax
to the descriptions of the respective options.

Reported-by: Alexey Gladkov <gladkov.alexey@gmail.com>

diff --git a/strace.1.in b/strace.1.in
index 3ac46bacc18852cd2b04c15bee5e3d74f3e11034..78bbc628e3a607965b321523b91e33fe80388a92 100644 (file)
--- a/strace.1.in
+++ b/strace.1.in
@@ -426,7 +426,7 @@ Extended Regular Expression syntax (see
 .TP
 .BR "\-e\ trace" = %file
 .TQ
-.BR "\-e\ trace" = file " (deprecated)"
+.BR "\-e\ trace" = file
 Trace all system calls which take a file name as an argument.  You
 can think of this as an abbreviation for
 .BR "\-e\ trace" = open , stat , chmod , unlink ,...
@@ -435,39 +435,60 @@ Furthermore, using the abbreviation will ensure that you don't
 accidentally forget to include a call like
 .BR lstat (2)
 in the list.  Betchya woulda forgot that one.
+The syntax without a preceding percent sign
+.RB (\[dq] "-e trace" = file \[dq])
+is deprecated.
 .TP
 .BR "\-e\ trace" = %process
 .TQ
-.BR "\-e\ trace" = process " (deprecated)"
+.BR "\-e\ trace" = process
 Trace all system calls which involve process management.  This
 is useful for watching the fork, wait, and exec steps of a process.
+The syntax without a preceding percent sign
+.RB (\[dq] "-e trace" = process \[dq])
+is deprecated.
 .TP
 .BR "\-e\ trace" = %net
 .TQ
 .BR "\-e\ trace" = %network
 .TQ
-.BR "\-e\ trace" = network " (deprecated)"
+.BR "\-e\ trace" = network
 Trace all the network related system calls.
+The syntax without a preceding percent sign
+.RB (\[dq] "-e trace" = network \[dq])
+is deprecated.
 .TP
 .BR "\-e\ trace" = %signal
 .TQ
-.BR "\-e\ trace" = signal " (deprecated)"
+.BR "\-e\ trace" = signal
 Trace all signal related system calls.
+The syntax without a preceding percent sign
+.RB (\[dq] "-e trace" = signal \[dq])
+is deprecated.
 .TP
 .BR "\-e\ trace" = %ipc
 .TQ
-.BR "\-e\ trace" = ipc " (deprecated)"
+.BR "\-e\ trace" = ipc
 Trace all IPC related system calls.
+The syntax without a preceding percent sign
+.RB (\[dq] "-e trace" = ipc \[dq])
+is deprecated.
 .TP
 .BR "\-e\ trace" = %desc
 .TQ
-.BR "\-e\ trace" = desc " (deprecated)"
+.BR "\-e\ trace" = desc
 Trace all file descriptor related system calls.
+The syntax without a preceding percent sign
+.RB (\[dq] "-e trace" = desc \[dq])
+is deprecated.
 .TP
 .BR "\-e\ trace" = %memory
 .TQ
-.BR "\-e\ trace" = memory " (deprecated)"
+.BR "\-e\ trace" = memory
 Trace all memory mapping related system calls.
+The syntax without a preceding percent sign
+.RB (\[dq] "-e trace" = memory \[dq])
+is deprecated.
 .TP
 .BR "\-e\ trace" = %stat
 Trace stat syscall variants.