19 files changed, 273 insertions, 76 deletions
diff --git a/doc/classes/AESContext.xml b/doc/classes/AESContext.xml
new file mode 100644
index 0000000000..ab4d0e0bc3
--- /dev/null
+++ b/doc/classes/AESContext.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class name="AESContext" inherits="Reference" version="4.0">
+	<brief_description>
+		Interface to low level AES encryption features.
+	</brief_description>
+	<description>
+		This class provides access to AES encryption/decryption of raw data. Both AES-ECB and AES-CBC mode are supported.
+		[codeblock]
+		extends Node
+
+		var aes = AESContext.new()
+
+		func _ready():
+		    var key = "My secret key!!!" # Key must be either 16 or 32 bytes.
+		    var data = "My secret text!!" # Data size must be multiple of 16 bytes, apply padding if needed.
+		    # Encrypt ECB
+		    aes.start(AESContext.MODE_ECB_ENCRYPT, key.to_utf8())
+		    var encrypted = aes.update(data.to_utf8())
+		    aes.finish()
+		    # Decrypt ECB
+		    aes.start(AESContext.MODE_ECB_DECRYPT, key.to_utf8())
+		    var decrypted = aes.update(encrypted)
+		    aes.finish()
+		    # Check ECB
+		    assert(decrypted == data.to_utf8())
+
+		    var iv = "My secret iv!!!!" # IV must be of exactly 16 bytes.
+		    # Encrypt CBC
+		    aes.start(AESContext.MODE_CBC_ENCRYPT, key.to_utf8(), iv.to_utf8())
+		    encrypted = aes.update(data.to_utf8())
+		    aes.finish()
+		    # Decrypt CBC
+		    aes.start(AESContext.MODE_CBC_DECRYPT, key.to_utf8(), iv.to_utf8())
+		    decrypted = aes.update(encrypted)
+		    aes.finish()
+		    # Check CBC
+		    assert(decrypted == data.to_utf8())
+		[/codeblock]
+	</description>
+	<tutorials>
+	</tutorials>
+	<methods>
+		<method name="finish">
+			<return type="void">
+			</return>
+			<description>
+				Close this AES context so it can be started again. See [method start].
+			</description>
+		</method>
+		<method name="get_iv_state">
+			<return type="PackedByteArray">
+			</return>
+			<description>
+				Get the current IV state for this context (IV gets updated when calling [method update]). You normally don't need this funciton.
+				Note: This function only makes sense when the context is started with [constant MODE_CBC_ENCRYPT] or [constant MODE_CBC_DECRYPT].
+			</description>
+		</method>
+		<method name="start">
+			<return type="int" enum="Error">
+			</return>
+			<argument index="0" name="mode" type="int" enum="AESContext.Mode">
+			</argument>
+			<argument index="1" name="key" type="PackedByteArray">
+			</argument>
+			<argument index="2" name="iv" type="PackedByteArray" default="PackedByteArray(  )">
+			</argument>
+			<description>
+				Start the AES context in the given [code]mode[/code]. A [code]key[/code] of either 16 or 32 bytes must always be provided, while an [code]iv[/code] (initialization vector) of exactly 16 bytes, is only needed when [code]mode[/code] is either [constant MODE_CBC_ENCRYPT] or [constant MODE_CBC_DECRYPT].
+			</description>
+		</method>
+		<method name="update">
+			<return type="PackedByteArray">
+			</return>
+			<argument index="0" name="src" type="PackedByteArray">
+			</argument>
+			<description>
+				Run the desired operation for this AES context. Will return a [PackedByteArray] containing the result of encrypting (or decrypting) the given [code]src[/code]. See [method start] for mode of operation.
+				Note: The size of [code]src[/code] must be a multiple of 16. Apply some padding if needed.
+			</description>
+		</method>
+	</methods>
+	<constants>
+		<constant name="MODE_ECB_ENCRYPT" value="0" enum="Mode">
+			AES electronic codebook encryption mode.
+		</constant>
+		<constant name="MODE_ECB_DECRYPT" value="1" enum="Mode">
+			AES electronic codebook decryption mode.
+		</constant>
+		<constant name="MODE_CBC_ENCRYPT" value="2" enum="Mode">
+			AES cipher blocker chaining encryption mode.
+		</constant>
+		<constant name="MODE_CBC_DECRYPT" value="3" enum="Mode">
+			AES cipher blocker chaining decryption mode.
+		</constant>
+		<constant name="MODE_MAX" value="4" enum="Mode">
+			Maximum value for the mode enum.
+		</constant>
+	</constants>
+</class>
diff --git a/doc/classes/Color.xml b/doc/classes/Color.xml
index b35d4fb36a..17b474531e 100644
--- a/doc/classes/Color.xml
+++ b/doc/classes/Color.xml
@@ -5,8 +5,9 @@
 	</brief_description>
 	<description>
 		A color is represented by red, green, and blue [code](r, g, b)[/code] components. Additionally, [code]a[/code] represents the alpha component, often used for transparency. Values are in floating-point and usually range from 0 to 1. Some properties (such as [member CanvasItem.modulate]) may accept values greater than 1.
-		You can also create a color from standardized color names by using [method @GDScript.ColorN] or directly using the color constants defined here. The standardized color set is based on the [url=https://en.wikipedia.org/wiki/X11_color_names]X11 color names[/url]. 
+		You can also create a color from standardized color names by using [method @GDScript.ColorN] or directly using the color constants defined here. The standardized color set is based on the [url=https://en.wikipedia.org/wiki/X11_color_names]X11 color names[/url].
 		If you want to supply values in a range of 0 to 255, you should use [method @GDScript.Color8].
+		[b]Note:[/b] In a boolean context, a Color will evaluate to [code]false[/code] if it's equal to [code]Color(0, 0, 0, 1)[/code] (opaque black). Otherwise, a Color will always evaluate to [code]true[/code].
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/doc/classes/Crypto.xml b/doc/classes/Crypto.xml
index 10f1f18f0d..4edb3eda0a 100644
--- a/doc/classes/Crypto.xml
+++ b/doc/classes/Crypto.xml
@@ -5,7 +5,7 @@
 	</brief_description>
 	<description>
 		The Crypto class allows you to access some more advanced cryptographic functionalities in Godot.
-		For now, this includes generating cryptographically secure random bytes, and RSA keys and self-signed X509 certificates generation. More functionalities are planned for future releases.
+		For now, this includes generating cryptographically secure random bytes, RSA keys and self-signed X509 certificates generation, asymmetric key encryption/decryption, and signing/verification.
 		[codeblock]
 		extends Node
 
@@ -21,12 +21,48 @@
 		    # Save key and certificate in the user folder.
 		    key.save("user://generated.key")
 		    cert.save("user://generated.crt")
+		    # Encryption
+		    var data = "Some data"
+		    var encrypted = crypto.encrypt(key, data.to_utf8())
+		    # Decryption
+		    var decrypted = crypto.decrypt(key, encrypted)
+		    # Signing
+		    var signature = crypto.sign(HashingContext.HASH_SHA256, data.sha256_buffer(), key)
+		    # Verifying
+		    var verified = crypto.verify(HashingContext.HASH_SHA256, data.sha256_buffer(), signature, key)
+		    # Checks
+		    assert(verified)
+		    assert(data.to_utf8() == decrypted)
 		[/codeblock]
 		[b]Note:[/b] Not available in HTML5 exports.
 	</description>
 	<tutorials>
 	</tutorials>
 	<methods>
+		<method name="decrypt">
+			<return type="PackedByteArray">
+			</return>
+			<argument index="0" name="key" type="CryptoKey">
+			</argument>
+			<argument index="1" name="ciphertext" type="PackedByteArray">
+			</argument>
+			<description>
+				Decrypt the given [code]ciphertext[/code] with the provided private [code]key[/code].
+				[b]Note[/b]: The maximum size of accepted ciphertext is limited by the key size.
+			</description>
+		</method>
+		<method name="encrypt">
+			<return type="PackedByteArray">
+			</return>
+			<argument index="0" name="key" type="CryptoKey">
+			</argument>
+			<argument index="1" name="plaintext" type="PackedByteArray">
+			</argument>
+			<description>
+				Encrypt the given [code]plaintext[/code] with the provided public [code]key[/code].
+				[b]Note[/b]: The maximum size of accepted plaintext is limited by the key size.
+			</description>
+		</method>
 		<method name="generate_random_bytes">
 			<return type="PackedByteArray">
 			</return>
@@ -68,6 +104,34 @@
 				[/codeblock]
 			</description>
 		</method>
+		<method name="sign">
+			<return type="PackedByteArray">
+			</return>
+			<argument index="0" name="hash_type" type="int" enum="HashingContext.HashType">
+			</argument>
+			<argument index="1" name="hash" type="PackedByteArray">
+			</argument>
+			<argument index="2" name="key" type="CryptoKey">
+			</argument>
+			<description>
+				Sign a given [code]hash[/code] of type [code]hash_type[/code] with the provided private [code]key[/code].
+			</description>
+		</method>
+		<method name="verify">
+			<return type="bool">
+			</return>
+			<argument index="0" name="hash_type" type="int" enum="HashingContext.HashType">
+			</argument>
+			<argument index="1" name="hash" type="PackedByteArray">
+			</argument>
+			<argument index="2" name="signature" type="PackedByteArray">
+			</argument>
+			<argument index="3" name="key" type="CryptoKey">
+			</argument>
+			<description>
+				Verify that a given [code]signature[/code] for [code]hash[/code] of type [code]hash_type[/code] against the provided public [code]key[/code].
+			</description>
+		</method>
 	</methods>
 	<constants>
 	</constants>
diff --git a/doc/classes/CryptoKey.xml b/doc/classes/CryptoKey.xml
index fe7f4b63f0..410c2262f9 100644
--- a/doc/classes/CryptoKey.xml
+++ b/doc/classes/CryptoKey.xml
@@ -11,13 +11,34 @@
 	<tutorials>
 	</tutorials>
 	<methods>
+		<method name="is_public_only" qualifiers="const">
+			<return type="bool">
+			</return>
+			<description>
+				Return [code]true[/code] if this CryptoKey only has the public part, and not the private one.
+			</description>
+		</method>
 		<method name="load">
 			<return type="int" enum="Error">
 			</return>
 			<argument index="0" name="path" type="String">
 			</argument>
+			<argument index="1" name="public_only" type="bool" default="false">
+			</argument>
+			<description>
+				Loads a key from [code]path[/code]. If [code]public_only[/code] is [code]true[/code], only the public key will be loaded.
+				[b]Note[/b]: [code]path[/code] should should be a "*.pub" file if [code]public_only[/code] is [code]true[/code], a "*.key" file otherwise.
+			</description>
+		</method>
+		<method name="load_from_string">
+			<return type="int" enum="Error">
+			</return>
+			<argument index="0" name="string_key" type="String">
+			</argument>
+			<argument index="1" name="public_only" type="bool" default="false">
+			</argument>
 			<description>
-				Loads a key from [code]path[/code] ("*.key" file).
+				Loads a key from the given [code]string[/code]. If [code]public_only[/code] is [code]true[/code], only the public key will be loaded.
 			</description>
 		</method>
 		<method name="save">
@@ -25,8 +46,20 @@
 			</return>
 			<argument index="0" name="path" type="String">
 			</argument>
+			<argument index="1" name="public_only" type="bool" default="false">
+			</argument>
+			<description>
+				Saves a key to the given [code]path[/code]. If [code]public_only[/code] is [code]true[/code], only the public key will be saved.
+				[b]Note[/b]: [code]path[/code] should should be a "*.pub" file if [code]public_only[/code] is [code]true[/code], a "*.key" file otherwise.
+			</description>
+		</method>
+		<method name="save_to_string">
+			<return type="String">
+			</return>
+			<argument index="0" name="public_only" type="bool" default="false">
+			</argument>
 			<description>
-				Saves a key to the given [code]path[/code] (should be a "*.key" file).
+				Returns a string containing the key in PEM format. If [code]public_only[/code] is [code]true[/code], only the public key will be included.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/EditorPlugin.xml b/doc/classes/EditorPlugin.xml
index 19583fca28..2fa791a9df 100644
--- a/doc/classes/EditorPlugin.xml
+++ b/doc/classes/EditorPlugin.xml
@@ -22,7 +22,7 @@
 			</description>
 		</method>
 		<method name="add_control_to_bottom_panel">
-			<return type="ToolButton">
+			<return type="Button">
 			</return>
 			<argument index="0" name="control" type="Control">
 			</argument>
diff --git a/doc/classes/Joint2D.xml b/doc/classes/Joint2D.xml
index fb0e184c26..b055293b9d 100644
--- a/doc/classes/Joint2D.xml
+++ b/doc/classes/Joint2D.xml
@@ -15,7 +15,7 @@
 			When [member node_a] and [member node_b] move in different directions the [code]bias[/code] controls how fast the joint pulls them back to their original position. The lower the [code]bias[/code] the more the two bodies can pull on the joint.
 		</member>
 		<member name="disable_collision" type="bool" setter="set_exclude_nodes_from_collision" getter="get_exclude_nodes_from_collision" default="true">
-			If [code]true[/code], [member node_a] and [member node_b] can collide.
+			If [code]true[/code], [member node_a] and [member node_b] can not collide.
 		</member>
 		<member name="node_a" type="NodePath" setter="set_node_a" getter="get_node_a" default="NodePath(&quot;&quot;)">
 			The first body attached to the joint. Must derive from [PhysicsBody2D].
diff --git a/doc/classes/OS.xml b/doc/classes/OS.xml
index 23473290c7..105def21ca 100644
--- a/doc/classes/OS.xml
+++ b/doc/classes/OS.xml
@@ -205,7 +205,7 @@
 			<return type="String">
 			</return>
 			<description>
-				Returns the name of the host OS. Possible values are: [code]"Android"[/code], [code]"Haiku"[/code], [code]"iOS"[/code], [code]"HTML5"[/code], [code]"OSX"[/code], [code]"Server"[/code], [code]"Windows"[/code], [code]"UWP"[/code], [code]"X11"[/code].
+				Returns the name of the host OS. Possible values are: [code]"Android"[/code], [code]"iOS"[/code], [code]"HTML5"[/code], [code]"OSX"[/code], [code]"Server"[/code], [code]"Windows"[/code], [code]"UWP"[/code], [code]"X11"[/code].
 			</description>
 		</method>
 		<method name="get_process_id" qualifiers="const">
diff --git a/doc/classes/ProjectSettings.xml b/doc/classes/ProjectSettings.xml
index 92e5b4a84f..7191492098 100644
--- a/doc/classes/ProjectSettings.xml
+++ b/doc/classes/ProjectSettings.xml
@@ -821,6 +821,8 @@
 		</member>
 		<member name="mono/profiler/enabled" type="bool" setter="" getter="" default="false">
 		</member>
+		<member name="mono/project/auto_update_project" type="bool" setter="" getter="" default="true">
+		</member>
 		<member name="mono/unhandled_exception_policy" type="int" setter="" getter="" default="0">
 		</member>
 		<member name="network/limits/debugger/max_chars_per_second" type="int" setter="" getter="" default="32768">
diff --git a/doc/classes/RichTextLabel.xml b/doc/classes/RichTextLabel.xml
index db036d7d88..d4eba77ffa 100644
--- a/doc/classes/RichTextLabel.xml
+++ b/doc/classes/RichTextLabel.xml
@@ -294,6 +294,10 @@
 			The currently installed custom effects. This is an array of [RichTextEffect]s.
 			To add a custom effect, it's more convenient to use [method install_effect].
 		</member>
+		<member name="fit_content_height" type="bool" setter="set_fit_content_height" getter="is_fit_content_height_enabled" default="false">
+			If [code]true[/code], the label's height will be automatically updated to fit its content.
+			[b]Note:[/b] This property is used as a workaround to fix issues with [RichTextLabel] in [Container]s, but it's unreliable in some cases and will be removed in future versions.
+		</member>
 		<member name="meta_underlined" type="bool" setter="set_meta_underline" getter="is_meta_underlined" default="true">
 			If [code]true[/code], the label underlines meta tags such as [code][url]{text}[/url][/code].
 		</member>
diff --git a/doc/classes/String.xml b/doc/classes/String.xml
index 24d92b822a..6d9def7ccb 100644
--- a/doc/classes/String.xml
+++ b/doc/classes/String.xml
@@ -381,7 +381,7 @@
 			<return type="bool">
 			</return>
 			<description>
-				Returns [code]true[/code] if the string is empty.
+				Returns [code]true[/code] if the length of the string equals [code]0[/code].
 			</description>
 		</method>
 		<method name="ends_with">
diff --git a/doc/classes/ToolButton.xml b/doc/classes/ToolButton.xml
deleted file mode 100644
index f78627b163..0000000000
--- a/doc/classes/ToolButton.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<class name="ToolButton" inherits="Button" version="4.0">
-	<brief_description>
-		Flat button helper class.
-	</brief_description>
-	<description>
-		This is a helper class to generate a flat [Button] (see [member Button.flat]), creating a [ToolButton] is equivalent to:
-		[codeblock]
-		var btn = Button.new()
-		btn.flat = true
-		[/codeblock]
-	</description>
-	<tutorials>
-	</tutorials>
-	<methods>
-	</methods>
-	<members>
-		<member name="flat" type="bool" setter="set_flat" getter="is_flat" override="true" default="true" />
-	</members>
-	<constants>
-	</constants>
-	<theme_items>
-		<theme_item name="disabled" type="StyleBox">
-			[StyleBox] used when the [ToolButton] is disabled.
-		</theme_item>
-		<theme_item name="focus" type="StyleBox">
-			[StyleBox] used when the [ToolButton] is focused. It is displayed over the current [StyleBox], so using [StyleBoxEmpty] will just disable the focus visual effect.
-		</theme_item>
-		<theme_item name="font" type="Font">
-			[Font] of the [ToolButton]'s text.
-		</theme_item>
-		<theme_item name="font_color" type="Color" default="Color( 0.88, 0.88, 0.88, 1 )">
-			Default text [Color] of the [ToolButton].
-		</theme_item>
-		<theme_item name="font_color_disabled" type="Color" default="Color( 0.9, 0.95, 1, 0.3 )">
-			Text [Color] used when the [ToolButton] is disabled.
-		</theme_item>
-		<theme_item name="font_color_hover" type="Color" default="Color( 0.94, 0.94, 0.94, 1 )">
-			Text [Color] used when the [ToolButton] is being hovered.
-		</theme_item>
-		<theme_item name="font_color_pressed" type="Color" default="Color( 1, 1, 1, 1 )">
-			Text [Color] used when the [ToolButton] is being pressed.
-		</theme_item>
-		<theme_item name="hover" type="StyleBox">
-			[StyleBox] used when the [ToolButton] is being hovered.
-		</theme_item>
-		<theme_item name="hseparation" type="int" default="3">
-			The horizontal space between [ToolButton]'s icon and text.
-		</theme_item>
-		<theme_item name="normal" type="StyleBox">
-			Default [StyleBox] for the [ToolButton].
-		</theme_item>
-		<theme_item name="pressed" type="StyleBox">
-			[StyleBox] used when the [ToolButton] is being pressed.
-		</theme_item>
-	</theme_items>
-</class>
diff --git a/doc/classes/Tween.xml b/doc/classes/Tween.xml
index 1938a3facb..56ccaaf383 100644
--- a/doc/classes/Tween.xml
+++ b/doc/classes/Tween.xml
@@ -15,7 +15,7 @@
 		tween.start()
 		[/codeblock]
 		Many methods require a property name, such as [code]"position"[/code] above. You can find the correct property name by hovering over the property in the Inspector. You can also provide the components of a property directly by using [code]"property:component"[/code] (eg. [code]position:x[/code]), where it would only apply to that particular component.
-		Many of the methods accept [code]trans_type[/code] and [code]ease_type[/code]. The first accepts an [enum TransitionType] constant, and refers to the way the timing of the animation is handled (see [url=https://easings.net/]easings.net[/url] for some examples). The second accepts an [enum EaseType] constant, and controls the where [code]trans_type[/code] is applied to the interpolation (in the beginning, the end, or both). If you don't know which transition and easing to pick, you can try different [enum TransitionType] constants with [constant EASE_IN_OUT], and use the one that looks best.
+		Many of the methods accept [code]trans_type[/code] and [code]ease_type[/code]. The first accepts an [enum TransitionType] constant, and refers to the way the timing of the animation is handled (see [url=https://easings.net/]easings.net[/url] for some examples). The second accepts an [enum EaseType] constant, and controls where the [code]trans_type[/code] is applied to the interpolation (in the beginning, the end, or both). If you don't know which transition and easing to pick, you can try different [enum TransitionType] constants with [constant EASE_IN_OUT], and use the one that looks best.
 		[url=https://raw.githubusercontent.com/godotengine/godot-docs/master/img/tween_cheatsheet.png]Tween easing and transition types cheatsheet[/url]
 	</description>
 	<tutorials>
diff --git a/doc/classes/Vector2.xml b/doc/classes/Vector2.xml
index 64ebc1fa09..7f4a212679 100644
--- a/doc/classes/Vector2.xml
+++ b/doc/classes/Vector2.xml
@@ -5,7 +5,8 @@
 	</brief_description>
 	<description>
 		2-element structure that can be used to represent positions in 2D space or any other pair of numeric values.
-		It uses floating point coordinates.
+		It uses floating-point coordinates. See [Vector2i] for its integer counterpart.
+		[b]Note:[/b] In a boolean context, a Vector2 will evaluate to [code]false[/code] if it's equal to [code]Vector2(0, 0)[/code]. Otherwise, a Vector2 will always evaluate to [code]true[/code].
 	</description>
 	<tutorials>
 		<link>https://docs.godotengine.org/en/latest/tutorials/math/index.html</link>
diff --git a/doc/classes/Vector2i.xml b/doc/classes/Vector2i.xml
index 71c7aaa4e5..2f7ca985b2 100644
--- a/doc/classes/Vector2i.xml
+++ b/doc/classes/Vector2i.xml
@@ -5,7 +5,8 @@
 	</brief_description>
 	<description>
 		2-element structure that can be used to represent positions in 2D space or any other pair of numeric values.
-		It uses integer coordinates.
+		It uses integer coordinates and is therefore preferable to [Vector2] when exact precision is required.
+		[b]Note:[/b] In a boolean context, a Vector2i will evaluate to [code]false[/code] if it's equal to [code]Vector2i(0, 0)[/code]. Otherwise, a Vector2i will always evaluate to [code]true[/code].
 	</description>
 	<tutorials>
 		<link>https://docs.godotengine.org/en/latest/tutorials/math/index.html</link>
diff --git a/doc/classes/Vector3.xml b/doc/classes/Vector3.xml
index 29222bb4d1..0c861e5ee2 100644
--- a/doc/classes/Vector3.xml
+++ b/doc/classes/Vector3.xml
@@ -5,7 +5,8 @@
 	</brief_description>
 	<description>
 		3-element structure that can be used to represent positions in 3D space or any other pair of numeric values.
-		It uses floating point coordinates.
+		It uses floating-point coordinates. See [Vector3i] for its integer counterpart.
+		[b]Note:[/b] In a boolean context, a Vector3 will evaluate to [code]false[/code] if it's equal to [code]Vector3(0, 0, 0)[/code]. Otherwise, a Vector3 will always evaluate to [code]true[/code].
 	</description>
 	<tutorials>
 		<link>https://docs.godotengine.org/en/latest/tutorials/math/index.html</link>
diff --git a/doc/classes/Vector3i.xml b/doc/classes/Vector3i.xml
index c5aa3d0347..91d64ea609 100644
--- a/doc/classes/Vector3i.xml
+++ b/doc/classes/Vector3i.xml
@@ -5,7 +5,8 @@
 	</brief_description>
 	<description>
 		3-element structure that can be used to represent positions in 3D space or any other pair of numeric values.
-		It uses integer coordinates.
+		It uses integer coordinates and is therefore preferable to [Vector3] when exact precision is required.
+		[b]Note:[/b] In a boolean context, a Vector3i will evaluate to [code]false[/code] if it's equal to [code]Vector3i(0, 0, 0)[/code]. Otherwise, a Vector3i will always evaluate to [code]true[/code].
 	</description>
 	<tutorials>
 		<link>https://docs.godotengine.org/en/latest/tutorials/math/index.html</link>
diff --git a/doc/classes/VisualShaderNodeSample3D.xml b/doc/classes/VisualShaderNodeSample3D.xml
new file mode 100644
index 0000000000..cf6933ab55
--- /dev/null
+++ b/doc/classes/VisualShaderNodeSample3D.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class name="VisualShaderNodeSample3D" inherits="VisualShaderNode" version="4.0">
+	<brief_description>
+		A base node for nodes which samples 3D textures in the visual shader graph.
+	</brief_description>
+	<description>
+		A virtual class, use the descendants instead.
+	</description>
+	<tutorials>
+	</tutorials>
+	<methods>
+	</methods>
+	<members>
+		<member name="source" type="int" setter="set_source" getter="get_source" enum="VisualShaderNodeSample3D.Source" default="0">
+			An input source type.
+		</member>
+	</members>
+	<constants>
+		<constant name="SOURCE_TEXTURE" value="0" enum="Source">
+			Creates internal uniform and provides a way to assign it within node.
+		</constant>
+		<constant name="SOURCE_PORT" value="1" enum="Source">
+			Use the uniform texture from sampler port.
+		</constant>
+	</constants>
+</class>
diff --git a/doc/classes/VisualShaderNodeTexture2DArray.xml b/doc/classes/VisualShaderNodeTexture2DArray.xml
new file mode 100644
index 0000000000..3c6d328ed0
--- /dev/null
+++ b/doc/classes/VisualShaderNodeTexture2DArray.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class name="VisualShaderNodeTexture2DArray" inherits="VisualShaderNodeSample3D" version="4.0">
+	<brief_description>
+		A 2D texture uniform array to be used within the visual shader graph.
+	</brief_description>
+	<description>
+		Translated to [code]uniform sampler2DArray[/code] in the shader language.
+	</description>
+	<tutorials>
+	</tutorials>
+	<methods>
+	</methods>
+	<members>
+		<member name="texture_array" type="Texture2DArray" setter="set_texture_array" getter="get_texture_array">
+			A source texture array. Used if [member VisualShaderNodeSample3D.source] is set to [constant VisualShaderNodeSample3D.SOURCE_TEXTURE].
+		</member>
+	</members>
+	<constants>
+	</constants>
+</class>
diff --git a/doc/classes/bool.xml b/doc/classes/bool.xml
index 4482a280b2..869fc14d40 100644
--- a/doc/classes/bool.xml
+++ b/doc/classes/bool.xml
@@ -4,14 +4,14 @@
 		Boolean built-in type.
 	</brief_description>
 	<description>
-		Boolean is a built-in type. It can represent any data type that is either a true or false value. You can think of it as an switch with on or off (1 or 0) setting. It's often used as part of programming logic in condition statements like [code]if[/code] statements.
-		[b]Note:[/b] In a code below [code]if can_shoot[/code] is equivalent of [code]if can_shoot == true[/code]. It is good practice to follow the natural spoken language structure when possible. Use [code]if can_shoot[/code] rather than [code]if can_shoot == true[/code] and use [code]if not can_shoot[/code] rather than [code]if can_shoot == false[/code].
+		Boolean is a built-in type. There are two boolean values: [code]true[/code] and [code]false[/code]. You can think of it as an switch with on or off (1 or 0) setting. Booleans are used in programming for logic in condition statements, like [code]if[/code] statements.
+		Booleans can be directly used in [code]if[/code] statements. The code below demonstrates this on the [code]if can_shoot:[/code] line. You don't need to use [code]== true[/code], you only need [code]if can_shoot:[/code]. Similarly, use [code]if not can_shoot:[/code] rather than [code]== false[/code].
 		[codeblock]
 		var can_shoot = true
 
 		func shoot():
 		    if can_shoot:
-		        # Perform shooting actions here.
+		        pass # Perform shooting actions here.
 		[/codeblock]
 		The following code will only create a bullet if both conditions are met: action "shoot" is pressed and if [code]can_shoot[/code] is [code]true[/code].
 		[b]Note:[/b] [code]Input.is_action_pressed("shoot")[/code] is also a boolean that is [code]true[/code] when "shoot" is pressed and [code]false[/code] when "shoot" isn't pressed.
@@ -46,7 +46,7 @@
 			<argument index="0" name="from" type="int">
 			</argument>
 			<description>
-				Cast an [int] value to a boolean value, this method will return [code]true[/code] if called with an integer value different to 0 and [code]false[/code] in other case.
+				Cast an [int] value to a boolean value, this method will return [code]false[/code] if [code]0[/code] is passed in, and [code]true[/code] for all other ints.
 			</description>
 		</method>
 		<method name="bool">
@@ -55,7 +55,7 @@
 			<argument index="0" name="from" type="float">
 			</argument>
 			<description>
-				Cast a [float] value to a boolean value, this method will return [code]true[/code] if called with a floating-point value different to 0 and [code]false[/code] in other case.
+				Cast a [float] value to a boolean value, this method will return [code]false[/code] if [code]0.0[/code] is passed in, and [code]true[/code] for all other floats.
 			</description>
 		</method>
 		<method name="bool">
@@ -64,7 +64,8 @@
 			<argument index="0" name="from" type="String">
 			</argument>
 			<description>
-				Cast a [String] value to a boolean value, this method will return [code]true[/code] if called with a non-empty string and [code]false[/code] in other case. Examples: [code]bool("False")[/code] returns [code]true[/code], [code]bool("")[/code] returns [code]false[/code].
+				Cast a [String] value to a boolean value, this method will return [code]false[/code] if [code]""[/code] is passed in, and [code]true[/code] for all non-empty strings.
+				Examples: [code]bool("False")[/code] returns [code]true[/code], [code]bool("")[/code] returns [code]false[/code].
 			</description>
 		</method>
 	</methods>