Update docs and changelog

Author: dolfinus

CHANGELOG.rst

@@ -1,6 +1,17 @@
 Changelog
 ==========
 
+1.10
+----
+
+.. changelog::
+    :version: 1.10.0
+
+    .. change::
+        :tags: core, breaking
+
+        ``version_callback`` option is used even if there are some tags in the current branch
+
 1.9
 ----
 

docs/options/branch_formatter.rst

@@ -5,6 +5,10 @@
 
 Callback to be used for formatting a branch name before template substitution
 
+.. note::
+
+    This option is used only with :ref:`tag-release` or :ref:`version-file` versioning schemas.
+
 Type
 ^^^^^^^^^^^^^^
 

docs/options/count_commits.rst

@@ -9,7 +9,7 @@ Enables feature of tracking commits history for file passed to :ref:`version-fil
 
 .. note::
 
-    This option used only if :ref:`version-file-option` option is set.
+    This option used only with :ref:`version-file-option`
 
 Type
 ^^^^^

docs/options/starting_version.rst

@@ -31,6 +31,10 @@ You can change this version by setting up ``starting_version`` option in your co
         [tool.setuptools-git-versioning]
         starting_version = "1.0.0"
 
+.. note::
+
+    This option is completely ignored if :ref:`version-callback` schema is used.
+
 Type
 ^^^^^^^^^^^^^^
 

docs/options/version_callback.rst

@@ -7,10 +7,6 @@ Callback to be used for getting a version number.
 
 Used by :ref:`version-callback` versioning schema.
 
-.. note::
-
-    This option is completely ignored if :ref:`version-file` or :ref:`tag-release` schemas are used.
-
 Type
 ^^^^^^^^^^^^^^
 

docs/schemas/callback/version_callback.rst

@@ -19,13 +19,11 @@ For example, current repo state is:
     |
     ...
 
-**And there are no tags in the current branch** (``dev``), **all
-of them are placed in the** ``master`` **branch.**
-
 By default, when you try to get current version, you'll receive some
-initial value (see :ref:`starting-version-option` option).
+initial value (see :ref:`starting-version-option` option),
+because there are no tags in the ``dev`` branch.
 
-If you want to get synchronized version numbers in both on the branches,
+If you want to get synchronized version numbers in both ``master`` and ``dev`` branches,
 you can create a function in some file (for example, in the
 ``mypkg/version.py`` file):
 
@@ -59,7 +57,7 @@ Then place it in both the branches and update your ``setup.py`` or ``pyproject.t
     enabled = true
     version_callback = "mypkg.version:get_version"
 
-When you'll try to get current version in non-master branch, the result
+When you'll try to get current version in **any** branch, the result
 of executing this function will be returned instead of latest tag
 number.
 
@@ -96,8 +94,9 @@ If a value of this option is not a function but just str, it also could be used:
         enabled = true
         version_callback = "mypkg:__version__"
 
-**Please take into account that version_callback is ignored if tag
-is present**
+**Please take into account that any tag in the branch is completely ignored if version_callback
+is set**.
+You should explicitly call ``setuptools_git_versioning.version_from_git`` function in the callback.
 
 
 See also