Merge remote-tracking branch 'astaxie/master'

log.go

@@ -1,65 +1,65 @@
-package beego
-
-import (
-	"strings"
-
-	"github.com/astaxie/beego/logs"
-)
-
-// Log levels to control the logging output.
-const (
-	LevelTrace = iota
-	LevelDebug
-	LevelInfo
-	LevelWarning
-	LevelError
-	LevelCritical
-)
-
-// SetLogLevel sets the global log level used by the simple
-// logger.
-func SetLevel(l int) {
-	BeeLogger.SetLevel(l)
-}
-
-// logger references the used application logger.
-var BeeLogger *logs.BeeLogger
-
-// SetLogger sets a new logger.
-func SetLogger(adaptername string, config string) {
-	BeeLogger.SetLogger(adaptername, config)
-}
-
-// Trace logs a message at trace level.
-func Trace(v ...interface{}) {
-	BeeLogger.Trace(generateFmtStr(len(v)), v...)
-}
-
-// Debug logs a message at debug level.
-func Debug(v ...interface{}) {
-	BeeLogger.Debug(generateFmtStr(len(v)), v...)
-}
-
-// Info logs a message at info level.
-func Info(v ...interface{}) {
-	BeeLogger.Info(generateFmtStr(len(v)), v...)
-}
-
-// Warning logs a message at warning level.
-func Warn(v ...interface{}) {
-	BeeLogger.Warn(generateFmtStr(len(v)), v...)
-}
-
-// Error logs a message at error level.
-func Error(v ...interface{}) {
-	BeeLogger.Error(generateFmtStr(len(v)), v...)
-}
-
-// Critical logs a message at critical level.
-func Critical(v ...interface{}) {
-	BeeLogger.Critical(generateFmtStr(len(v)), v...)
-}
-
-func generateFmtStr(n int) string {
-	return strings.Repeat("%v ", n)
-}
+package beego
+
+import (
+	"strings"
+
+	"github.com/astaxie/beego/logs"
+)
+
+// Log levels to control the logging output.
+const (
+	LevelTrace = iota
+	LevelDebug
+	LevelInfo
+	LevelWarning
+	LevelError
+	LevelCritical
+)
+
+// SetLogLevel sets the global log level used by the simple
+// logger.
+func SetLevel(l int) {
+	BeeLogger.SetLevel(l)
+}
+
+// logger references the used application logger.
+var BeeLogger *logs.BeeLogger
+
+// SetLogger sets a new logger.
+func SetLogger(adaptername string, config string) {
+	BeeLogger.SetLogger(adaptername, config)
+}
+
+// Trace logs a message at trace level.
+func Trace(v ...interface{}) {
+	BeeLogger.Trace(generateFmtStr(len(v)), v...)
+}
+
+// Debug logs a message at debug level.
+func Debug(v ...interface{}) {
+	BeeLogger.Debug(generateFmtStr(len(v)), v...)
+}
+
+// Info logs a message at info level.
+func Info(v ...interface{}) {
+	BeeLogger.Info(generateFmtStr(len(v)), v...)
+}
+
+// Warning logs a message at warning level.
+func Warn(v ...interface{}) {
+	BeeLogger.Warn(generateFmtStr(len(v)), v...)
+}
+
+// Error logs a message at error level.
+func Error(v ...interface{}) {
+	BeeLogger.Error(generateFmtStr(len(v)), v...)
+}
+
+// Critical logs a message at critical level.
+func Critical(v ...interface{}) {
+	BeeLogger.Critical(generateFmtStr(len(v)), v...)
+}
+
+func generateFmtStr(n int) string {
+	return strings.Repeat("%v ", n)
+}

orm/docs/zh/Orm.md

@@ -145,7 +145,7 @@ import "github.com/astaxie/beego/orm"
 
 type User struct {
 	Id   int
-	name string
+	Name string
 }
 
 func init(){