21 files changed, 102 insertions, 42 deletions
diff --git a/doc/classes/@GDScript.xml b/doc/classes/@GDScript.xml
index 7b4b3e43ba..0a430fea4d 100644
--- a/doc/classes/@GDScript.xml
+++ b/doc/classes/@GDScript.xml
@@ -127,7 +127,7 @@
 			<description>
 				Returns the arc tangent of [code]y/x[/code] in radians. Use to get the angle of tangent [code]y/x[/code]. To compute the value, the method takes into account the sign of both arguments in order to determine the quadrant.
 				[codeblock]
-				a = atan(0, -1) # a is 3.141593
+				a = atan2(0, -1) # a is 3.141593
 				[/codeblock]
 			</description>
 		</method>
diff --git a/doc/classes/AnimatedTexture.xml b/doc/classes/AnimatedTexture.xml
index 08cd79e78f..871ae1a701 100644
--- a/doc/classes/AnimatedTexture.xml
+++ b/doc/classes/AnimatedTexture.xml
@@ -4,7 +4,7 @@
 		Proxy texture for simple frame-based animations.
 	</brief_description>
 	<description>
-		[code]AnimatedTexture[/code] is a resource format for simple frame-based animations, where multiple frames textures can be chained automatically with a predefined delay for each frame. It's not a [Node], contrarily to [AnimationPlayer] or [AnimatedSprite], but has the advantage of being usable at any place where a [Texture] resource can be used, e.g. in a [TileSet].
+		[code]AnimatedTexture[/code] is a resource format for frame-based animations, where multiple textures can be chained automatically with a predefined delay for each frame. Unlike [AnimationPlayer] or [AnimatedSprite], it isn't a [Node], but has the advantage of being usable anywhere a [Texture] resource can be used, e.g. in a [TileSet].
 		The playback of the animation is controlled by the [member fps] property as well as each frame's optional delay (see [method set_frame_delay]). The animation loops, i.e. it will restart at frame 0 automatically after playing the last frame.
 		[code]AnimatedTexture[/code] currently requires all frame textures to have the same size, otherwise the bigger ones will be cropped to match the smallest one.
 	</description>
@@ -19,7 +19,7 @@
 			<argument index="0" name="frame" type="int">
 			</argument>
 			<description>
-				Retrieves the delayed assigned to the given [code]frame[/code] ID.
+				Returns the given frame's delay value.
 			</description>
 		</method>
 		<method name="get_frame_texture" qualifiers="const">
@@ -28,7 +28,7 @@
 			<argument index="0" name="frame" type="int">
 			</argument>
 			<description>
-				Retrieves the [Texture] assigned to the given [code]frame[/code] ID.
+				Returns the given frame's [Texture].
 			</description>
 		</method>
 		<method name="set_frame_delay">
@@ -39,7 +39,7 @@
 			<argument index="1" name="delay" type="float">
 			</argument>
 			<description>
-				Defines an additional delay (in seconds) between this frame and the next one, that will be added to the time interval defined by [member fps]. By default, frames have no delay defined. If a delay value is defined, the final time interval between this frame and the next will be [code]1.0 / fps + delay[/code].
+				Sets an additional delay (in seconds) between this frame and the next one, that will be added to the time interval defined by [member fps]. By default, frames have no delay defined. If a delay value is defined, the final time interval between this frame and the next will be [code]1.0 / fps + delay[/code].
 				For example, for an animation with 3 frames, 2 FPS and a frame delay on the second frame of 1.2, the resulting playback will be:
 				[codeblock]
 				Frame 0: 0.5 s (1 / fps)
@@ -57,15 +57,15 @@
 			<argument index="1" name="texture" type="Texture">
 			</argument>
 			<description>
-				Assigns a [Texture] to the given [code]frame[/code] ID. IDs start at 0 (so the first frame has ID 0, and the last frame of the animation has ID [member frames] - 1).
-				You can define any frame texture up to [constant MAX_FRAMES], but keep in mind that only frames from 0 to [member frames] - 1 will be part of the animation.
+				Assigns a [Texture] to the given frame. Frame IDs start at 0, so the first frame has ID 0, and the last frame of the animation has ID [member frames] - 1.
+				You can define any number of textures up to [constant MAX_FRAMES], but keep in mind that only frames from 0 to [member frames] - 1 will be part of the animation.
 			</description>
 		</method>
 	</methods>
 	<members>
 		<member name="fps" type="float" setter="set_fps" getter="get_fps">
-			Number of frames per second. This value defines the default time interval between two frames of the animation, and thus the overall duration of the animation loop based on the [member frames] property. A value of 0 means no predefined number of frames per second, the animation will play according to each frame's frame delay (see [method set_frame_delay]). Default value: 4.
-			For example, an animation with 8 frames, no frame delay and a [code]fps[/code] value of 2 will run over 4 seconds, with one frame each 0.5 seconds.
+			Animation speed in frames per second. This value defines the default time interval between two frames of the animation, and thus the overall duration of the animation loop based on the [member frames] property. A value of 0 means no predefined number of frames per second, the animation will play according to each frame's frame delay (see [method set_frame_delay]). Default value: 4.
+			For example, an animation with 8 frames, no frame delay and a [code]fps[/code] value of 2 will run for 4 seconds, with each frame lasting 0.5 seconds.
 		</member>
 		<member name="frames" type="int" setter="set_frames" getter="get_frames">
 			Number of frames to use in the animation. While you can create the frames independently with [method set_frame_texture], you need to set this value for the animation to take new frames into account. The maximum number of frames is [constant MAX_FRAMES]. Default value: 1.
diff --git a/doc/classes/AudioStreamSample.xml b/doc/classes/AudioStreamSample.xml
index 77d5f14ab7..fdaa942018 100644
--- a/doc/classes/AudioStreamSample.xml
+++ b/doc/classes/AudioStreamSample.xml
@@ -12,11 +12,13 @@
 	</demos>
 	<methods>
 		<method name="save_to_wav">
-			<return type="void">
+			<return type="int" enum="Error">
 			</return>
 			<argument index="0" name="path" type="String">
 			</argument>
 			<description>
+				Saves the AudioStreamSample as a WAV file to [code]path[/code]. Samples with IMA ADPCM format can't be saved.
+				Note that a [code].wav[/code] extension is automatically appended to [code]path[/code] if it is missing.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/Dictionary.xml b/doc/classes/Dictionary.xml
index 9c78853cfe..d87b029676 100644
--- a/doc/classes/Dictionary.xml
+++ b/doc/classes/Dictionary.xml
@@ -6,8 +6,18 @@
 	<description>
 		Dictionary type. Associative container which contains values referenced by unique keys. Dictionaries are always passed by reference.
 		Erasing elements while iterating over them [b]is not supported[/b].
+		Creating a dictionary:
+		[codeblock]
+		var d = {4: 5, "A key": "A value", 28: [1, 2, 3]}
+		[/codeblock]
+		To add a key to an existing dictionary, access it like an existing key and assign to it:
+		[codeblock]
+		d[4] = "hello"  # Add integer 4 as a key and assign the String "hello" as its value.
+		d["Godot"] = 3.01  # Add String "Godot" as a key and assign the value 3.01 to it.
+		[/codeblock]
 	</description>
 	<tutorials>
+		<link>https://docs.godotengine.org/en/latest/getting_started/scripting/gdscript/gdscript_basics.html#dictionary</link>
 	</tutorials>
 	<demos>
 	</demos>
diff --git a/doc/classes/EditorSpatialGizmoPlugin.xml b/doc/classes/EditorSpatialGizmoPlugin.xml
index a6c0413c19..d49a50893d 100644
--- a/doc/classes/EditorSpatialGizmoPlugin.xml
+++ b/doc/classes/EditorSpatialGizmoPlugin.xml
@@ -137,6 +137,12 @@
 				Override this method to provide the name that will appear in the gizmo visibility menu.
 			</description>
 		</method>
+		<method name="get_priority" qualifiers="virtual">
+			<return type="String">
+			</return>
+			<description>
+			</description>
+		</method>
 		<method name="has_gizmo" qualifiers="virtual">
 			<return type="bool">
 			</return>
diff --git a/doc/classes/KinematicBody.xml b/doc/classes/KinematicBody.xml
index 4aec75d89f..78012dd31c 100644
--- a/doc/classes/KinematicBody.xml
+++ b/doc/classes/KinematicBody.xml
@@ -93,10 +93,11 @@
 				Moves the body along a vector. If the body collides with another, it will slide along the other body rather than stop immediately. If the other body is a [code]KinematicBody[/code] or [RigidBody], it will also be affected by the motion of the other body. You can use this to make moving or rotating platforms, or to make nodes push other nodes.
 				[code]linear_velocity[/code] is the velocity vector (typically meters per second). Unlike in [method move_and_collide], you should [i]not[/i] multiply it by [code]delta[/code] — the physics engine handles applying the velocity.
 				[code]floor_normal[/code] is the up direction, used to determine what is a wall and what is a floor or a ceiling. If set to the default value of [code]Vector3(0, 0, 0)[/code], everything is considered a wall. This is useful for topdown games.
-				If the body is standing on a slope and the horizontal speed (relative to the floor's speed) goes below [code]slope_stop_min_velocity[/code], the body will stop completely. This prevents the body from sliding down slopes when you include gravity in [code]linear_velocity[/code]. When set to lower values, the body will not be able to stand still on steep slopes.
+				If [code]stop_on_slope[/code] is true, body will not slide on slopes if you include gravity in [code]linear_velocity[/code].
 				If the body collides, it will change direction a maximum of [code]max_slides[/code] times before it stops.
 				[code]floor_max_angle[/code] is the maximum angle (in radians) where a slope is still considered a floor (or a ceiling), rather than a wall. The default value equals 45 degrees.
-				Returns the movement that remained when the body stopped. To get more detailed information about collisions that occurred, use [method get_slide_collision].
+				If [code]infinite_inertia[/code] is true, body will be able to push [RigidBody] nodes, but it won't also detect any collisions with them. When false, it will interact with [RigidBody] nodes like with [StaticBody].
+				Returns the [code]linear_velocity[/code] vector, rotated and/or scaled if a slide collision occurred. To get detailed information about collisions that occurred, use [method get_slide_collision].
 			</description>
 		</method>
 		<method name="move_and_slide_with_snap">
diff --git a/doc/classes/KinematicBody2D.xml b/doc/classes/KinematicBody2D.xml
index d5bfc91f66..3eca698bba 100644
--- a/doc/classes/KinematicBody2D.xml
+++ b/doc/classes/KinematicBody2D.xml
@@ -27,6 +27,12 @@
 			</argument>
 			<description>
 				Returns a [KinematicCollision2D], which contains information about a collision that occurred during the last [method move_and_slide] call. Since the body can collide several times in a single call to [method move_and_slide], you must specify the index of the collision in the range 0 to ([method get_slide_count] - 1).
+				Example usage:
+				[codeblock]
+				for i in get_slide_count():
+				    var collision = get_slide_collision(i)
+				    print("Collided with: ", collision.collider.name)
+				[/codeblock]
 			</description>
 		</method>
 		<method name="get_slide_count" qualifiers="const">
@@ -91,10 +97,11 @@
 				Moves the body along a vector. If the body collides with another, it will slide along the other body rather than stop immediately. If the other body is a [code]KinematicBody2D[/code] or [RigidBody2D], it will also be affected by the motion of the other body. You can use this to make moving or rotating platforms, or to make nodes push other nodes.
 				[code]linear_velocity[/code] is the velocity vector in pixels per second. Unlike in [method move_and_collide], you should [i]not[/i] multiply it by [code]delta[/code] — the physics engine handles applying the velocity.
 				[code]floor_normal[/code] is the up direction, used to determine what is a wall and what is a floor or a ceiling. If set to the default value of [code]Vector2(0, 0)[/code], everything is considered a wall. This is useful for topdown games.
-				If the body is standing on a slope and the horizontal speed (relative to the floor's speed) goes below [code]slope_stop_min_velocity[/code], the body will stop completely. This prevents the body from sliding down slopes when you include gravity in [code]linear_velocity[/code]. When set to lower values, the body will not be able to stand still on steep slopes.
+				If [code]stop_on_slope[/code] is true, body will not slide on slopes when you include gravity in [code]linear_velocity[/code] and the body is standing still.
 				If the body collides, it will change direction a maximum of [code]max_slides[/code] times before it stops.
 				[code]floor_max_angle[/code] is the maximum angle (in radians) where a slope is still considered a floor (or a ceiling), rather than a wall. The default value equals 45 degrees.
-				Returns the [code]linear_velocity[/code] vector, rotated and/or scaled if a slide collision occurred. To get more detailed information about collisions that occurred, use [method get_slide_collision].
+				If [code]infinite_inertia[/code] is true, body will be able to push [RigidBody2D] nodes, but it won't also detect any collisions with them. When false, it will interact with [RigidBody2D] nodes like with [StaticBody2D].
+				Returns the [code]linear_velocity[/code] vector, rotated and/or scaled if a slide collision occurred. To get detailed information about collisions that occurred, use [method get_slide_collision].
 			</description>
 		</method>
 		<method name="move_and_slide_with_snap">
diff --git a/doc/classes/Light2D.xml b/doc/classes/Light2D.xml
index 0d754f1d4e..3cb785e7b8 100644
--- a/doc/classes/Light2D.xml
+++ b/doc/classes/Light2D.xml
@@ -7,6 +7,7 @@
 		Casts light in a 2D environment. Light is defined by a (usually grayscale) texture, a color, an energy value, a mode (see constants), and various other parameters (range and shadows-related). Note that Light2D can be used as a mask.
 	</description>
 	<tutorials>
+		<link>http://docs.godotengine.org/en/latest/tutorials/2d/2d_lights_and_shadows.html</link>
 	</tutorials>
 	<demos>
 	</demos>
diff --git a/doc/classes/LightOccluder2D.xml b/doc/classes/LightOccluder2D.xml
index 38b9054411..c7dfe9606b 100644
--- a/doc/classes/LightOccluder2D.xml
+++ b/doc/classes/LightOccluder2D.xml
@@ -7,6 +7,7 @@
 		Occludes light cast by a Light2D, casting shadows. The LightOccluder2D must be provided with an [OccluderPolygon2D] in order for the shadow to be computed.
 	</description>
 	<tutorials>
+		<link>http://docs.godotengine.org/en/latest/tutorials/2d/2d_lights_and_shadows.html</link>
 	</tutorials>
 	<demos>
 	</demos>
diff --git a/doc/classes/MeshInstance2D.xml b/doc/classes/MeshInstance2D.xml
index 7f0136bf77..c26665b6b5 100644
--- a/doc/classes/MeshInstance2D.xml
+++ b/doc/classes/MeshInstance2D.xml
@@ -5,6 +5,7 @@
 	<description>
 	</description>
 	<tutorials>
+		<link>http://docs.godotengine.org/en/latest/tutorials/2d/2d_meshes.html</link>
 	</tutorials>
 	<demos>
 	</demos>
diff --git a/doc/classes/MultiMesh.xml b/doc/classes/MultiMesh.xml
index 0cc9764e36..9bee8e2100 100644
--- a/doc/classes/MultiMesh.xml
+++ b/doc/classes/MultiMesh.xml
@@ -10,6 +10,7 @@
 		Since instances may have any behavior, the AABB used for visibility must be provided by the user.
 	</description>
 	<tutorials>
+		<link>http://docs.godotengine.org/en/latest/tutorials/3d/vertex_animation/animating_thousands_of_fish.html</link>
 	</tutorials>
 	<demos>
 	</demos>
diff --git a/doc/classes/MultiMeshInstance.xml b/doc/classes/MultiMeshInstance.xml
index 5e021dfe9b..866ffffb5f 100644
--- a/doc/classes/MultiMeshInstance.xml
+++ b/doc/classes/MultiMeshInstance.xml
@@ -8,6 +8,8 @@
 		This is useful to optimize the rendering of a high amount of instances of a given mesh (for example tree in a forest or grass strands).
 	</description>
 	<tutorials>
+		<link>http://docs.godotengine.org/en/latest/tutorials/3d/vertex_animation/animating_thousands_of_fish.html</link>
+		<link>http://docs.godotengine.org/en/latest/tutorials/3d/using_multi_mesh_instance.html</link>
 	</tutorials>
 	<demos>
 	</demos>
diff --git a/doc/classes/Particles.xml b/doc/classes/Particles.xml
index b6e31d3576..5d80f32bc2 100644
--- a/doc/classes/Particles.xml
+++ b/doc/classes/Particles.xml
@@ -8,6 +8,7 @@
 		Use the [code]process_material[/code] property to add a [ParticlesMaterial] to configure particle appearance and behavior. Alternatively, you can add a [ShaderMaterial] which will be applied to all particles.
 	</description>
 	<tutorials>
+		<link>http://docs.godotengine.org/en/latest/tutorials/3d/vertex_animation/controlling_thousands_of_fish.html</link>
 	</tutorials>
 	<demos>
 	</demos>
diff --git a/doc/classes/Particles2D.xml b/doc/classes/Particles2D.xml
index 91c1a0ca9b..53088e909e 100644
--- a/doc/classes/Particles2D.xml
+++ b/doc/classes/Particles2D.xml
@@ -8,6 +8,7 @@
 		Use the [code]process_material[/code] property to add a [ParticlesMaterial] to configure particle appearance and behavior. Alternatively, you can add a [ShaderMaterial] which will be applied to all particles.
 	</description>
 	<tutorials>
+		<link>https://docs.godotengine.org/en/latest/tutorials/2d/particle_systems_2d.html</link>
 	</tutorials>
 	<demos>
 	</demos>
diff --git a/doc/classes/Physics2DDirectBodyState.xml b/doc/classes/Physics2DDirectBodyState.xml
index 52c89248ff..5b320a051f 100644
--- a/doc/classes/Physics2DDirectBodyState.xml
+++ b/doc/classes/Physics2DDirectBodyState.xml
@@ -4,9 +4,10 @@
 		Direct access object to a physics body in the [Physics2DServer].
 	</brief_description>
 	<description>
-		Direct access object to a physics body in the [Physics2DServer]. This object is passed via the direct state callback of rigid/character bodies, and is intended for changing the direct state of that body.
+		Provides direct access to a physics body in the [Physics2DServer], allowing safe changes to physics properties. This object is passed via the direct state callback of rigid/character bodies, and is intended for changing the direct state of that body. See [method RigidBody2D._integrate_forces].
 	</description>
 	<tutorials>
+		<link>https://docs.godotengine.org/en/latest/tutorials/physics/ray-casting.html</link>
 	</tutorials>
 	<demos>
 	</demos>
@@ -17,6 +18,7 @@
 			<argument index="0" name="force" type="Vector2">
 			</argument>
 			<description>
+				Adds a constant directional force without affecting rotation.
 			</description>
 		</method>
 		<method name="add_force">
@@ -27,6 +29,7 @@
 			<argument index="1" name="force" type="Vector2">
 			</argument>
 			<description>
+				Adds a positioned force to the body. Both the force and the offset from the body origin are in global coordinates.
 			</description>
 		</method>
 		<method name="add_torque">
@@ -35,6 +38,7 @@
 			<argument index="0" name="torque" type="float">
 			</argument>
 			<description>
+				Adds a constant rotational force.
 			</description>
 		</method>
 		<method name="apply_central_impulse">
@@ -43,6 +47,7 @@
 			<argument index="0" name="impulse" type="Vector2">
 			</argument>
 			<description>
+				Applies a directional impulse without affecting rotation.
 			</description>
 		</method>
 		<method name="apply_impulse">
@@ -53,6 +58,7 @@
 			<argument index="1" name="impulse" type="Vector2">
 			</argument>
 			<description>
+				Applies a positioned impulse to the body. An impulse is time independent! Applying an impulse every frame would result in a framerate dependent force. For this reason it should only be used when simulating one-time impacts (use the "_force" functions otherwise). The offset uses the rotation of the global coordinate system, but is centered at the object's origin.
 			</description>
 		</method>
 		<method name="apply_torque_impulse">
@@ -61,6 +67,7 @@
 			<argument index="0" name="impulse" type="float">
 			</argument>
 			<description>
+				Applies a rotational impulse to the body.
 			</description>
 		</method>
 		<method name="get_contact_collider" qualifiers="const">
@@ -69,7 +76,7 @@
 			<argument index="0" name="contact_idx" type="int">
 			</argument>
 			<description>
-				Return the [RID] of the collider.
+				Returns the collider's [RID].
 			</description>
 		</method>
 		<method name="get_contact_collider_id" qualifiers="const">
@@ -78,7 +85,7 @@
 			<argument index="0" name="contact_idx" type="int">
 			</argument>
 			<description>
-				Return the object id of the collider.
+				Returns the collider's object id.
 			</description>
 		</method>
 		<method name="get_contact_collider_object" qualifiers="const">
@@ -87,7 +94,7 @@
 			<argument index="0" name="contact_idx" type="int">
 			</argument>
 			<description>
-				Return the collider object, this depends on how it was created (will return a scene node if such was used to create it).
+				Returns the collider object. This depends on how it was created (will return a scene node if such was used to create it).
 			</description>
 		</method>
 		<method name="get_contact_collider_position" qualifiers="const">
@@ -96,7 +103,7 @@
 			<argument index="0" name="contact_idx" type="int">
 			</argument>
 			<description>
-				Return the contact position in the collider.
+				Returns the contact position in the collider.
 			</description>
 		</method>
 		<method name="get_contact_collider_shape" qualifiers="const">
@@ -105,7 +112,7 @@
 			<argument index="0" name="contact_idx" type="int">
 			</argument>
 			<description>
-				Return the collider shape index.
+				Returns the collider's shape index.
 			</description>
 		</method>
 		<method name="get_contact_collider_shape_metadata" qualifiers="const">
@@ -114,7 +121,7 @@
 			<argument index="0" name="contact_idx" type="int">
 			</argument>
 			<description>
-				Return the metadata of the collided shape. This metadata is different from [method Object.get_meta], and is set with [method Physics2DServer.shape_set_data].
+				Returns the collided shape's metadata. This metadata is different from [method Object.get_meta], and is set with [method Physics2DServer.shape_set_data].
 			</description>
 		</method>
 		<method name="get_contact_collider_velocity_at_position" qualifiers="const">
@@ -123,14 +130,14 @@
 			<argument index="0" name="contact_idx" type="int">
 			</argument>
 			<description>
-				Return the linear velocity vector at contact point of the collider.
+				Returns the linear velocity vector at the collider's contact point.
 			</description>
 		</method>
 		<method name="get_contact_count" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-				Return the amount of contacts this body has with other bodies. Note that by default this returns 0 unless bodies are configured to log contacts.
+				Returns the number of contacts this body has with other bodies. Note that by default this returns 0 unless bodies are configured to log contacts. See [member RigidBody2D.contact_monitor].
 			</description>
 		</method>
 		<method name="get_contact_local_normal" qualifiers="const">
@@ -139,7 +146,7 @@
 			<argument index="0" name="contact_idx" type="int">
 			</argument>
 			<description>
-				Return the local normal (of this body) of the contact point.
+				Returns the local normal at the contact point.
 			</description>
 		</method>
 		<method name="get_contact_local_position" qualifiers="const">
@@ -148,7 +155,7 @@
 			<argument index="0" name="contact_idx" type="int">
 			</argument>
 			<description>
-				Return the local position (of this body) of the contact point.
+				Returns the local position of the contact point.
 			</description>
 		</method>
 		<method name="get_contact_local_shape" qualifiers="const">
@@ -157,27 +164,27 @@
 			<argument index="0" name="contact_idx" type="int">
 			</argument>
 			<description>
-				Return the local shape index of the collision.
+				Returns the local shape index of the collision.
 			</description>
 		</method>
 		<method name="get_space_state">
 			<return type="Physics2DDirectSpaceState">
 			</return>
 			<description>
-				Return the current state of space, useful for queries.
+				Returns the current state of the space, useful for queries.
 			</description>
 		</method>
 		<method name="integrate_forces">
 			<return type="void">
 			</return>
 			<description>
-				Call the built-in force integration code.
+				Calls the built-in force integration code.
 			</description>
 		</method>
 	</methods>
 	<members>
 		<member name="angular_velocity" type="float" setter="set_angular_velocity" getter="get_angular_velocity">
-			The angular velocity of the body.
+			The body's rotational velocity.
 		</member>
 		<member name="inverse_inertia" type="float" setter="" getter="get_inverse_inertia">
 			The inverse of the inertia of the body.
@@ -186,10 +193,10 @@
 			The inverse of the mass of the body.
 		</member>
 		<member name="linear_velocity" type="Vector2" setter="set_linear_velocity" getter="get_linear_velocity">
-			The linear velocity of the body.
+			The body's linear velocity.
 		</member>
 		<member name="sleeping" type="bool" setter="set_sleep_state" getter="is_sleeping">
-			[code]true[/code] if this body is currently sleeping (not active).
+			If [code]true[/code], this body is currently sleeping (not active).
 		</member>
 		<member name="step" type="float" setter="" getter="get_step">
 			The timestep (delta) used for the simulation.
@@ -204,7 +211,7 @@
 			The rate at which the body stops moving, if there are not any other forces moving it.
 		</member>
 		<member name="transform" type="Transform2D" setter="set_transform" getter="get_transform">
-			The transformation matrix of the body.
+			The body's transformation matrix.
 		</member>
 	</members>
 	<constants>
diff --git a/doc/classes/PhysicsDirectBodyState.xml b/doc/classes/PhysicsDirectBodyState.xml
index cf718f06b2..10b5199128 100644
--- a/doc/classes/PhysicsDirectBodyState.xml
+++ b/doc/classes/PhysicsDirectBodyState.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class name="PhysicsDirectBodyState" inherits="Object" category="Core" version="3.1">
 	<brief_description>
+		Direct access object to a physics body in the [PhysicsServer].
 	</brief_description>
 	<description>
+		Provides direct access to a physics body in the [PhysicsServer], allowing safe changes to physics properties. This object is passed via the direct state callback of rigid/character bodies, and is intended for changing the direct state of that body. See [method RigidBody._integrate_forces].
 	</description>
 	<tutorials>
 	</tutorials>
 	<demos>
 	</demos>
-	<methods>
+	<methods>(
 		<method name="add_central_force">
 			<return type="void">
 			</return>
@@ -27,7 +29,7 @@
 			<argument index="1" name="position" type="Vector3">
 			</argument>
 			<description>
-				Adds a constant force (i.e. acceleration).
+				Adds a positioned force to the body. Both the force and the offset from the body origin are in global coordinates.
 			</description>
 		</method>
 		<method name="add_torque">
@@ -36,7 +38,7 @@
 			<argument index="0" name="torque" type="Vector3">
 			</argument>
 			<description>
-				Adds a constant rotational force (i.e. a motor) without affecting position.
+				Adds a constant rotational force without affecting position.
 			</description>
 		</method>
 		<method name="apply_central_impulse">
@@ -75,6 +77,7 @@
 			<argument index="0" name="contact_idx" type="int">
 			</argument>
 			<description>
+				Returns the collider's [RID].
 			</description>
 		</method>
 		<method name="get_contact_collider_id" qualifiers="const">
@@ -83,6 +86,7 @@
 			<argument index="0" name="contact_idx" type="int">
 			</argument>
 			<description>
+				Returns the collider's object id.
 			</description>
 		</method>
 		<method name="get_contact_collider_object" qualifiers="const">
@@ -91,6 +95,7 @@
 			<argument index="0" name="contact_idx" type="int">
 			</argument>
 			<description>
+				Returns the collider object.
 			</description>
 		</method>
 		<method name="get_contact_collider_position" qualifiers="const">
@@ -99,6 +104,7 @@
 			<argument index="0" name="contact_idx" type="int">
 			</argument>
 			<description>
+				Returns the contact position in the collider.
 			</description>
 		</method>
 		<method name="get_contact_collider_shape" qualifiers="const">
@@ -107,6 +113,7 @@
 			<argument index="0" name="contact_idx" type="int">
 			</argument>
 			<description>
+				Returns the collider's shape index.
 			</description>
 		</method>
 		<method name="get_contact_collider_velocity_at_position" qualifiers="const">
@@ -115,12 +122,14 @@
 			<argument index="0" name="contact_idx" type="int">
 			</argument>
 			<description>
+				Returns the linear velocity vector at the collider's contact point.
 			</description>
 		</method>
 		<method name="get_contact_count" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
+				Returns the number of contacts this body has with other bodies. Note that by default this returns 0 unless bodies are configured to log contacts. See [member RigidBody.contact_monitor].
 			</description>
 		</method>
 		<method name="get_contact_impulse" qualifiers="const">
@@ -138,6 +147,7 @@
 			<argument index="0" name="contact_idx" type="int">
 			</argument>
 			<description>
+				Returns the local normal at the contact point.
 			</description>
 		</method>
 		<method name="get_contact_local_position" qualifiers="const">
@@ -146,6 +156,7 @@
 			<argument index="0" name="contact_idx" type="int">
 			</argument>
 			<description>
+				Returns the local position of the contact point.
 			</description>
 		</method>
 		<method name="get_contact_local_shape" qualifiers="const">
@@ -154,24 +165,27 @@
 			<argument index="0" name="contact_idx" type="int">
 			</argument>
 			<description>
+				Returns the local shape index of the collision.
 			</description>
 		</method>
 		<method name="get_space_state">
 			<return type="PhysicsDirectSpaceState">
 			</return>
 			<description>
+				Returns the current state of the space, useful for queries.
 			</description>
 		</method>
 		<method name="integrate_forces">
 			<return type="void">
 			</return>
 			<description>
+				Calls the built-in force integration code.
 			</description>
 		</method>
 	</methods>
 	<members>
 		<member name="angular_velocity" type="Vector3" setter="set_angular_velocity" getter="get_angular_velocity">
-			The angular velocity of the body.
+			The body's rotational velocity.
 		</member>
 		<member name="center_of_mass" type="Vector3" setter="" getter="get_center_of_mass">
 		</member>
@@ -182,12 +196,12 @@
 			The inverse of the mass of the body.
 		</member>
 		<member name="linear_velocity" type="Vector3" setter="set_linear_velocity" getter="get_linear_velocity">
-			The linear velocity of the body.
+			The body's linear velocity.
 		</member>
 		<member name="principal_inertia_axes" type="Basis" setter="" getter="get_principal_inertia_axes">
 		</member>
 		<member name="sleeping" type="bool" setter="set_sleep_state" getter="is_sleeping">
-			[code]true[/code] if this body is currently sleeping (not active).
+			If [code]true[/code], this body is currently sleeping (not active).
 		</member>
 		<member name="step" type="float" setter="" getter="get_step">
 			The timestep (delta) used for the simulation.
@@ -202,7 +216,7 @@
 			The rate at which the body stops moving, if there are not any other forces moving it.
 		</member>
 		<member name="transform" type="Transform" setter="set_transform" getter="get_transform">
-			The transformation matrix of the body.
+			The body's transformation matrix.
 		</member>
 	</members>
 	<constants>
diff --git a/doc/classes/ProjectSettings.xml b/doc/classes/ProjectSettings.xml
index 74762df15e..77a695d070 100644
--- a/doc/classes/ProjectSettings.xml
+++ b/doc/classes/ProjectSettings.xml
@@ -323,6 +323,9 @@
 		<member name="display/mouse_cursor/custom_image_hotspot" type="Vector2" setter="" getter="">
 			Hotspot for the custom mouse cursor image.
 		</member>
+		<member name="display/mouse_cursor/tooltip_position_offset" type="Vector2" setter="" getter="">
+			Position offset for tooltips, relative to the hotspot of the mouse cursor.
+		</member>
 		<member name="display/window/dpi/allow_hidpi" type="bool" setter="" getter="">
 			Allow HiDPI display on Windows and OSX. On Desktop Linux, this can't be enabled or disabled.
 		</member>
diff --git a/doc/classes/RayCast.xml b/doc/classes/RayCast.xml
index 61f2737c01..22c70b789f 100644
--- a/doc/classes/RayCast.xml
+++ b/doc/classes/RayCast.xml
@@ -5,10 +5,10 @@
 	</brief_description>
 	<description>
 		A RayCast represents a line from its origin to its destination position, [code]cast_to[/code]. It is used to query the 3D space in order to find the closest object along the path of the ray.
-		RayCast can ignore some objects by adding them to the exception list via [code]add_exception[/code], by setting proper filtering with collision layers, or by filtering object types with type masks.
+		RayCast can ignore some objects by adding them to the exception list via [code]add_exception[/code] or by setting proper filtering with collision layers and masks.
 		RayCast can be configured to report collisions with [Area]s ([member collide_with_areas]) and/or [PhysicsBody]s ([member collide_with_bodies]).
 		Only enabled raycasts will be able to query the space and report collisions.
-		RayCast calculates intersection every physics frame (see [Node]), and the result is cached so it can be used later until the next frame. If multiple queries are required between physics frames (or during the same frame) use [method force_raycast_update] after adjusting the raycast.
+		RayCast calculates intersection every physics frame (see [Node]), and the result is cached so it can be used later until the next frame. If multiple queries are required between physics frames (or during the same frame), use [method force_raycast_update] after adjusting the raycast.
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/doc/classes/Rect2.xml b/doc/classes/Rect2.xml
index 45bfd16cb8..248b3a6010 100644
--- a/doc/classes/Rect2.xml
+++ b/doc/classes/Rect2.xml
@@ -145,7 +145,7 @@
 			<argument index="0" name="b" type="Rect2">
 			</argument>
 			<description>
-				Returns a larger Rect2 that contains this Rect2 and [code]with[/code].
+				Returns a larger Rect2 that contains this Rect2 and [code]b[/code].
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/ShaderMaterial.xml b/doc/classes/ShaderMaterial.xml
index 7491d22479..9b15c6e8b4 100644
--- a/doc/classes/ShaderMaterial.xml
+++ b/doc/classes/ShaderMaterial.xml
@@ -7,6 +7,7 @@
 		A material that uses a custom [Shader] program to render either items to screen or process particles. You can create multiple materials for the same shader but configure different values for the uniforms defined in the shader.
 	</description>
 	<tutorials>
+		<link>http://docs.godotengine.org/en/latest/tutorials/shading/index.html</link>
 	</tutorials>
 	<demos>
 	</demos>
diff --git a/doc/classes/Skeleton2D.xml b/doc/classes/Skeleton2D.xml
index d40b8a2fc7..258525c396 100644
--- a/doc/classes/Skeleton2D.xml
+++ b/doc/classes/Skeleton2D.xml
@@ -5,6 +5,7 @@
 	<description>
 	</description>
 	<tutorials>
+		<link>http://docs.godotengine.org/en/latest/tutorials/animation/2d_skeletons.html</link>
 	</tutorials>
 	<demos>
 	</demos>