Merge commit 'origin/master' into pr4225

* commit 'origin/master':
  Use relative instead of absolute line. (bug 6611)
  move post-0.7 news tidbit to the top
  Add test for $$vars, $$params, $$locals.
  typographical tweaks for embedded script code
  Add $$vars, $$parms, $$locals
  Rename $path to $pathname of syscall tapset for 2.6.27
  Correct several tests for 2.6.27
  c code generation: assert C indentation/nesting cancels out at appropriate points
  Tweak test_installcheck for helloworld.meta and traceio2.meta.
  Run both tests for installcheck tests.
  No need for random suffix file cmdline and sysinfo files in the
  Ensure that a systemtap server is available if 'server' is specified
  session.h (struct systemtap_session): Added itrace_derived_probe
  * syscalls2.stp: Add sys_unlinkat.
  Fix on_each_cpu() call for kernels >2.6.26.
  Remove unused STAPCONF_MODULE_NSECTIONS

1 files changed, 12 insertions, 1 deletions

diff --git a/doc/langref.tex b/doc/langref.tex
index e2c630d4..413ece4d 100644
--- a/doc/langref.tex
+++ b/doc/langref.tex
@@ -771,7 +771,7 @@ pointers, and arrays.
 \texttt{\$var} refers to an in-scope variable var. If it is a type similar
 to an integer, it will be cast to a 64-bit integer for script use. Pointers
 similar to a string (char {*}) are copied to SystemTap string values by the
-kernel\_string() or user\_string functions().
+\texttt{kernel\_string()} or \texttt{user\_string()} functions.
 
 \texttt{\$var->field} traverses a structure's field. The indirection operator
 may be repeated to follow additional levels of pointers.
@@ -779,6 +779,17 @@ may be repeated to follow additional levels of pointers.
 \texttt{\$var{[}N]} indexes into an array. The index is given with a literal
 number.
 
+\texttt{\$\$vars} expands to a character string that is equivalent to
+\texttt{sprintf("parm1=\%x ... parmN=\%x var1=\%x ... varN=\%x", \$parm1, ..., \$parmN,
+\$var1, ..., \$varN)}
+
+\texttt{\$\$locals} expands to a character string that is equivalent to
+\texttt{sprintf("var1=\%x ... varN=\%x", \$var1, ..., \$varN)}
+
+\texttt{\$\$parms} expands to a character string that is equivalent to
+\texttt{sprintf("parm1=\%x ... parmN=\%x", \$parm1, ..., \$parmN)}
+
+
 \subsubsection{kernel.function, module().function}
 \index{kernel.function}
 \index{module().function}