From 927305764930d714f7c6d8e3727bdfdc910c9703 Mon Sep 17 00:00:00 2001
From: Rosemary Orchard <16113535+RosemaryOrchard@users.noreply.github.com>
Date: Sun, 1 Mar 2020 14:01:26 +0100
Subject: [PATCH] Annotations override naming strategy (#8041)

Add a note/warning that annotations override the naming strategy.
---
 docs/en/reference/namingstrategy.rst | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/en/reference/namingstrategy.rst b/docs/en/reference/namingstrategy.rst
index 23aa573534c..027d53fd658 100644
--- a/docs/en/reference/namingstrategy.rst
+++ b/docs/en/reference/namingstrategy.rst
@@ -4,9 +4,13 @@ Implementing a NamingStrategy
 .. versionadded:: 2.3
 
 Using a naming strategy you can provide rules for generating database identifiers,
-column or table names when the column or table name is not given. This feature helps
+column or table names. This feature helps
 reduce the verbosity of the mapping document, eliminating repetitive noise (eg: ``TABLE_``).
 
+.. warning
+
+    The naming strategy is always overridden by entity mapping such as the `Table` annotation.
+
 Configuring a naming strategy
 -----------------------------
 The default strategy used by Doctrine is quite minimal.