Merging other languages

en/README.md

@@ -5,26 +5,6 @@ Go web编程是因为我喜欢Web编程,所以写了这本书,希望大家喜欢
 ***Build Web Application with Golang***
 ======================================
 
-[Download PDF](https://drive.google.com/file/d/0B2GBHFyTK2N8TzM4dEtIWjBJdEk/edit?usp=sharing)
-
-### ***Translator Comments***
-
-This is an English version of [《Go Web编程》](https://github.com/astaxie/build-web-application-with-golang), the original version was written by [AstaXie](https://github.com/astaxie) and translated by [Unknwon](https://github.com/Unknwon) and [Larry Battle](https://github.com/LarryBattle).
-
-This book is about how to build web applications in Go. In the first few chapters of the book, the author will review some basic knowledge about Go. However, for an optimal reading experience, you should have a basic understanding of the Go language and the concept of a web application. If you are completely new to programming, this book is not intended to provide sufficient introductory material to get started.
-
-If anything is unclear due to wording or language issues, feel free to ask me to write a better translation.
-
-###Acknowledgments for translation help
-
-- [matalangilbert](https://github.com/matalangilbert)
-- [nightlyone](https://github.com/nightlyone)
-- [sbinet](https://github.com/sbinet)
-- [carbocation](https://github.com/carbocation)
-- [desimone](https://github.com/desimone)
-- [reigai](https://github.com/reigai)
-- [OlingCat](https://github.com/OlingCat)
-
 ### Purpose
 
 Because I'm interested in web application development, I used my free time to write this book as an open source version. It doesn't mean that I have a very good ability to build web applications; I would like to share what I've done with Go in building web applications.
@@ -34,18 +14,19 @@ Because I'm interested in web application development, I used my free time to wr
 
 I believe the purpose of studying is sharing with others. The happiest thing in my life is sharing everything I've known with more people.
 
-### Donation
+# Donate
 
-If you like this book, you can ask your Chinese friends to follow this [link](https://me.alipay.com/astaxie) donate the original author, help him write more books with better, more useful, and more interesting content.
+AliPay: <img src="zh/images/alipay.png" alt="alipay" width="100" height="100">
 
-### Exchanging Learning Go
+English Donate:[donate](http://beego.me/donate)
 
-If you know what is QQ, join the group 259316004. If not, follow this [link](http://download.imqq.com/download.shtml) to get more details. Also, you can join our [forum](http://bbs.beego.me).
+## Community
+QQ群：386056972
+
+BBS：[http://golanghome.com/](http://golanghome.com/)
 
 ### Acknowledgments
 
-First, I have to thank the people who are members of Golang-China in QQ group 102319854, they are all very nice and helpful. Then, I need to thank the following people who gave great help when I was writing this book.
-
  - [四月份平民 April Citizen](https://plus.google.com/110445767383269817959) (review code)
  - [洪瑞琦 Hong Ruiqi](https://github.com/hongruiqi) (review code)
  - [边  疆 BianJiang](https://github.com/border) (write the configurations about Vim and Emacs for Go development)
@@ -58,8 +39,11 @@ First, I have to thank the people who are members of Golang-China in QQ group 10
 
 This book is licensed under the [CC BY-SA 3.0 License](http://creativecommons.org/licenses/by-sa/3.0/),
 the code is licensed under a [BSD 3-Clause License](<https://github.com/astaxie/build-web-application-with-golang/blob/master/LICENSE.md>), unless otherwise specified.
+<<<<<<< de3c5bdaa45425ed37306a45067d55eba7dcedc2
 
 ### Get Started
 
 [Index](./eBook/preface.md)
 >>>>>>> add english version
+=======
+>>>>>>> update the readme