21 files changed, 150 insertions, 112 deletions
diff --git a/doc/classes/@GDScript.xml b/doc/classes/@GDScript.xml
index 3e46dc4e92..7bd332a3e4 100644
--- a/doc/classes/@GDScript.xml
+++ b/doc/classes/@GDScript.xml
@@ -120,9 +120,9 @@
 		<method name="atan2">
 			<return type="float">
 			</return>
-			<argument index="0" name="x" type="float">
+			<argument index="0" name="y" type="float">
 			</argument>
-			<argument index="1" name="y" type="float">
+			<argument index="1" name="x" type="float">
 			</argument>
 			<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.
diff --git a/doc/classes/CanvasItem.xml b/doc/classes/CanvasItem.xml
index 98404478f4..60f097f3f9 100644
--- a/doc/classes/CanvasItem.xml
+++ b/doc/classes/CanvasItem.xml
@@ -576,7 +576,7 @@
 			Disable blending mode. Colors including alpha are written as is. Only applicable for render targets with a transparent background. No lighting will be applied.
 		</constant>
 		<constant name="NOTIFICATION_TRANSFORM_CHANGED" value="29">
-			Canvas item transform has changed. Only received if requested.
+			Canvas item transform has changed. Notification is only received if enabled by [method set_notify_transform] or [method set_notify_local_transform].
 		</constant>
 		<constant name="NOTIFICATION_DRAW" value="30">
 			CanvasItem is requested to draw.
diff --git a/doc/classes/ConfigFile.xml b/doc/classes/ConfigFile.xml
index ec0381bda5..a4709c1c86 100644
--- a/doc/classes/ConfigFile.xml
+++ b/doc/classes/ConfigFile.xml
@@ -18,7 +18,7 @@
 		var err = config.load("user://settings.cfg")
 		if err == OK: # if not, something went wrong with the file loading
 		    # Look for the display/width pair, and default to 1024 if missing
-		    var screen_width = get_value("display", "width", 1024)
+		    var screen_width = config.get_value("display", "width", 1024)
 		    # Store a variable if and only if it hasn't been defined yet
 		    if not config.has_section_key("audio", "mute"):
 		        config.set_value("audio", "mute", false)
diff --git a/doc/classes/EditorFileSystem.xml b/doc/classes/EditorFileSystem.xml
index ade6d2034d..5a8b506f9e 100644
--- a/doc/classes/EditorFileSystem.xml
+++ b/doc/classes/EditorFileSystem.xml
@@ -93,10 +93,6 @@
 				Remitted if a resource is reimported.
 			</description>
 		</signal>
-		<signal name="script_classes_updated">
-			<description>
-			</description>
-		</signal>
 		<signal name="sources_changed">
 			<argument index="0" name="exist" type="bool">
 			</argument>
diff --git a/doc/classes/EditorImportPlugin.xml b/doc/classes/EditorImportPlugin.xml
index b21d402468..fdc204605e 100644
--- a/doc/classes/EditorImportPlugin.xml
+++ b/doc/classes/EditorImportPlugin.xml
@@ -41,6 +41,7 @@
 		        return FAILED
 
 		    var mesh = Mesh.new()
+			# Fill the Mesh with data read in 'file', left as exercise to the reader
 
 		    var filename = save_path + "." + get_save_extension()
 		    ResourceSaver.save(filename, mesh)
diff --git a/doc/classes/EditorInterface.xml b/doc/classes/EditorInterface.xml
index 19bd7e6d52..f073c5e40b 100644
--- a/doc/classes/EditorInterface.xml
+++ b/doc/classes/EditorInterface.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class name="EditorInterface" inherits="Node" category="Core" version="3.1">
 	<brief_description>
-		Editor interface and main components.
+		Godot editor's interface.
 	</brief_description>
 	<description>
-		Editor interface. Allows saving and (re-)loading scenes, rendering mesh previews, inspecting and editing resources and objects and provides access to [EditorSettings], [EditorFileSystem], [EditorResourcePreview], [ScriptEditor], the editor viewport, as well as information about scenes. Also see [EditorPlugin] and [EditorScript].
+		EditorInterface gives you control over Godot editor's window. It allows customizing the window, saving and (re-)loading scenes, rendering mesh previews, inspecting and editing resources and objects, and provides access to [EditorSettings], [EditorFileSystem], [EditorResourcePreview], [ScriptEditor], the editor viewport, and information about scenes.
 	</description>
 	<tutorials>
 	</tutorials>
@@ -24,14 +24,14 @@
 			<return type="Control">
 			</return>
 			<description>
-				Returns the base [Control].
+				Returns the main container of Godot editor's window. You can use it, for example, to retrieve the size of the container and place your controls accordingly.
 			</description>
 		</method>
 		<method name="get_edited_scene_root">
 			<return type="Node">
 			</return>
 			<description>
-				Returns the edited scene's root [Node].
+				Returns the edited (current) scene's root [Node].
 			</description>
 		</method>
 		<method name="get_editor_settings">
@@ -52,7 +52,7 @@
 			<return type="Array">
 			</return>
 			<description>
-				Returns an [Array] of the currently opened scenes.
+				Returns an [Array] with the file paths of the currently opened scenes.
 			</description>
 		</method>
 		<method name="get_resource_filesystem">
@@ -66,7 +66,7 @@
 			<return type="EditorResourcePreview">
 			</return>
 			<description>
-				Returns the [EditorResourcePreview]\ er.
+				Returns the [EditorResourcePreview].
 			</description>
 		</method>
 		<method name="get_script_editor">
diff --git a/doc/classes/EditorPlugin.xml b/doc/classes/EditorPlugin.xml
index 208780547e..ac139f18c9 100644
--- a/doc/classes/EditorPlugin.xml
+++ b/doc/classes/EditorPlugin.xml
@@ -4,7 +4,7 @@
 		Used by the editor to extend its functionality.
 	</brief_description>
 	<description>
-		Plugins are used by the editor to extend functionality. The most common types of plugins are those which edit a given node or resource type, import plugins and export plugins.
+		Plugins are used by the editor to extend functionality. The most common types of plugins are those which edit a given node or resource type, import plugins and export plugins. Also see [EditorScript] to add functions to the editor.
 	</description>
 	<tutorials>
 		<link>http://docs.godotengine.org/en/3.0/development/plugins/index.html</link>
@@ -31,7 +31,7 @@
 			<argument index="1" name="title" type="String">
 			</argument>
 			<description>
-				Add a control to the bottom panel (together with Output, Debug, Animation, etc). Returns a reference to the button added. It's up to you to hide/show the button when needed. If your plugin is being removed, also make sure to remove your control by calling [method remove_control_from_bottom_panel].
+				Add a control to the bottom panel (together with Output, Debug, Animation, etc). Returns a reference to the button added. It's up to you to hide/show the button when needed. When your plugin is deactivated, make sure to remove your custom control with [method remove_control_from_bottom_panel] and free it with [code]queue_free()[/code].
 			</description>
 		</method>
 		<method name="add_control_to_container">
@@ -44,7 +44,7 @@
 			<description>
 				Add a custom control to a container (see CONTAINER_* enum). There are many locations where custom controls can be added in the editor UI.
 				Please remember that you have to manage the visibility of your custom controls yourself (and likely hide it after adding it).
-				If your plugin is being removed, also make sure to remove your custom controls too.
+				When your plugin is deactivated, make sure to remove your custom control with [method remove_control_from_container] and free it with [code]queue_free()[/code].
 			</description>
 		</method>
 		<method name="add_control_to_dock">
@@ -57,7 +57,7 @@
 			<description>
 				Add the control to a specific dock slot (see DOCK_* enum for options).
 				If the dock is repositioned and as long as the plugin is active, the editor will save the dock position on further sessions.
-				If your plugin is being removed, also make sure to remove your control by calling [method remove_control_from_docks].
+				When your plugin is deactivated, make sure to remove your custom control with [method remove_control_from_docks] and free it with [code]queue_free()[/code].
 			</description>
 		</method>
 		<method name="add_custom_type">
@@ -74,7 +74,7 @@
 			<description>
 				Add a custom type, which will appear in the list of nodes or resources. An icon can be optionally passed.
 				When given node or resource is selected, the base type will be instanced (ie, "Spatial", "Control", "Resource"), then the script will be loaded and set to this object.
-				You can use the [method EditorPlugin.handles] to check if your custom object is being edited by checking the script or using 'is' keyword.
+				You can use the virtual method [method handles] to check if your custom object is being edited by checking the script or using 'is' keyword.
 				During run-time, this will be a simple object with a script so this function does not need to be called then.
 			</description>
 		</method>
@@ -122,7 +122,7 @@
 			<argument index="3" name="ud" type="Variant" default="null">
 			</argument>
 			<description>
-				Adds a custom menu to 'Project &gt; Tools' as [code]name[/code] that calls [code]callback[/code] on an instance of [code]handler[/code] with a parameter [code]ud[/code] when user activates it.
+				Add a custom menu to 'Project &gt; Tools' as [code]name[/code] that calls [code]callback[/code] on an instance of [code]handler[/code] with a parameter [code]ud[/code] when user activates it.
 			</description>
 		</method>
 		<method name="add_tool_submenu_item">
@@ -133,6 +133,7 @@
 			<argument index="1" name="submenu" type="Object">
 			</argument>
 			<description>
+				Like [method add_tool_menu_item] but adds the [code]submenu[/code] item inside the [code]name[/code] menu.
 			</description>
 		</method>
 		<method name="apply_changes" qualifiers="virtual">
@@ -165,15 +166,21 @@
 				This function is used for plugins that edit specific object types (nodes or resources). It requests the editor to edit the given object.
 			</description>
 		</method>
-		<method name="forward_canvas_gui_input" qualifiers="virtual">
-			<return type="bool">
+		<method name="forward_canvas_draw_over_viewport" qualifiers="virtual">
+			<return type="void">
 			</return>
-			<argument index="0" name="event" type="InputEvent">
+			<argument index="0" name="overlay" type="Control">
 			</argument>
 			<description>
+				This method is called when there is an input event in the 2D viewport, e.g. the user clicks with the mouse in the 2D space (canvas GUI). Keep in mind that for this method to be called you have to first declare the virtual method [method handles] so the editor knows that you want to work with the workspace:
+				[codeblock]
+				func handles(object):
+				    return true
+				[/codeblock]
+				Also note that the edited scene must have a root node.
 			</description>
 		</method>
-		<method name="forward_draw_over_viewport" qualifiers="virtual">
+		<method name="forward_canvas_force_draw_over_viewport" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="overlay" type="Control">
@@ -181,10 +188,10 @@
 			<description>
 			</description>
 		</method>
-		<method name="forward_force_draw_over_viewport" qualifiers="virtual">
-			<return type="void">
+		<method name="forward_canvas_gui_input" qualifiers="virtual">
+			<return type="bool">
 			</return>
-			<argument index="0" name="overlay" type="Control">
+			<argument index="0" name="event" type="InputEvent">
 			</argument>
 			<description>
 			</description>
@@ -197,8 +204,12 @@
 			<argument index="1" name="event" type="InputEvent">
 			</argument>
 			<description>
-				Implement this function if you are interested in 3D view screen input events. It will be called only if currently selected node is handled by your plugin.
-				If you would like to always gets those input events then additionally use [method set_input_forwarding_always_enabled].
+				This method is called when there is an input event in the 3D viewport, e.g. the user clicks with the mouse in the 3D space (spatial GUI). Keep in mind that for this method to be called you have to first declare the virtual method [method handles] so the editor knows that you want to work with the workspace:
+				[codeblock]
+				func handles(object):
+				    return true
+				[/codeblock]
+				Also note that the edited scene must have a root node.
 			</description>
 		</method>
 		<method name="get_breakpoints" qualifiers="virtual">
@@ -212,6 +223,7 @@
 			<return type="EditorInterface">
 			</return>
 			<description>
+				Return the [EditorInterface] object that gives you control over Godot editor's window and its functionalities.
 			</description>
 		</method>
 		<method name="get_plugin_icon" qualifiers="virtual">
@@ -253,7 +265,7 @@
 			<argument index="0" name="layout" type="ConfigFile">
 			</argument>
 			<description>
-				Get the GUI layout of the plugin. This is used to save the project's editor layout when the [method EditorPlugin.queue_save_layout] is called or the editor layout was changed(For example changing the position of a dock).
+				Get the GUI layout of the plugin. This is used to save the project's editor layout when [method queue_save_layout] is called or the editor layout was changed(For example changing the position of a dock).
 			</description>
 		</method>
 		<method name="handles" qualifiers="virtual">
@@ -262,14 +274,14 @@
 			<argument index="0" name="object" type="Object">
 			</argument>
 			<description>
-				Implement this function if your plugin edits a specific type of object (Resource or Node). If you return true, then you will get the functions [method EditorPlugin.edit] and [method EditorPlugin.make_visible] called when the editor requests them.
+				Implement this function if your plugin edits a specific type of object (Resource or Node). If you return true, then you will get the functions [method EditorPlugin.edit] and [method EditorPlugin.make_visible] called when the editor requests them. If you have declared the methods [method forward_canvas_gui_input] and [method forward_spatial_gui_input] these will be called too.
 			</description>
 		</method>
 		<method name="has_main_screen" qualifiers="virtual">
 			<return type="bool">
 			</return>
 			<description>
-				Return true if this is a main screen editor plugin (it goes in the main screen selector together with 2D, 3D, Script).
+				Return true if this is a main screen editor plugin (it goes in the workspaces selector together with '2D', '3D', and 'Script').
 			</description>
 		</method>
 		<method name="hide_bottom_panel">
@@ -318,7 +330,7 @@
 			<argument index="0" name="control" type="Control">
 			</argument>
 			<description>
-				Remove the control from the bottom panel. Don't forget to call this if you added one, so the editor can remove it cleanly.
+				Remove the control from the bottom panel. You have to manually [code]queue_free()[/code] the control.
 			</description>
 		</method>
 		<method name="remove_control_from_container">
@@ -329,7 +341,7 @@
 			<argument index="1" name="control" type="Control">
 			</argument>
 			<description>
-				Remove the control from the specified container. Use it when cleaning up after adding a control with [method add_control_to_container]. Note that you can simply free the control if you won't use it anymore.
+				Remove the control from the specified container. You have to manually [code]queue_free()[/code] the control.
 			</description>
 		</method>
 		<method name="remove_control_from_docks">
@@ -338,7 +350,7 @@
 			<argument index="0" name="control" type="Control">
 			</argument>
 			<description>
-				Remove the control from the dock. Don't forget to call this if you added one, so the editor can save the layout and remove it cleanly.
+				Remove the control from the dock. You have to manually [code]queue_free()[/code] the control.
 			</description>
 		</method>
 		<method name="remove_custom_type">
@@ -347,7 +359,7 @@
 			<argument index="0" name="type" type="String">
 			</argument>
 			<description>
-				Remove a custom type added by [method EditorPlugin.add_custom_type]
+				Remove a custom type added by [method add_custom_type]
 			</description>
 		</method>
 		<method name="remove_export_plugin">
@@ -441,7 +453,7 @@
 			<argument index="0" name="screen_name" type="String">
 			</argument>
 			<description>
-				Emitted when user change main screen view (2D, 3D, Script, AssetLib). Works also with screens which are defined by plugins.
+				Emitted when user change the workspace (2D, 3D, Script, AssetLib). Also works with custom screens defined by plugins.
 			</description>
 		</signal>
 		<signal name="resource_saved">
diff --git a/doc/classes/EditorResourcePreviewGenerator.xml b/doc/classes/EditorResourcePreviewGenerator.xml
index fb9af47b1f..c4dcbbbc82 100644
--- a/doc/classes/EditorResourcePreviewGenerator.xml
+++ b/doc/classes/EditorResourcePreviewGenerator.xml
@@ -16,10 +16,12 @@
 			</return>
 			<argument index="0" name="from" type="Resource">
 			</argument>
+			<argument index="1" name="size" type="Vector2">
+			</argument>
 			<description>
-				Generate a preview from a given resource. This must be always implemented.
-			Returning an empty texture is an OK way to fail and let another generator take care.
-			Care must be taken because this function is always called from a thread (not the main thread).
+				Generate a preview from a given resource with the specified size. This must always be implemented.
+				Returning an empty texture is an OK way to fail and let another generator take care.
+				Care must be taken because this function is always called from a thread (not the main thread).
 			</description>
 		</method>
 		<method name="generate_from_path" qualifiers="virtual">
@@ -27,10 +29,12 @@
 			</return>
 			<argument index="0" name="path" type="String">
 			</argument>
+			<argument index="1" name="size" type="Vector2">
+			</argument>
 			<description>
-				Generate a preview directly from a path, implementing this is optional, as default code will load and call generate()
-			Returning an empty texture is an OK way to fail and let another generator take care.
-			Care must be taken because this function is always called from a thread (not the main thread).
+				Generate a preview directly from a path with the specified size. Implementing this is optional, as default code will load and call [method generate].
+				Returning an empty texture is an OK way to fail and let another generator take care.
+				Care must be taken because this function is always called from a thread (not the main thread).
 			</description>
 		</method>
 		<method name="handles" qualifiers="virtual">
diff --git a/doc/classes/EditorScenePostImport.xml b/doc/classes/EditorScenePostImport.xml
index 09cae25403..76c105dd25 100644
--- a/doc/classes/EditorScenePostImport.xml
+++ b/doc/classes/EditorScenePostImport.xml
@@ -4,44 +4,45 @@
 		Post process scenes after import
 	</brief_description>
 	<description>
-		The imported scene can be automatically modified right after import by specifying a 'custom script' that inherits from this class. The [method post_import]-method receives the imported scene's root-node and returns the modified version of the scene
-	</description>
-	<tutorials>
-		<link>http://docs.godotengine.org/en/latest/learning/workflow/assets/importing_scenes.html?highlight=post%20import</link>
-	</tutorials>
-	<demos>
+		Imported scenes can be automatically modified right after import by setting their [i]Custom Script[/i] Import property to a [code]tool[/code] script that inherits from this class.
+		The [method post_import] callback receives the imported scene's root node and returns the modified version of the scene. Usage example:
 		[codeblock]
-tool # needed so it runs in editor
-extends EditorScenePostImport
+		tool # needed so it runs in editor
+		extends EditorScenePostImport
 
-# This sample changes all node names
+		# This sample changes all node names
 
-# get called right after the scene is imported and gets the root-node
-func post_import(scene):
-	# change all node names to "modified_[oldnodename]"
-    iterate(scene)
-    return scene # remember to return the imported scene
+		# Called right after the scene is imported and gets the root node
+		func post_import(scene):
+		    # change all node names to "modified_[oldnodename]"
+		    iterate(scene)
+		    return scene # remember to return the imported scene
 
-func iterate(node):
-    if node!=null:
-        node.name = "modified_"+node.name
-        for child in node.get_children():
-            iterate(child)	
-[/codeblock]
+		func iterate(node):
+		    if node != null:
+		        node.name = "modified_"+node.name
+		        for child in node.get_children():
+		            iterate(child)
+		[/codeblock]
+	</description>
+	<tutorials>
+		<link>http://docs.godotengine.org/en/latest/getting_started/workflow/assets/importing_scenes.html#custom-script</link>
+	</tutorials>
+	<demos>
 	</demos>
 	<methods>
 		<method name="get_source_file" qualifiers="const">
 			<return type="String">
 			</return>
 			<description>
-				Returns the source-file-path which got imported (e.g. [code]res://scene.dae[/code] )
+				Returns the source file path which got imported (e.g. [code]res://scene.dae[/code]).
 			</description>
 		</method>
 		<method name="get_source_folder" qualifiers="const">
 			<return type="String">
 			</return>
 			<description>
-				Returns the resource-folder the imported scene-file is located in
+				Returns the resource folder the imported scene file is located in.
 			</description>
 		</method>
 		<method name="post_import" qualifiers="virtual">
@@ -50,7 +51,7 @@ func iterate(node):
 			<argument index="0" name="scene" type="Object">
 			</argument>
 			<description>
-				Gets called after the scene got imported and has to return the modified version of the scene
+				Gets called after the scene got imported and has to return the modified version of the scene.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/EditorSettings.xml b/doc/classes/EditorSettings.xml
index bd85075b7e..9d48669a6b 100644
--- a/doc/classes/EditorSettings.xml
+++ b/doc/classes/EditorSettings.xml
@@ -48,11 +48,11 @@
 				Erase a given setting (pass full property path).
 			</description>
 		</method>
-		<method name="get_favorite_dirs" qualifiers="const">
+		<method name="get_favorites" qualifiers="const">
 			<return type="PoolStringArray">
 			</return>
 			<description>
-				Get the list of favorite directories for this project.
+				Get the list of favorite files and directories for this project.
 			</description>
 		</method>
 		<method name="get_project_metadata" qualifiers="const">
@@ -122,13 +122,13 @@
 			<description>
 			</description>
 		</method>
-		<method name="set_favorite_dirs">
+		<method name="set_favorites">
 			<return type="void">
 			</return>
 			<argument index="0" name="dirs" type="PoolStringArray">
 			</argument>
 			<description>
-				Set the list of favorite directories for this project.
+				Set the list of favorite files and directories for this project.
 			</description>
 		</method>
 		<method name="set_initial_value">
diff --git a/doc/classes/Image.xml b/doc/classes/Image.xml
index 55693bd49c..56accdcd9e 100644
--- a/doc/classes/Image.xml
+++ b/doc/classes/Image.xml
@@ -487,10 +487,10 @@
 			OpenGL texture format RG with two components and a bitdepth of 8 for each.
 		</constant>
 		<constant name="FORMAT_RGB8" value="4" enum="Format">
-			OpenGL texture format RGB with three components, each with a bitdepth of 8.
+			OpenGL texture format RGB with three components, each with a bitdepth of 8. Note that when creating an [ImageTexture], an sRGB to linear color space conversion is performed.
 		</constant>
 		<constant name="FORMAT_RGBA8" value="5" enum="Format">
-			OpenGL texture format RGBA with four components, each with a bitdepth of 8.
+			OpenGL texture format RGBA with four components, each with a bitdepth of 8. Note that when creating an [ImageTexture], an sRGB to linear color space conversion is performed.
 		</constant>
 		<constant name="FORMAT_RGBA4444" value="6" enum="Format">
 			OpenGL texture format RGBA with four components, each with a bitdepth of 4.
@@ -526,13 +526,13 @@
 			A special OpenGL texture format where the three color components have 9 bits of precision and all three share a single exponent.
 		</constant>
 		<constant name="FORMAT_DXT1" value="17" enum="Format">
-			The S3TC texture format that uses Block Compression 1, and is the smallest variation of S3TC, only providing 1 bit of alpha and color data being premultiplied with alpha. More information can be found at https://www.khronos.org/opengl/wiki/S3_Texture_Compression.
+			The S3TC texture format that uses Block Compression 1, and is the smallest variation of S3TC, only providing 1 bit of alpha and color data being premultiplied with alpha. More information can be found at https://www.khronos.org/opengl/wiki/S3_Texture_Compression. Note that when creating an [ImageTexture], an sRGB to linear color space conversion is performed.
 		</constant>
 		<constant name="FORMAT_DXT3" value="18" enum="Format">
-			The S3TC texture format that uses Block Compression 2, and color data is interpreted as not having been premultiplied by alpha. Well suited for images with sharp alpha transitions between translucent and opaque areas.
+			The S3TC texture format that uses Block Compression 2, and color data is interpreted as not having been premultiplied by alpha. Well suited for images with sharp alpha transitions between translucent and opaque areas. Note that when creating an [ImageTexture], an sRGB to linear color space conversion is performed.
 		</constant>
 		<constant name="FORMAT_DXT5" value="19" enum="Format">
-			The S3TC texture format also known as Block Compression 3 or BC3 that contains 64 bits of alpha channel data followed by 64 bits of DXT1-encoded color data. Color data is not premultiplied by alpha, same as DXT3. DXT5 generally produces superior results for transparency gradients than DXT3.
+			The S3TC texture format also known as Block Compression 3 or BC3 that contains 64 bits of alpha channel data followed by 64 bits of DXT1-encoded color data. Color data is not premultiplied by alpha, same as DXT3. DXT5 generally produces superior results for transparency gradients than DXT3. Note that when creating an [ImageTexture], an sRGB to linear color space conversion is performed.
 		</constant>
 		<constant name="FORMAT_RGTC_R" value="20" enum="Format">
 			Texture format that uses Red Green Texture Compression, normalizing the red channel data using the same compression algorithm that DXT5 uses for the alpha channel. More information can be found here https://www.khronos.org/opengl/wiki/Red_Green_Texture_Compression.
@@ -541,7 +541,7 @@
 			Texture format that uses Red Green Texture Compression, normalizing the red and green channel data using the same compression algorithm that DXT5 uses for the alpha channel.
 		</constant>
 		<constant name="FORMAT_BPTC_RGBA" value="22" enum="Format">
-			Texture format that uses BPTC compression with unsigned normalized RGBA components. More information can be found at https://www.khronos.org/opengl/wiki/BPTC_Texture_Compression.
+			Texture format that uses BPTC compression with unsigned normalized RGBA components. More information can be found at https://www.khronos.org/opengl/wiki/BPTC_Texture_Compression. Note that when creating an [ImageTexture], an sRGB to linear color space conversion is performed.
 		</constant>
 		<constant name="FORMAT_BPTC_RGBF" value="23" enum="Format">
 			Texture format that uses BPTC compression with signed floating-point RGB components.
@@ -550,7 +550,7 @@
 			Texture format that uses BPTC compression with unsigned floating-point RGB components.
 		</constant>
 		<constant name="FORMAT_PVRTC2" value="25" enum="Format">
-			Texture format used on PowerVR-supported mobile platforms, uses 2 bit color depth with no alpha. More information on PVRTC can be found here https://en.wikipedia.org/wiki/PVRTC.
+			Texture format used on PowerVR-supported mobile platforms, uses 2 bit color depth with no alpha. More information on PVRTC can be found here https://en.wikipedia.org/wiki/PVRTC. Note that when creating an [ImageTexture], an sRGB to linear color space conversion is performed.
 		</constant>
 		<constant name="FORMAT_PVRTC2A" value="26" enum="Format">
 			Same as PVRTC2, but with an alpha component.
@@ -577,13 +577,13 @@
 			Ericsson Texture Compression format 2 variant SIGNED_RG11_EAC, which provides two channels of signed data.
 		</constant>
 		<constant name="FORMAT_ETC2_RGB8" value="34" enum="Format">
-			Ericsson Texture Compression format 2 variant RGB8, which is a followup of ETC1 and compresses RGB888 data.
+			Ericsson Texture Compression format 2 variant RGB8, which is a followup of ETC1 and compresses RGB888 data. Note that when creating an [ImageTexture], an sRGB to linear color space conversion is performed.
 		</constant>
 		<constant name="FORMAT_ETC2_RGBA8" value="35" enum="Format">
-			Ericsson Texture Compression format 2 variant RGBA8, which compresses RGBA8888 data with full alpha support.
+			Ericsson Texture Compression format 2 variant RGBA8, which compresses RGBA8888 data with full alpha support. Note that when creating an [ImageTexture], an sRGB to linear color space conversion is performed.
 		</constant>
 		<constant name="FORMAT_ETC2_RGB8A1" value="36" enum="Format">
-			Ericsson Texture Compression format 2 variant RGB8_PUNCHTHROUGH_ALPHA1, which compresses RGBA data to make alpha either fully transparent or fully opaque.
+			Ericsson Texture Compression format 2 variant RGB8_PUNCHTHROUGH_ALPHA1, which compresses RGBA data to make alpha either fully transparent or fully opaque. Note that when creating an [ImageTexture], an sRGB to linear color space conversion is performed.
 		</constant>
 		<constant name="FORMAT_MAX" value="37" enum="Format">
 		</constant>
diff --git a/doc/classes/ImageTexture.xml b/doc/classes/ImageTexture.xml
index 0bff3317db..5c57899468 100644
--- a/doc/classes/ImageTexture.xml
+++ b/doc/classes/ImageTexture.xml
@@ -36,7 +36,7 @@
 			<argument index="1" name="flags" type="int" default="7">
 			</argument>
 			<description>
-				Create a new [code]ImageTexture[/code] from an [Image] with "flags" from [Texture].FLAG_*.
+				Create a new [code]ImageTexture[/code] from an [Image] with "flags" from [Texture].FLAG_*. An sRGB to linear color space conversion can take place, according to [Image].FORMAT_*.
 			</description>
 		</method>
 		<method name="get_format" qualifiers="const">
diff --git a/doc/classes/PhysicsBody.xml b/doc/classes/PhysicsBody.xml
index 14053c6a35..af00027ed3 100644
--- a/doc/classes/PhysicsBody.xml
+++ b/doc/classes/PhysicsBody.xml
@@ -27,6 +27,7 @@
 			<argument index="0" name="bit" type="int">
 			</argument>
 			<description>
+				Returns an individual bit on the collision mask.
 			</description>
 		</method>
 		<method name="get_collision_mask_bit" qualifiers="const">
@@ -35,6 +36,7 @@
 			<argument index="0" name="bit" type="int">
 			</argument>
 			<description>
+				Returns an individual bit on the collision mask.
 			</description>
 		</method>
 		<method name="remove_collision_exception_with">
@@ -54,6 +56,7 @@
 			<argument index="1" name="value" type="bool">
 			</argument>
 			<description>
+				Sets individual bits on the layer mask. Use this if you only need to change one layer's value.
 			</description>
 		</method>
 		<method name="set_collision_mask_bit">
@@ -64,6 +67,7 @@
 			<argument index="1" name="value" type="bool">
 			</argument>
 			<description>
+				Sets individual bits on the collision mask. Use this if you only need to change one layer's value.
 			</description>
 		</method>
 	</methods>
@@ -74,7 +78,7 @@
 			A contact is detected if object A is in any of the layers that object B scans, or object B is in any layer scanned by object A.
 		</member>
 		<member name="collision_mask" type="int" setter="set_collision_mask" getter="get_collision_mask">
-			The physics layers this area can scan for collisions.
+			The physics layers this area scans for collisions.
 		</member>
 	</members>
 	<constants>
diff --git a/doc/classes/PhysicsBody2D.xml b/doc/classes/PhysicsBody2D.xml
index ccc704c7ec..4278979049 100644
--- a/doc/classes/PhysicsBody2D.xml
+++ b/doc/classes/PhysicsBody2D.xml
@@ -27,7 +27,7 @@
 			<argument index="0" name="bit" type="int">
 			</argument>
 			<description>
-				Return an individual bit on the collision mask.
+				Returns an individual bit on the collision mask.
 			</description>
 		</method>
 		<method name="get_collision_mask_bit" qualifiers="const">
@@ -36,7 +36,7 @@
 			<argument index="0" name="bit" type="int">
 			</argument>
 			<description>
-				Return an individual bit on the collision mask.
+				Returns an individual bit on the collision mask.
 			</description>
 		</method>
 		<method name="remove_collision_exception_with">
@@ -56,7 +56,7 @@
 			<argument index="1" name="value" type="bool">
 			</argument>
 			<description>
-				Set/clear individual bits on the layer mask. This makes getting a body in/out of only one layer easier.
+				Sets individual bits on the layer mask. Use this if you only need to change one layer's value.
 			</description>
 		</method>
 		<method name="set_collision_mask_bit">
@@ -67,7 +67,7 @@
 			<argument index="1" name="value" type="bool">
 			</argument>
 			<description>
-				Set/clear individual bits on the collision mask. This makes selecting the areas scanned easier.
+				Sets individual bits on the collision mask. Use this if you only need to change one layer's value.
 			</description>
 		</method>
 	</methods>
@@ -78,10 +78,10 @@
 			A contact is detected if object A is in any of the layers that object B scans, or object B is in any layer scanned by object A.
 		</member>
 		<member name="collision_mask" type="int" setter="set_collision_mask" getter="get_collision_mask">
-			The physics layers this area can scan for collisions.
+			The physics layers this area scans for collisions.
 		</member>
 		<member name="layers" type="int" setter="_set_layers" getter="_get_layers">
-			Both collision_layer and collision_mask. Returns collision_layer when accessed. Updates collision_layers and collision_mask when modified.
+			Both [member collision_layer] and [member collision_mask]. Returns [member collision_layer] when accessed. Updates [member collision_layer] and [member collision_mask] when modified.
 		</member>
 	</members>
 	<constants>
diff --git a/doc/classes/ProjectSettings.xml b/doc/classes/ProjectSettings.xml
index 548d60fe35..c05d6bc849 100644
--- a/doc/classes/ProjectSettings.xml
+++ b/doc/classes/ProjectSettings.xml
@@ -609,9 +609,6 @@
 		<member name="network/remote_fs/page_size" type="int" setter="" getter="">
 			Page size used by remote filesystem.
 		</member>
-		<member name="network/ssl/certificates" type="String" setter="" getter="">
-			If your game or application uses HTTPS, a certificates file is needed. It must be set here.
-		</member>
 		<member name="node/name_casing" type="int" setter="" getter="">
 			When creating nodes names automatically, set the type of casing in this project. This is mostly an editor setting.
 		</member>
diff --git a/doc/classes/SceneState.xml b/doc/classes/SceneState.xml
index 36cddf08df..bd2f883cae 100644
--- a/doc/classes/SceneState.xml
+++ b/doc/classes/SceneState.xml
@@ -4,7 +4,7 @@
 		A script interface to a scene file's data.
 	</brief_description>
 	<description>
-		Maintains a list of resources, nodes, exported and overridden properties, and built-in scripts associated with a scene.
+		Maintains a list of resources, nodes, exported, and overridden properties, and built-in scripts associated with a scene.
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/doc/classes/Shape2D.xml b/doc/classes/Shape2D.xml
index 6c13496fc4..2772538cec 100644
--- a/doc/classes/Shape2D.xml
+++ b/doc/classes/Shape2D.xml
@@ -22,7 +22,7 @@
 			<argument index="2" name="shape_xform" type="Transform2D">
 			</argument>
 			<description>
-				Return whether this shape is colliding with another.
+				Returns [code]true[/code] if this shape is colliding with another.
 				This method needs the transformation matrix for this shape ([code]local_xform[/code]), the shape to check collisions with ([code]with_shape[/code]), and the transformation matrix of that shape ([code]shape_xform[/code]).
 			</description>
 		</method>
@@ -36,7 +36,7 @@
 			<argument index="2" name="shape_xform" type="Transform2D">
 			</argument>
 			<description>
-				Return a list of the points where this shape touches another. If there are no collisions, the list is empty.
+				Returns a list of the points where this shape touches another. If there are no collisions the list is empty.
 				This method needs the transformation matrix for this shape ([code]local_xform[/code]), the shape to check collisions with ([code]with_shape[/code]), and the transformation matrix of that shape ([code]shape_xform[/code]).
 			</description>
 		</method>
@@ -72,7 +72,7 @@
 			<argument index="4" name="shape_motion" type="Vector2">
 			</argument>
 			<description>
-				Return a list of the points where this shape would touch another, if a given movement was applied. If there are no collisions, the list is empty.
+				Returns a list of the points where this shape would touch another, if a given movement was applied. If there are no collisions the list is empty.
 				This method needs the transformation matrix for this shape ([code]local_xform[/code]), the movement to test on this shape ([code]local_motion[/code]), the shape to check collisions with ([code]with_shape[/code]), the transformation matrix of that shape ([code]shape_xform[/code]), and the movement to test onto the other object ([code]shape_motion[/code]).
 			</description>
 		</method>
diff --git a/doc/classes/ShortCut.xml b/doc/classes/ShortCut.xml
index 6da9d7c59d..1b5fc035c2 100644
--- a/doc/classes/ShortCut.xml
+++ b/doc/classes/ShortCut.xml
@@ -16,7 +16,7 @@
 			<return type="String">
 			</return>
 			<description>
-				Returns the Shortcut's [InputEvent] as a [String].
+				Returns the shortcut's [InputEvent] as a [String].
 			</description>
 		</method>
 		<method name="is_shortcut" qualifiers="const">
@@ -25,20 +25,20 @@
 			<argument index="0" name="event" type="InputEvent">
 			</argument>
 			<description>
-				Returns [code]true[/code] if the Shortcut's [InputEvent] equals [code]event[/code].
+				Returns [code]true[/code] if the shortcut's [InputEvent] equals [code]event[/code].
 			</description>
 		</method>
 		<method name="is_valid" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-				If [code]true[/code] this Shortcut is valid.
+				If [code]true[/code] this shortcut is valid.
 			</description>
 		</method>
 	</methods>
 	<members>
 		<member name="shortcut" type="InputEvent" setter="set_shortcut" getter="get_shortcut">
-			The Shortcut's [InputEvent].
+			The shortcut's [InputEvent].
 			Generally the [InputEvent] is a keyboard key, though it can be any [InputEvent].
 		</member>
 	</members>
diff --git a/doc/classes/SoftBody.xml b/doc/classes/SoftBody.xml
index c3c789a6de..196d29fc60 100644
--- a/doc/classes/SoftBody.xml
+++ b/doc/classes/SoftBody.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class name="SoftBody" inherits="MeshInstance" category="Core" version="3.1">
 	<brief_description>
+		A soft mesh physics body.
 	</brief_description>
 	<description>
+		A deformable physics body. Used to create elastic or deformable objects such as cloth, rubber, or other flexible materials.
 	</description>
 	<tutorials>
 	</tutorials>
@@ -15,6 +17,7 @@
 			<argument index="0" name="body" type="Node">
 			</argument>
 			<description>
+				Adds a body to the list of bodies that this body can't collide with.
 			</description>
 		</method>
 		<method name="get_collision_layer_bit" qualifiers="const">
@@ -23,6 +26,7 @@
 			<argument index="0" name="bit" type="int">
 			</argument>
 			<description>
+				Returns an individual bit on the collision mask.
 			</description>
 		</method>
 		<method name="get_collision_mask_bit" qualifiers="const">
@@ -31,6 +35,7 @@
 			<argument index="0" name="bit" type="int">
 			</argument>
 			<description>
+				Returns an individual bit on the collision mask.
 			</description>
 		</method>
 		<method name="is_ray_pickable" qualifiers="const">
@@ -45,6 +50,7 @@
 			<argument index="0" name="body" type="Node">
 			</argument>
 			<description>
+				Removes a body from the list of bodies that this body can't collide with.
 			</description>
 		</method>
 		<method name="set_collision_layer_bit">
@@ -55,6 +61,7 @@
 			<argument index="1" name="value" type="bool">
 			</argument>
 			<description>
+				Sets individual bits on the layer mask. Use this if you only need to change one layer's value.
 			</description>
 		</method>
 		<method name="set_collision_mask_bit">
@@ -65,6 +72,7 @@
 			<argument index="1" name="value" type="bool">
 			</argument>
 			<description>
+				Sets individual bits on the collision mask. Use this if you only need to change one layer's value.
 			</description>
 		</method>
 		<method name="set_ray_pickable">
@@ -80,8 +88,12 @@
 		<member name="areaAngular_stiffness" type="float" setter="set_areaAngular_stiffness" getter="get_areaAngular_stiffness">
 		</member>
 		<member name="collision_layer" type="int" setter="set_collision_layer" getter="get_collision_layer">
+			The physics layers this area is in.
+			Collidable objects can exist in any of 32 different layers. These layers work like a tagging system, and are not visual. A collidable can use these layers to select with which objects it can collide, using the collision_mask property.
+			A contact is detected if object A is in any of the layers that object B scans, or object B is in any layer scanned by object A.
 		</member>
 		<member name="collision_mask" type="int" setter="set_collision_mask" getter="get_collision_mask">
+			The physics layers this area scans for collisions.
 		</member>
 		<member name="damping_coefficient" type="float" setter="set_damping_coefficient" getter="get_damping_coefficient">
 		</member>
@@ -96,6 +108,7 @@
 		<member name="pressure_coefficient" type="float" setter="set_pressure_coefficient" getter="get_pressure_coefficient">
 		</member>
 		<member name="simulation_precision" type="int" setter="set_simulation_precision" getter="get_simulation_precision">
+			Increasing this value will improve the resulting simulation, but can affect performance. Use with care.
 		</member>
 		<member name="total_mass" type="float" setter="set_total_mass" getter="get_total_mass">
 		</member>
diff --git a/doc/classes/StreamPeer.xml b/doc/classes/StreamPeer.xml
index ebe29c7e24..74ac8a79c0 100644
--- a/doc/classes/StreamPeer.xml
+++ b/doc/classes/StreamPeer.xml
@@ -81,10 +81,10 @@
 		<method name="get_string">
 			<return type="String">
 			</return>
-			<argument index="0" name="bytes" type="int">
+			<argument index="0" name="bytes" type="int" default="-1">
 			</argument>
 			<description>
-				Get a string with byte-length "bytes" from the stream.
+				Get a string with byte-length [code]bytes[/code] from the stream. If [code]bytes[/code] is negative (default) the length will be read from the stream using the reverse process of [method put_string].
 			</description>
 		</method>
 		<method name="get_u16">
@@ -118,10 +118,10 @@
 		<method name="get_utf8_string">
 			<return type="String">
 			</return>
-			<argument index="0" name="bytes" type="int">
+			<argument index="0" name="bytes" type="int" default="-1">
 			</argument>
 			<description>
-				Get a utf8 string with byte-length "bytes" from the stream (this decodes the string sent as utf8).
+				Get a utf8 string with byte-length [code]bytes[/code] from the stream (this decodes the string sent as utf8). If [code]bytes[/code] is negative (default) the length will be read from the stream using the reverse process of [method put_utf8_string].
 			</description>
 		</method>
 		<method name="get_var">
@@ -203,6 +203,15 @@
 				Send a chunk of data through the connection, if all the data could not be sent at once, only part of it will. This function returns two values, an Error code and an integer, describing how much data was actually sent.
 			</description>
 		</method>
+		<method name="put_string">
+			<return type="void">
+			</return>
+			<argument index="0" name="value" type="String">
+			</argument>
+			<description>
+				Put a zero-terminated ascii string into the stream prepended by a 32 bits unsigned integer representing its size.
+			</description>
+		</method>
 		<method name="put_u16">
 			<return type="void">
 			</return>
@@ -245,7 +254,7 @@
 			<argument index="0" name="value" type="String">
 			</argument>
 			<description>
-				Put a zero-terminated utf8 string into the stream.
+				Put a zero-terminated utf8 string into the stream prepended by a 32 bits unsigned integer representing its size.
 			</description>
 		</method>
 		<method name="put_var">
diff --git a/doc/classes/Timer.xml b/doc/classes/Timer.xml
index d1c8722901..65d638c4c0 100644
--- a/doc/classes/Timer.xml
+++ b/doc/classes/Timer.xml
@@ -32,25 +32,26 @@
 			<return type="void">
 			</return>
 			<description>
-				Stop (cancel) the Timer.
+				Stops the timer.
 			</description>
 		</method>
 	</methods>
 	<members>
 		<member name="autostart" type="bool" setter="set_autostart" getter="has_autostart">
-			If [code]true[/code], Timer will automatically start when entering the scene tree. Default value: [code]false[/code].
+			If [code]true[/code] the timer will automatically start when entering the scene tree. Default value: [code]false[/code].
 		</member>
 		<member name="one_shot" type="bool" setter="set_one_shot" getter="is_one_shot">
-			If [code]true[/code], Timer will stop when reaching 0. If [code]false[/code], it will restart. Default value: [code]false[/code].
+			If [code]true[/code] the timer will stop when reaching 0. If [code]false[/code] it will restart. Default value: [code]false[/code].
 		</member>
 		<member name="paused" type="bool" setter="set_paused" getter="is_paused">
-			If [code]true[/code], the timer is paused and will not process until it is unpaused again, even if [method start] is called.
+			If [code]true[/code] the timer is paused and will not process until it is unpaused again, even if [method start] is called.
 		</member>
 		<member name="process_mode" type="int" setter="set_timer_process_mode" getter="get_timer_process_mode" enum="Timer.TimerProcessMode">
-			Processing mode. Uses TIMER_PROCESS_* constants as value.
+			Processing mode. See [enum TimerProcessMode].
 		</member>
 		<member name="time_left" type="float" setter="" getter="get_time_left">
 			The timer's remaining time in seconds. Returns 0 if the timer is inactive.
+			Note: You cannot set this value. To change the timer's remaining time, use [member wait_time].
 		</member>
 		<member name="wait_time" type="float" setter="set_wait_time" getter="get_wait_time">
 			Wait time in seconds.
@@ -59,16 +60,16 @@
 	<signals>
 		<signal name="timeout">
 			<description>
-				Emitted when the Timer reaches 0.
+				Emitted when the timer reaches 0.
 			</description>
 		</signal>
 	</signals>
 	<constants>
 		<constant name="TIMER_PROCESS_PHYSICS" value="0" enum="TimerProcessMode">
-			Update the Timer during the physics step at each frame (fixed framerate processing).
+			Update the timer during the physics step at each frame (fixed framerate processing).
 		</constant>
 		<constant name="TIMER_PROCESS_IDLE" value="1" enum="TimerProcessMode">
-			Update the Timer during the idle time at each frame.
+			Update the timer during the idle time at each frame.
 		</constant>
 	</constants>
 </class>