Merge branch 'fixdoc' of https://github.com/dekoza/pyjnius into dekoz…

…a-fixdoc

Conflicts:
	docs/source/index.rst

.gitignore

@@ -5,3 +5,4 @@ build
 jnius.so
 .*.swp
 *.class
+.idea

docs/source/android.rst

@@ -12,7 +12,7 @@ Get the DPI
 -----------
 
 The `DisplayMetrics
-<http://developer.android.com/reference/android/util/DisplayMetrics.html>`_ contain multiple field that can return lot of information about the device screen::
+<http://developer.android.com/reference/android/util/DisplayMetrics.html>`_ contains multiple fields that can return a lot of information about the device's screen::
 
     from jnius.reflect import autoclass
     DisplayMetrics = autoclass('android.util.DisplayMetrics')
@@ -25,7 +25,7 @@ Recording an audio file
 
 By looking at the `Audio Capture
 <http://developer.android.com/guide/topics/media/audio-capture.html>`_ guide
-from Android, you can see the simple step to do for recording an audiofile.
+from Android, you can see the simple step to do for recording an audio file.
 Let's do in with Pyjnius::
 
     from jnius.reflect import autoclass
@@ -85,8 +85,8 @@ Accessing to the Activity
 -------------------------
 
 This example will show how to start a new Intent. Be careful, some Intent
-require you to setup some part in the `AndroidManifest.xml`, and have some
-action done within your own Activity. This is out of the scope of Pyjnius, but
+require you to setup some parts in the `AndroidManifest.xml`, and have some
+actions done within your own Activity. This is out of the scope of Pyjnius, but
 we'll show you what is the best approach for playing with it.
 
 On Python-for-android project, you can access to the default `PythonActivity`.

docs/source/quickstart.rst

@@ -3,7 +3,7 @@
 Quickstart
 ==========
 
-Eager to get started? This page give a good introduction to Pyjnius. It assumes
+Eager to get started? This page will give you a good introduction to Pyjnius. It assumes
 you have already Pyjnius installed. If you do not, head over the
 :ref:`installation` section.
 
@@ -23,7 +23,7 @@ A minimal Pyjnius example looks something like this::
     print stack.pop() # --> 'hello'
 
 Just save it as `test.py` (or something similar) and run it with your Python
-interpreter. Make sure to not call your application `jnius.py` because it would
+interpreter. Make sure not to call your application `jnius.py` because it would
 conflict with Pyjnius itself::
 
     $ python test.py
@@ -33,7 +33,7 @@ conflict with Pyjnius itself::
 Automatic recursive inspection
 ------------------------------
 
-Pyjnius use Java reflection to give you a new autoclass() if the return type is
+Pyjnius uses Java reflection to give you a new autoclass() if the return type is
 not a native type. Let's see this example::
 
     System = autoclass('java.io.System')
@@ -50,5 +50,5 @@ fields and methods naturally. Let's go deeper::
     >>> System.out.println
     <jnius.JavaMethodMultiple object at 0x236adb8>
 
-The recursive reflection always give you an appropriate object that reflect the
+The recursive reflection always gives you an appropriate object that reflects the
 returned Java object.

jnius/jnius.pyx

@@ -3,7 +3,7 @@
 Java wrapper
 ============
 
-With this module, you can create Python class that reflect a Java class, and use
+With this module, you can create Python class that reflects a Java class, and use
 it directly in Python.
 
 Example with static method