Merge branch 'master' of http://github.com/qpython-android/qpython

Author: pollyfat

README.md

@@ -1,40 +1,59 @@
-# 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>
 
-Welcome to join QPython project. It's a great project. QPython has got several millions users in the world.
+Welcome to read the QPython guide!
+=============================================
 
-## background
+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!
 
-- 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.
 
-- and in fact, QPython's maker just only 1 Chinese guys
+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 all not full time develop for QPython
-    - so means we not enough resource to managment such as:
 
-      	- blog
-        - mailling-list
-        - IRC
-        - Twitter
-        - Facebook
-        - etc.
+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.
 
+QPython application is using the **Python 2.7.2** , and QPython application is using the  **Python 3.2.2** .
 
-## Note
 
-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.
+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 will be published with the Apache v2 license.
 
-## Welcome to contribute
+Thanks these guys who are contributing
+----------------------------------------
+They are pushing on the QPython project moving forward.
 
-Please to join us to push on the great project.  
+River, Mae, Zoom.Quiet, MathiasLuo, liyuanrui, Kyle kersey ...
 
-You can folk and send pull request to us,
 
-Please add skype riverfor for discussing how to move on.
+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.
+
+
+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/CNAME

@@ -1 +1 @@
-qpython.org
+www.qpython.org

docs/_sources/en/callqpyapiinapp.txt

@@ -0,0 +1,41 @@
+QPython Getting started
+==========================
+How to start quickly ? Just follow the following steps:
+
+.. toctree::
+   :maxdepth: 2
+
+   guide_howtostart
+   guide_helloworld
+
+
+Programming Guide
+========================
+
+If you you want to know more about how to program through qpython, just follow these steps:
+
+
+.. toctree::
+   :maxdepth: 2
+
+   guide_program
+   guide_ide
+   guide_libraries
+   guide_extend
+
+
+QPython Hackers' Guide
+=======================
+
+* `QPython Hackers Howto <http://wiki.qpython.org/en/diveinto/>`_
+
+
+Contributors' Guide
+===================
+
+Welcome to join QPython contributors team
+
+.. toctree::
+   :maxdepth: 2
+
+   guide_contributors