From 8cff1e1cfd7f9d683afd1011e5e0921457d49157 Mon Sep 17 00:00:00 2001
From: Tom Henderson <tomh@tomh.org>
Date: Tue, 22 Sep 2009 20:54:05 -0700
Subject: [PATCH] Manual formatting fixes

---
 doc/manual/Makefile    | 15 +++++++++------
 doc/manual/manual.texi |  6 ++++++
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/doc/manual/Makefile b/doc/manual/Makefile
index c8c46674c..2f27bfb86 100644
--- a/doc/manual/Makefile
+++ b/doc/manual/Makefile
@@ -54,20 +54,23 @@ CHAPTERS = \
 %.png : %.dia; $(DIA) -t png $< -e $@
 %.pdf : %.eps; $(EPSTOPDF) $< -o=$@
 
-all:  $(IMAGES) manual.pdf manual.html manual/manual.html
+all:  $(IMAGES) version manual.pdf manual.html manual/manual.html
 
-manual.pdf: $(IMAGES) $(CHAPTERS)
+manual.pdf: version $(IMAGES) $(CHAPTERS)
 	$(TEXI2PDF) manual.texi
 
-manual.html: $(IMAGES) $(CHAPTERS)
+manual.html: version $(IMAGES) $(CHAPTERS)
 	$(TEXI2HTML) ${CSS} manual.texi
 
-manual/manual.html: $(IMAGES) $(CHAPTERS)
+manual/manual.html: version $(IMAGES) $(CHAPTERS)
 	$(TEXI2HTML) ${CSS} ${SPLIT} manual.texi
 
 figures-clean:
 	rm -rf $(IMAGES)
 
+version:
+	echo -n "ns-" > VERSION-PREFIX; cat VERSION-PREFIX ../../VERSION > VERSION; rm -rf VERSION-PREFIX
+
 clean: 	figures-clean
-	rm -rf manual.aux manual.cp manual.cps manual.fn manual.ky manual.pg 
-	rm -rf manual.tp manual.vr manual.toc manual.log manual.pdf manual.html manual/ 
+	rm -rf manual.aux manual.cp manual.cps manual.fn manual.ky manual.pg manual.tp
+	rm -rf manual.vr manual.toc manual.log manual.pdf manual.html manual/ VERSION 
diff --git a/doc/manual/manual.texi b/doc/manual/manual.texi
index 6899029b3..2029549e3 100644
--- a/doc/manual/manual.texi
+++ b/doc/manual/manual.texi
@@ -56,6 +56,9 @@ along with this program.  If not, see @uref{http://www.gnu.org/licenses/}.
 @title ns-3 Reference Manual
 @author ns-3 project
 @author feedback:  ns-developers@@isi.edu
+
+@b{Simulator version:  }
+@include VERSION
 @today{}
 
 @c @page
@@ -76,6 +79,9 @@ along with this program.  If not, see @uref{http://www.gnu.org/licenses/}.
 For a pdf version of this manual, 
 see @uref{http://www.nsnam.org/docs/manual.pdf}.
 
+Simulator version:  
+@include VERSION
+
 @insertcopying
 @end ifnottex