--- wikisrc/templates/page.tmpl	2010/06/28 08:47:42	1.6
+++ wikisrc/templates/page.tmpl	2010/07/01 01:49:35	1.7
@@ -93,18 +93,19 @@
 </TMPL_IF>
 
 <div id="content">
-<TMPL_UNLESS NAME="DISCUSSIONLINK">
-This is a discussion page. Its contents have not been vetted by developers.<br />
-</TMPL_UNLESS>
 <TMPL_VAR CONTENT>
 </div>
 
-<TMPL_IF COMMENTS>
 <div id="comments">
-<hr>
+<hr />
 <TMPL_IF NAME="COMMENTEDITURL">
 <a href="<TMPL_VAR COMMENTEDITURL>" rel="nofollow">Edit</a><br />
+<TMPL_ELSE>
+<TMPL_IF NAME="DISCUSSIONLINK">
+<TMPL_VAR DISCUSSIONLINK><br />
 </TMPL_IF>
+</TMPL_IF>
+<TMPL_IF COMMENTS>
 <TMPL_VAR COMMENTS>
 <TMPL_IF ADDCOMMENTURL>
 <div class="addcomment">
@@ -124,10 +125,6 @@ This is a discussion page. Its contents 
 
 		      <TMPL_IF NAME="COMMENTSLINK">
 			<li><TMPL_VAR COMMENTSLINK><br /></li>
-			  <TMPL_ELSE>
-			    <TMPL_IF NAME="DISCUSSIONLINK">
-			      <TMPL_VAR DISCUSSIONLINK><br />
-			      </TMPL_IF>
 			    </TMPL_IF>
 
 <TMPL_IF NAME="TAGS">