diff --git a/include/board_item.h b/include/board_item.h
index 65400865b0..d0f97aaa94 100644
--- a/include/board_item.h
+++ b/include/board_item.h
@@ -141,6 +141,9 @@ public:
      *
      * @param aLayer in case of items spanning multiple layers, only the shapes belonging to aLayer
      *               will be returned. Pass UNDEFINED_LAYER to return shapes for all layers.
+     * @param aFlash optional parameter allowing a caller to force the pad to be flashed (or not
+     *               flashed) on the current layer (default is to honour the pad's setting and
+     *               the current connections for the given layer).
      */
     virtual std::shared_ptr<SHAPE> GetEffectiveShape( PCB_LAYER_ID aLayer = UNDEFINED_LAYER,
                                                       FLASHING aFlash = FLASHING::DEFAULT ) const;
diff --git a/pcbnew/pad.h b/pcbnew/pad.h
index 58f7dfb3f9..75a9070b38 100644
--- a/pcbnew/pad.h
+++ b/pcbnew/pad.h
@@ -447,7 +447,21 @@ public:
     bool TransformHoleWithClearanceToPolygon( SHAPE_POLY_SET& aCornerBuffer, int aInflateValue,
                                               int aError, ERROR_LOC aErrorLoc ) const;
 
-    // @copydoc BOARD_ITEM::GetEffectiveShape
+    /**
+     * Some pad shapes can be complex (rounded/chamfered rectangle), even without considering
+     * custom shapes.  This routine returns a COMPOUND shape (set of simple shapes which make
+     * up the pad for use with routing, collision determination, etc).
+     *
+     * @note This list can contain a SHAPE_SIMPLE (a simple single-outline non-intersecting
+     * polygon), but should never contain a SHAPE_POLY_SET (a complex polygon consisting of
+     * multiple outlines and/or holes).
+     *
+     * @param aLayer optional parameter allowing a caller to specify a particular layer (default
+     *               is to return the pad's "natural" shape).
+     * @param aFlash optional parameter allowing a caller to force the pad to be flashed (or not
+     *               flashed) on the current layer (default is to honour the pad's setting and
+     *               the current connections for the given layer).
+     */
     virtual std::shared_ptr<SHAPE>
     GetEffectiveShape( PCB_LAYER_ID aLayer = UNDEFINED_LAYER,
                        FLASHING flashPTHPads = FLASHING::DEFAULT ) const override;