Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
===================================================================
diff -u -r51ab92ac37624b5c280cbd5f3ae8e3972b8540ff -rb8a78e01ff94d1b8c0e405d88d45d1ba444c400c
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java	(.../WikiService.java)	(revision 51ab92ac37624b5c280cbd5f3ae8e3972b8540ff)
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java	(.../WikiService.java)	(revision b8a78e01ff94d1b8c0e405d88d45d1ba444c400c)
@@ -912,6 +912,7 @@
 	    	toolContentObj.setAllowAnonym(Boolean.FALSE);
 	    	toolContentObj.setAllowEdit(Boolean.TRUE); // this is the default value
 	    	toolContentObj.setAllowNewTopic(Boolean.TRUE);
+	    	toolContentObj.setAllowNewWikiPage(Boolean.TRUE);
 	    	//toolContentObj.setAllowRichEditor(Boolean.FALSE);
 	    	toolContentObj.setAllowUpload(Boolean.TRUE); // this is the default value
 	    	toolContentObj.setContentId(toolContentId);
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java
===================================================================
diff -u -r51ab92ac37624b5c280cbd5f3ae8e3972b8540ff -rb8a78e01ff94d1b8c0e405d88d45d1ba444c400c
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java	(.../WikiConstants.java)	(revision 51ab92ac37624b5c280cbd5f3ae8e3972b8540ff)
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java	(.../WikiConstants.java)	(revision b8a78e01ff94d1b8c0e405d88d45d1ba444c400c)
@@ -62,6 +62,7 @@
 	public static final String ATTR_ALLOW_EDIT = "allowEdit";
 	public static final String ATTR_ALLOW_UPLOAD = "allowUpload";
 	public static final String ATTR_ALLOW_NEW_TOPICS = "allowNewTopics";
+	public static final String ATTR_ALLOW_NEW_WIKI_PAGES = "allowNewWikiPages";
 	public static final String ATTR_ALLOW_RICH_EDITOR = "allowRichEditor";
 	public static final String ATTR_LIMITED_CHARS = "limitedChars";
 
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java
===================================================================
diff -u -r51ab92ac37624b5c280cbd5f3ae8e3972b8540ff -rb8a78e01ff94d1b8c0e405d88d45d1ba444c400c
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 51ab92ac37624b5c280cbd5f3ae8e3972b8540ff)
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision b8a78e01ff94d1b8c0e405d88d45d1ba444c400c)
@@ -907,21 +907,21 @@
 //				ActionMessage error = new ActionMessage("error.title.empty");
 //				errors.add(ActionMessages.GLOBAL_MESSAGE, error);
 //			}
-			boolean allowNewTopic = form.getWiki().isAllowNewTopic();
+			boolean allowNewWikiPage = form.getWiki().isAllowNewWikiPage();
 //			define it later mode(TEACHER): need read out AllowNewTopic flag rather than get from HTML form
 			//becuase defineLater does not include this field
 			if(StringUtils.equals(modeStr, ToolAccessMode.TEACHER.toString())){
 				wikiService = getWikiManager();
 				Wiki wikiPO = wikiService.getWikiByContentId(form.getToolContentID());
 				if(wikiPO != null)
-					allowNewTopic = wikiPO.isAllowNewTopic();
+					allowNewWikiPage = wikiPO.isAllowNewWikiPage();
 				else{
 					//failure tolerance
 					log.error("ERROR: Can not found Wiki by toolContentID:"+ form.getToolContentID());
-					allowNewTopic = true;
+					allowNewWikiPage = true;
 				}
 			}
-			if(!allowNewTopic){
+			if(!allowNewWikiPage){
 				List topics = getTopicList(sessionMap);
 				if(topics.size() == 0){
 					ActionMessage error = new ActionMessage("error.must.have.topic");
@@ -938,7 +938,7 @@
 					errors.add(ActionMessages.GLOBAL_MESSAGE, error);
 				}
 			}*/
-			if(!form.getWiki().isAllowNewTopic()){
+			if(!form.getWiki().isAllowNewWikiPage()){
 				if(form.getWiki().getMaximumReply() !=0 
 						&& (form.getWiki().getMaximumReply() < form.getWiki().getMinimumReply())){
 					ActionMessage error = new ActionMessage("error.min.less.max");
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java
===================================================================
diff -u -r51ab92ac37624b5c280cbd5f3ae8e3972b8540ff -rb8a78e01ff94d1b8c0e405d88d45d1ba444c400c
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 51ab92ac37624b5c280cbd5f3ae8e3972b8540ff)
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java	(.../LearningAction.java)	(revision b8a78e01ff94d1b8c0e405d88d45d1ba444c400c)
@@ -231,7 +231,8 @@
 		sessionMap.put(WikiConstants.ATTR_USER_FINISHED, wikiUser.isSessionFinished());
 		sessionMap.put(WikiConstants.ATTR_ALLOW_EDIT, wiki.isAllowEdit());
 		sessionMap.put(WikiConstants.ATTR_ALLOW_UPLOAD,wiki.isAllowUpload());
-		sessionMap.put(WikiConstants.ATTR_ALLOW_NEW_TOPICS,wiki.isAllowNewTopic());
+		//sessionMap.put(WikiConstants.ATTR_ALLOW_NEW_TOPICS,wiki.isAllowNewTopic());
+		sessionMap.put(WikiConstants.ATTR_ALLOW_NEW_TOPICS,wiki.isAllowNewWikiPage());
 		sessionMap.put(WikiConstants.ATTR_ALLOW_RICH_EDITOR,allowRichEditor);
 		sessionMap.put(WikiConstants.ATTR_LIMITED_CHARS,new Integer(allowNumber));
 		sessionMap.put(WikiConstants.ATTR_REFLECTION_ON,wiki.isReflectOnActivity());
@@ -562,7 +563,7 @@
 		WikiToolSession session = wikiService.getSessionBySessionId(sessionId);
 		Wiki wiki = session.getWiki();
 		if(wiki != null){
-			if(!wiki.isAllowNewTopic()){
+			if(!wiki.isAllowNewWikiPage()){
 				int posts = wikiService.getTopicsNum(wikiUser.getUserId(), sessionId);
 				if(wiki.getMaximumReply() != 0 && (posts >= wiki.getMaximumReply()))
 					sessionMap.put(WikiConstants.ATTR_NO_MORE_POSTS, Boolean.TRUE);
@@ -752,7 +753,7 @@
 		HttpSession ss = SessionManager.getSession();
 		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
 		Long userID = new Long(user.getUserID().longValue());
-		if(!wiki.getRunOffline() && !wiki.isAllowNewTopic()){
+		if(!wiki.getRunOffline() && !wiki.isAllowNewWikiPage()){
 			int postNum = wikiService.getTopicsNum(userID,sessionId);
 			if(postNum < wiki.getMinimumReply()){
 				//create error
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiForm.java
===================================================================
diff -u -r51ab92ac37624b5c280cbd5f3ae8e3972b8540ff -rb8a78e01ff94d1b8c0e405d88d45d1ba444c400c
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiForm.java	(.../WikiForm.java)	(revision 51ab92ac37624b5c280cbd5f3ae8e3972b8540ff)
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiForm.java	(.../WikiForm.java)	(revision b8a78e01ff94d1b8c0e405d88d45d1ba444c400c)
@@ -117,6 +117,7 @@
     	wiki.setLimitedInput(false);
     	wiki.setLockWhenFinished(false);
     	wiki.setAllowNewTopic(false);
+    	wiki.setAllowNewWikiPage(false);
     	wiki.setAllowUpload(false);
     	wiki.setReflectOnActivity(false);
     }
Index: lams_tool_wiki_orig/web/jsps/authoring/advance.jsp
===================================================================
diff -u -r0051b0f50069e8e8ba6ed268966e007bbeb9667d -rb8a78e01ff94d1b8c0e405d88d45d1ba444c400c
--- lams_tool_wiki_orig/web/jsps/authoring/advance.jsp	(.../advance.jsp)	(revision 0051b0f50069e8e8ba6ed268966e007bbeb9667d)
+++ lams_tool_wiki_orig/web/jsps/authoring/advance.jsp	(.../advance.jsp)	(revision b8a78e01ff94d1b8c0e405d88d45d1ba444c400c)
@@ -90,6 +90,7 @@
 	<fmt:message key="label.authoring.advance.num.edits" />
 </p>
 
+<!--
 <p>
 	<html:radio property="wiki.allowNewTopic" value="true"
 		styleId="allowNewTopic1" styleClass="noBorder">
@@ -107,6 +108,7 @@
 		<fmt:message key="label.authoring.advance.number.reply" />
 	</label>
 </p>
+-->
 
 <p>
 	<fmt:message key="label.authoring.advance.minimum.reply" />