From efd5c65b99a31992001a9581a41ec4627c4d94fa Mon Sep 17 00:00:00 2001
From: Raphaël Barrois <raphael.barrois@polytechnique.org>
Date: Wed, 10 Feb 2016 00:15:52 +0100
Subject: Clarify precedence on factory.django.FileField (Closes #257).

When both ``from_file`` and ``filename`` are provided, ``filename``
takes precedence.

Thanks to @darkowic for spotting this :)
---
 docs/orms.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/orms.rst b/docs/orms.rst
index bd481bd..d1b30fc 100644
--- a/docs/orms.rst
+++ b/docs/orms.rst
@@ -126,7 +126,7 @@ Extra fields
         :param str from_path: Use data from the file located at ``from_path``,
                               and keep its filename
         :param file from_file: Use the contents of the provided file object; use its filename
-                               if available
+                               if available, unless ``filename`` is also provided.
         :param bytes data: Use the provided bytes as file contents
         :param str filename: The filename for the FileField
 
-- 
cgit v1.2.3