diff --git a/doc/classes/ConcavePolygonShape2D.xml b/doc/classes/ConcavePolygonShape2D.xml
index 1910b1d62d5..1d2aabd6eae 100644
--- a/doc/classes/ConcavePolygonShape2D.xml
+++ b/doc/classes/ConcavePolygonShape2D.xml
@@ -15,6 +15,7 @@
 	</methods>
 	<members>
 		<member name="segments" type="PoolVector2Array" setter="set_segments" getter="get_segments">
+			The array of points that make up the [code]ConcavePolygonShape2D[/code]'s line segments.
 		</member>
 	</members>
 	<constants>
diff --git a/doc/classes/CubeMap.xml b/doc/classes/CubeMap.xml
index a7857dba789..7444fb02589 100644
--- a/doc/classes/CubeMap.xml
+++ b/doc/classes/CubeMap.xml
@@ -4,7 +4,7 @@
 		A CubeMap is a 6 sided 3D texture.
 	</brief_description>
 	<description>
-		A CubeMap is a 6 sided 3D texture typically used for faking reflections. It can be used to make an object look as if it's reflecting its surroundings. This usually delivers much better performance than other reflection methods.
+		A 6-sided 3D texture typically used for faking reflections. It can be used to make an object look as if it's reflecting its surroundings. This usually delivers much better performance than other reflection methods.
 	</description>
 	<tutorials>
 	</tutorials>
@@ -15,13 +15,14 @@
 			<return type="int">
 			</return>
 			<description>
+				Returns the render flags for the [code]CubeMap[/code]. See the [code]FLAG_*[/code] constants for details.
 			</description>
 		</method>
 		<method name="get_height" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-				Returns the CubeMap's height.
+				Returns the [code]CubeMap[/code]'s height.
 			</description>
 		</method>
 		<method name="get_side" qualifiers="const">
@@ -30,14 +31,14 @@
 			<argument index="0" name="side" type="int" enum="CubeMap.Side">
 			</argument>
 			<description>
-				Returns an [Image] for a side of the CubeMap using one of the [code]SIDE_*[/code] constants or an integer 0-5.
+				Returns an [Image] for a side of the [code]CubeMap[/code] using one of the [code]SIDE_*[/code] constants or an integer 0-5.
 			</description>
 		</method>
 		<method name="get_width" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-				Returns the CubeMap's width.
+				Returns the [code]CubeMap[/code]'s width.
 			</description>
 		</method>
 		<method name="set_flags">
@@ -46,6 +47,7 @@
 			<argument index="0" name="flags" type="int">
 			</argument>
 			<description>
+				Returns the render flags for the [code]CubeMap[/code]. See the [code]FLAG_*[/code] constants for details.
 			</description>
 		</method>
 		<method name="set_side">
@@ -56,44 +58,57 @@
 			<argument index="1" name="image" type="Image">
 			</argument>
 			<description>
-				Sets an [Image] for a side of the CubeMap using one of the [code]SIDE_*[/code] constants or an integer 0-5.
+				Sets an [Image] for a side of the [code]CubeMap[/code] using one of the [code]SIDE_*[/code] constants or an integer 0-5.
 			</description>
 		</method>
 	</methods>
 	<members>
 		<member name="lossy_storage_quality" type="float" setter="set_lossy_storage_quality" getter="get_lossy_storage_quality">
-			The lossy storage quality of the CubeMap if the storage mode is set to STORAGE_COMPRESS_LOSSY.
+			The lossy storage quality of the [code]CubeMap[/code] if the storage mode is set to STORAGE_COMPRESS_LOSSY.
 		</member>
-		<member name="storage_mode" type="int" setter="set_storage" getter="get_storage" enum="CubeMap.Storage">
-			The CubeMap's storage mode. See [code]STORAGE_*[/code] constants.
+		<member name="storage_mode" type="CubeMap.Storage" setter="set_storage" getter="get_storage" enum="CubeMap.Storage">
+			The [code]CubeMap[/code]'s storage mode. See [code]STORAGE_*[/code] constants.
 		</member>
 	</members>
 	<constants>
 		<constant name="STORAGE_RAW" value="0" enum="Storage">
+			Store the [code]CubeMap[/code] without any compression.
 		</constant>
 		<constant name="STORAGE_COMPRESS_LOSSY" value="1" enum="Storage">
+			Store the [code]CubeMap[/code] with strong compression that reduces image quality.
 		</constant>
 		<constant name="STORAGE_COMPRESS_LOSSLESS" value="2" enum="Storage">
+			Store the [code]CubeMap[/code] with moderate compression that doesn't reduce image quality.
 		</constant>
 		<constant name="SIDE_LEFT" value="0" enum="Side">
+			Identifier for the left face of the [code]CubeMap[/code].
 		</constant>
 		<constant name="SIDE_RIGHT" value="1" enum="Side">
+			Identifier for the right face of the [code]CubeMap[/code].
 		</constant>
 		<constant name="SIDE_BOTTOM" value="2" enum="Side">
+			Identifier for the bottom face of the [code]CubeMap[/code].
 		</constant>
 		<constant name="SIDE_TOP" value="3" enum="Side">
+			Identifier for the top face of the [code]CubeMap[/code].
 		</constant>
 		<constant name="SIDE_FRONT" value="4" enum="Side">
+			Identifier for the front face of the [code]CubeMap[/code].
 		</constant>
 		<constant name="SIDE_BACK" value="5" enum="Side">
+			Identifier for the back face of the [code]CubeMap[/code].
 		</constant>
 		<constant name="FLAG_MIPMAPS" value="1" enum="Flags">
+			Generate mipmaps, to enable smooth zooming out of the texture.
 		</constant>
 		<constant name="FLAG_REPEAT" value="2" enum="Flags">
+			Repeat (instead of clamp to edge).
 		</constant>
 		<constant name="FLAG_FILTER" value="4" enum="Flags">
+			Turn on magnifying filter, to enable smooth zooming in of the texture.
 		</constant>
 		<constant name="FLAGS_DEFAULT" value="7" enum="Flags">
+			Default flags. Generate mipmaps, repeat, and filter are enabled.
 		</constant>
 	</constants>
 </class>