Merge commit 'origin/master' into pr4225

* commit 'origin/master':
  PR5686: correct regression in semok/optimize.stp
  trailing whitespace removal, as approved by emacs
  fix global-var array index rendering
  fix NEWS to refer to simpler context.stp tapset functions in auto-printing blurb
  Document written but unread global variable automatic display.
  2nd try
  initial
  Make _get_sock_addr return correct address in kernel before 2.6.16.
  Automatically print written but unread globals
  Make nodwf test passed when CONFIG_QUOTACTL unset
  Uses STAPCONF_DPATH_PATH instead of a kernel version check.
  Simplified "rpm" target a bit.
  Moved tar archive creation step from "rpm" target to "dist-gzip" target.
  remove support for "make dist" since git-archive does as well;
  Examples html files moved into subdir.
  2008-08-25  David Smith  <dsmith@redhat.com>
  ChangeLog Entries
  Robustness improvements for the stap client/server

6 files changed, 29 insertions, 6 deletions

diff --git a/doc/BeginnersGuide/Makefile b/doc/BeginnersGuide/Makefile
new file mode 100644
index 00000000..cf9d6bc3
--- /dev/null
+++ b/doc/BeginnersGuide/Makefile
@@ -0,0 +1,13 @@
+#Makefile for SystemTap_Beginners_Guide
+
+XML_LANG	= en-US
+DOCNAME		= SystemTap_Beginners_Guide
+PRODUCT	= Red_Hat_Enterprise_Linux
+BRAND	= RedHat
+
+#OTHER_LANGS	= as-IN bn-IN de-DE es-ES fr-FR gu-IN hi-IN it-IT ja-JP kn-IN ko-KR ml-IN mr-IN or-IN pa-IN pt-BR ru-RU si-LK ta-IN te-IN zh-CN zh-TW
+TRANSLATIONS	= $(XML_LANG) $(OTHER_LANGS)
+
+COMMON_CONFIG  = /usr/share/publican
+include $(COMMON_CONFIG)/make/Makefile.common
+
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 405dec3f..d28b588d 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,4 +1,13 @@
-2008-07-14    <brolley@redhat.com>
+2008-08-28  Stan Cox  <scox@redhat.com>
+
+	* langref.tex: Document written but unread global variable display.
+
+2008-08-25  Frank Ch. Eigler  <fche@elastic.org>
+
+	* Makefile.am: Removed dist-related targets and macros.
+	* Makefile.in: Regenerated.
+
+2008-07-14  Dave Brolley  <brolley@redhat.com>
 
 	* Makefile.in: Regenerated.
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index e4bc3800..fb228897 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -38,4 +38,3 @@ SUFFIXES = ps pdf dvi ps tex
 	latex -output-directory=$$pwd $<; \
 	latex -output-directory=$$pwd $<
 
-EXTRA_DIST = tutorial.tex langref.tex tutorial nomencl.sty
diff --git a/doc/Makefile.in b/doc/Makefile.in
index e01c5ebf..47b6d85b 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -152,7 +152,6 @@ top_srcdir = @top_srcdir@
 PDF_FILES = tutorial.pdf langref.pdf
 DOC_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap
 SUFFIXES = ps pdf dvi ps tex
-EXTRA_DIST = tutorial.tex langref.tex tutorial nomencl.sty
 all: all-am
 
 .SUFFIXES:
diff --git a/doc/langref.tex b/doc/langref.tex
index 413ece4d..5db82550 100644
--- a/doc/langref.tex
+++ b/doc/langref.tex
@@ -495,7 +495,9 @@ found. Because of possible concurrency limits, such as multiple probe handlers,
 each global variable used by a probe is automatically read- or write-locked
 while the handler is running. A global declaration may be written at the
 outermost level anywhere in a script file, not just within a block of code.
-The following declaration marks \texttt{var1} and \texttt{var2} as global.
+Global variables which are written but never read will be displayed
+automatically at session shutdown.  The following declaration marks 
+\texttt{var1} and \texttt{var2} as global.
 The translator will infer a value type for each, and if the variable is used
 as an array, its key types.
 
diff --git a/doc/test b/doc/test
new file mode 100644
index 00000000..eefc69f7
--- /dev/null
+++ b/doc/test
@@ -0,0 +1 @@
+Thu Aug 28 23:10:00 EST 2008