merge master

jeevatkm · jeevatkm · commit cdc3534cd652 · 2016-06-06T17:14:15.000-07:00
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 A high productivity, full-stack web framework for the [Go language](http://www.golang.org).
 
-Current Version: 0.13.0 (2016-06-05)
+Current Version: 0.13.1 (2016-06-06)
 
 **As of Revel 0.13.0, Go 1.4+ is required.**
 
@@ -23,7 +23,7 @@ Open http://localhost:9000 in your browser and you should see "It works!"
 
 ## Learn More
 
-* [Manual, Samples, Godocs, etc](http://revel.github.com)
+* [Manual, Samples, Godocs, etc](http://revel.github.io)
 * [Apps using Revel](https://github.com/revel/revel/wiki/Apps-in-the-Wild)
 * [Articles Featuring Revel](https://github.com/revel/revel/wiki/Articles)
 
diff --git a/revel.go b/revel.go
@@ -141,10 +141,10 @@ func Init(mode, importPath, srcPath string) {
 		packaged = true
 	}
 
-	RevelPath = path.Join(revelSourcePath, filepath.FromSlash(REVEL_IMPORT_PATH))
-	BasePath = path.Join(SourcePath, filepath.FromSlash(importPath))
-	AppPath = path.Join(BasePath, "app")
-	ViewsPath = path.Join(AppPath, "views")
+	RevelPath = filepath.Join(revelSourcePath, filepath.FromSlash(REVEL_IMPORT_PATH))
+	BasePath = filepath.Join(SourcePath, filepath.FromSlash(importPath))
+	AppPath = filepath.Join(BasePath, "app")
+	ViewsPath = filepath.Join(AppPath, "views")
 
 	CodePaths = []string{AppPath}
 
@@ -355,19 +355,19 @@ func ResolveImportPath(importPath string) (string, error) {
 
 func addModule(name, importPath, modulePath string) {
 	Modules = append(Modules, Module{Name: name, ImportPath: importPath, Path: modulePath})
-	if codePath := path.Join(modulePath, "app"); DirExists(codePath) {
+	if codePath := filepath.Join(modulePath, "app"); DirExists(codePath) {
 		CodePaths = append(CodePaths, codePath)
-		if viewsPath := path.Join(modulePath, "app", "views"); DirExists(viewsPath) {
+		if viewsPath := filepath.Join(modulePath, "app", "views"); DirExists(viewsPath) {
 			TemplatePaths = append(TemplatePaths, viewsPath)
 		}
 	}
 
-	INFO.Print("Loaded module ", path.Base(modulePath))
+	INFO.Print("Loaded module ", filepath.Base(modulePath))
 
 	// Hack: There is presently no way for the testrunner module to add the
 	// "test" subdirectory to the CodePaths.  So this does it instead.
 	if importPath == Config.StringDefault("module.testrunner", "github.com/revel/modules/testrunner") {
-		CodePaths = append(CodePaths, path.Join(BasePath, "tests"))
+		CodePaths = append(CodePaths, filepath.Join(BasePath, "tests"))
 	}
 }
 
diff --git a/skeleton/README.md b/skeleton/README.md
@@ -67,7 +67,7 @@ test
 * The [Getting Started with Revel](http://revel.github.io/tutorial/index.html).
 * The [Revel guides](http://revel.github.io/manual/index.html).
 * The [Revel sample apps](http://revel.github.io/samples/index.html).
-* The [API documentation](http://revel.github.io/docs/godoc/index.html).
+* The [API documentation](https://godoc.org/github.com/revel/revel).
 
 ## Contributing
 We encourage you to contribute to Revel! Please check out the [Contributing to Revel
