From f4b6ae069ce1cc45baff02b4d8b24e89f85f4a4f Mon Sep 17 00:00:00 2001
From: Nash Tsai <nash.tsai@gmail.com>
Date: Fri, 16 May 2014 23:42:47 +0800
Subject: [PATCH 1/2] tidy up logSQL

---
 session.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/session.go b/session.go
index 68cd8d22..e35b37c2 100644
--- a/session.go
+++ b/session.go
@@ -431,7 +431,7 @@ func (session *Session) exec(sqlStr string, args ...interface{}) (sql.Result, er
 		sqlStr = filter.Do(sqlStr, session.Engine.dialect, session.Statement.RefTable)
 	}
 
-	session.Engine.logSQL(sqlStr, args)
+	session.Engine.logSQL(sqlStr, args...)
 
 	if session.IsAutoCommit {
 		return session.innerExec(sqlStr, args...)
@@ -1734,7 +1734,7 @@ func (session *Session) queryPreprocess(sqlStr *string, paramStr ...interface{})
 		*sqlStr = filter.Do(*sqlStr, session.Engine.dialect, session.Statement.RefTable)
 	}
 
-	session.Engine.logSQL(*sqlStr, paramStr)
+	session.Engine.logSQL(*sqlStr, paramStr...)
 }
 
 func (session *Session) query(sqlStr string, paramStr ...interface{}) (resultsSlice []map[string][]byte, err error) {

From be48dbc82de2e8f86134e955ffd9333cb3209d90 Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Wed, 21 May 2014 22:34:48 +0800
Subject: [PATCH 2/2] add Conversion usage on Quickstart docs

---
 VERSION              | 2 +-
 docs/QuickStart.md   | 4 +++-
 docs/QuickStartCN.md | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index eb1bde3d..79201455 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-xorm v0.4.0 RC1
+xorm v0.4.0
diff --git a/docs/QuickStart.md b/docs/QuickStart.md
index 434e3f2d..89ed0fe2 100644
--- a/docs/QuickStart.md
+++ b/docs/QuickStart.md
@@ -224,6 +224,8 @@ type Conversion interface {
 }
 ```
 
+- 5. If one struct has a Conversion field, so we need set an implementation to the field before get data from database. We can implement `BeforeSet(name string, cell xorm.Cell)` on struct to do this. For example: [testConversion](https://github.com/go-xorm/tests/blob/master/base.go#L1826)
+
 <a name="30" id="30"></a>
 ## 3. database meta information
 
@@ -510,7 +512,7 @@ total, err := engine.Where("id >?", 1).Count(user)
 ```
 
 <a name="70" id="70"></a>
-## 6.更新数据
+## 6.Update
     
 更新数据使用`Update`方法，Update方法的第一个参数为需要更新的内容，可以为一个结构体指针或者一个Map[string]interface{}类型。当传入的为结构体指针时，只有非空和0的field才会被作为更新的字段。当传入的为Map类型时，key为数据库Column的名字，value为要更新的内容。
 
diff --git a/docs/QuickStartCN.md b/docs/QuickStartCN.md
index 638bc50d..9af08f1d 100644
--- a/docs/QuickStartCN.md
+++ b/docs/QuickStartCN.md
@@ -224,6 +224,8 @@ type Conversion interface {
 }
 ```
 
+- 5.如果一个结构体包含一个Conversion的接口类型，那么在获取数据时，必须要预先设置一个实现此接口的struct或者struct的指针。此时可以在此struct中实现`BeforeSet(name string, cell xorm.Cell)`方法来进行预先给Conversion赋值。例子参见 [testConversion](https://github.com/go-xorm/tests/blob/master/base.go#L1826)
+
 <a name="24" id="24"></a>
 ### 2.4.Go与字段类型对应表