diff --git a/code/DocumentationViewer.php b/code/DocumentationViewer.php
index 6122734..b9be3c7 100755
--- a/code/DocumentationViewer.php
+++ b/code/DocumentationViewer.php
@@ -62,7 +62,7 @@ class DocumentationViewer extends Controller {
 					// see if docs folder is present
 					$subfolders = scandir(BASE_PATH .'/'. $module);
 					
-					if($subfolders && in_array('docs', $subfolders)) {
+					if($subfolders && in_array('doc', $subfolders)) {
 						$this->generateNestedTree($module);
 					}
 					else {
@@ -121,7 +121,7 @@ class DocumentationViewer extends Controller {
 		$base = Director::baseURL();
 		
 		// find page
-		$path = BASE_PATH . '/'. $module .'/docs/';
+		$path = BASE_PATH . '/'. $module .'/doc/';
 		
 		echo "<div id='LeftColumn'><div class='box'>";
 		if($page = $this->findPage($path, $class)) {
@@ -179,7 +179,7 @@ class DocumentationViewer extends Controller {
 	 * @param String - module to generate
 	 */
 	private function generateNestedTree($module) {
-		$path = BASE_PATH . '/'. $module .'/docs/';
+		$path = BASE_PATH . '/'. $module .'/doc/';
 		return (is_dir($path)) ? $this->recursivelyGenerateTree($path, $module) : false;
 	}
 	
diff --git a/docs/Writing-Documentation.md b/docs/Writing-Documentation.md
index e98edfd..5e0a8a8 100644
--- a/docs/Writing-Documentation.md
+++ b/docs/Writing-Documentation.md
@@ -2,13 +2,13 @@
 
 
 Your documentation needs to go in the specific modules doc folder which it refers mostly too. For example if you want to document
-a feature of your custom module 'MyModule' you need to create markdown files in mymodule/docs/.
+a feature of your custom module 'MyModule' you need to create markdown files in mymodule/doc/.
 
 The files have to end with the __.md__ extension. The documentation viewer will automatically replace hyphens (-) with spaces (since you cannot
 have spaces easily in some file systems).
 
 ## Syntax ##
-This uses a customized markdown extra parser. To view the syntax for page formatting check out [http://daringfireball.net/projects/markdown/syntax](Daring Fireball)
+This uses a customized markdown extra parser. To view the syntax for page formatting check out [http://daringfireball.net/projects/markdown/syntax][Daring Fireball]
 
 
 ## Creating Hierarchy ##