Merge branch 'master' into gitter-badge

Author: riverfor

README.md

@@ -1,42 +1,58 @@
-# QPython v2
+# QPython Project
+<p align="center"><a href="http://www.qpython.org" target="_blank"><img src="http://www.qpython.org/images/bestpython.png"></a></p>
 
-[![Join the chat at https://gitter.im/qpython-android/qpython](https://badges.gitter.im/qpython-android/qpython.svg)](https://gitter.im/qpython-android/qpython?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+Welcome to read the QPython guide!
 
-Welcome to join QPython project. It's a great project. QPython has got several millions users in the world.
+QPython is a script engine that runs Python on android devices. It lets your android device run Python scripts and projects. It contains the Python interpreter, console, editor, and the SL4A Library for Android. It’s Python on Android!
 
-## background
 
-- QPython is one great app. in Android for all kinds of Pythonist
-- base QPython we can:
-    - Pythonic done self script working in Android mobile implementor
-    - Pythonic create prototype app. in Android mobile implementor
-    - Pythonic show what is pythonic in Android mobile implementor
-    - Pythonic teching people enjoy Python in Android mobile implementor
-    - etc.
+QPython has several millions users in the world already, it's a great project for programming users, welcome to join us for contributing to this project NOW.
 
-- and in fact, QPython's maker just only 1 Chinese guys
 
-    - and all not full time develop for QPython
-    - so means we not enough resource to managment such as:
+What's NEW
+------------------------
+QPython project include the QPython https://play.google.com/store/apps/details?id=org.qpython.qpy and QPython3 https://play.google.com/store/apps/details?id=org.qpython.qpy3 applications.
 
-      	- blog
-        - mailling-list
-        - IRC
-        - Twitter
-        - Facebook
-        - etc.
+QPython application is using the **Python 2.7.2** , and QPython application is using the  **Python 3.2.2** .
 
 
-## Note
+QPython's newest version is 1.3.0 (Released on 2017/3/20) , QPython3's newest version is 1.0.2 (Released on 2017/3/29), New versions include many amazing features, please upgrade to the newest version as soon from google play, amazon appstore etc.
 
-It's not the google play's qpython app's sourcecode, because the online version sourcecode is not friendly, so I decide to rebuild code, Now it only has the python core and console module.
 
-It will be published with the Apache v2 license.
+Thanks these guys who are contributing
+----------------------------------------
+They are pushing on the QPython project moving forward.
 
-## Welcome to contribute
+River, Mae, Zoom.Quiet, MathiasLuo, liyuanrui, Kyle kersey ...
 
-Please to join us to push on the great project.  
 
-You can folk and send pull request to us,
+Do you want to join the great QPython team ? You could Ask qustions on twitter https://twitter.com/qpython or email us mailto:support@qpython.org.
+And you could fork us on github https://github.com/qpython-android/qpython and send pull request.
 
-Please add skype riverfor for discussing how to move on.
+
+QPython Communities
+----------------------
+**There are many active QPython communities where you could meet the QPython users like you**
+
+* Join Facebook community https://www.facebook.com/groups/qpython
+* Join Google group https://groups.google.com/forum/#!forum/qpython
+* Join Gitter chat https://gitter.com/qpython-android/qpython
+* Join G+ community https://plus.google.com/communities/111759148772865961493
+* QPython on Stackoverflow http://stackoverflow.com/questions/tagged/qpython
+
+**And you could talk to us through social network**
+
+* Like us on facebook https://www.facebook.com/QPython
+* Follow us on twitter https://twitter.com/qpython
+
+* Report issue https://github.com/qpython-android/qpython/issues
+* Email us mailto:support@qpython.org
+
+
+Support
+-------------
+We are happy to hear feedback from you,  but sometimes some bugs or features demand may not be implemented soon for we lack resources.
+
+So if you have any issue need the core developer team to solve with higher priority, you could try the https://www.bountysource.com .
+
+**It's the official QPython Users & Contributors' Guide, please follow http://www.qpython.org for more information.**

docs/_sources/en/guide.txt

@@ -24,16 +24,22 @@ If you you want to know more about how to program through qpython, just follow t
    guide_extend
 
 
-QPython Hackers' Guide
+**QPython project is not only a powerful Python engine for android, but is a active technology community also.**
+
+QPython Developers' Guide
 =======================
+QPython developers' goal is pushing out a great Python for android.
+
+.. toctree::
+   :maxdepth: 2
 
-* `QPython Hackers Howto <http://wiki.qpython.org/en/diveinto/>`_
+   guide_developers
 
 
-Contributors' Guide
+Community Contributors' Guide
 ===================
 
-Welcome to join QPython contributors team
+Welcome to join QPython contributors team, you are not just a user, but a creator of QPython.
 
 .. toctree::
    :maxdepth: 2