From 6089c1d52c986d92bceb23018f6bbb2337a90e52 Mon Sep 17 00:00:00 2001
From: Wenzel Jakob <wenzel@cs.cornell.edu>
Date: Fri, 13 Apr 2012 14:15:23 -0400
Subject: [PATCH] documentation updates

---
 doc/basics.tex           | 2 +-
 doc/introduction.tex     | 2 +-
 doc/main.tex             | 1 +
 src/shapes/disk.cpp      | 2 +-
 src/shapes/rectangle.cpp | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/basics.tex b/doc/basics.tex
index ca082d74..59ea4e09 100644
--- a/doc/basics.tex
+++ b/doc/basics.tex
@@ -18,7 +18,7 @@ the executable without parameters:
 $\texttt{\$}$ mitsuba 
 \end{shell}
 \begin{console}[label=lst:mitsuba-cli,caption=Command line options of the \texttt{mitsuba} binary]
-Mitsuba version 0.3.0, Copyright (c) 2011 Wenzel Jakob
+Mitsuba version $\texttt{\MitsubaVersion}$, Copyright (c) $\texttt{\MitsubaYear}$ Wenzel Jakob
 Usage: mitsuba [options] <One or more scene XML files>
 Options/Arguments:
    -h          Display this help text
diff --git a/doc/introduction.tex b/doc/introduction.tex
index 23db0ff0..113fa43d 100644
--- a/doc/introduction.tex
+++ b/doc/introduction.tex
@@ -73,6 +73,6 @@ Public License (Version 3) as provided by the Free Software Foundation.
 \remarks{
 	\item Being a ``viral'' license, the GPL automatically applies to all
 	derivative work. Amongst other things, this means that without express
-	permission, Mitsuba's source code is \emph{absolutely off-limits} to companies that
+	permission, Mitsuba's source code is \emph{off-limits} to companies that
 	develop rendering software not distributed under a compatible license.
 }
diff --git a/doc/main.tex b/doc/main.tex
index cb42b53d..136161ce 100644
--- a/doc/main.tex
+++ b/doc/main.tex
@@ -37,6 +37,7 @@
 \setcounter{tocdepth}{3}
 
 \newcommand{\MitsubaVersion}{0.3.1}
+\newcommand{\MitsubaYear}{2012}
 
 \typearea[current]{last}
 \raggedbottom
diff --git a/src/shapes/disk.cpp b/src/shapes/disk.cpp
index 8504c7e9..a1308b68 100644
--- a/src/shapes/disk.cpp
+++ b/src/shapes/disk.cpp
@@ -54,7 +54,7 @@ MTS_NAMESPACE_BEGIN
  * \code{toWorld} parameter.
  *
  * \begin{xml}[caption={A simple example involving two disk instances}, label=lst:disk]
- * <scene version="0.3.0">
+ * <scene version=$\MtsVer$>
  *     <shape type="disk">
  *         <bsdf type="diffuse">
  *             <texture name="reflectance" type="checkerboard">
diff --git a/src/shapes/rectangle.cpp b/src/shapes/rectangle.cpp
index 4a59edb4..1ebf5f8f 100644
--- a/src/shapes/rectangle.cpp
+++ b/src/shapes/rectangle.cpp
@@ -55,7 +55,7 @@ MTS_NAMESPACE_BEGIN
  *
  * \vspace{2mm}
  * \begin{xml}[caption={A simple example involving two rectangle instances}, label=lst:rectangle]
- * <scene version="0.3.0">
+ * <scene version=$\MtsVer$>
  *     <shape type="rectangle">
  *         <bsdf type="diffuse"/>
  *     </shape>