[Bf-docboard-svn] bf-manual: [7757] Merge branch 'blender-2.92-release'
Aaron Carlisle
noreply at blender.org
Tue Feb 16 16:24:26 CET 2021
Revision: 7757
https://developer.blender.org/rBM7757
Author: Blendify
Date: 2021-02-16 16:24:26 +0100 (Tue, 16 Feb 2021)
Log Message:
-----------
Merge branch 'blender-2.92-release'
Modified Paths:
--------------
trunk/blender_docs/manual/about/contribute/release_cycle.rst
Property Changed:
----------------
trunk/blender_docs/
Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs 2021-02-16 01:33:03 UTC (rev 7756)
+++ trunk/blender_docs 2021-02-16 15:24:26 UTC (rev 7757)
Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/branches/blender-2.92-release/blender_docs:7610-7754
\ No newline at end of property
+/branches/blender-2.92-release/blender_docs:7610-7756
\ No newline at end of property
Modified: trunk/blender_docs/manual/about/contribute/release_cycle.rst
===================================================================
--- trunk/blender_docs/manual/about/contribute/release_cycle.rst 2021-02-16 01:33:03 UTC (rev 7756)
+++ trunk/blender_docs/manual/about/contribute/release_cycle.rst 2021-02-16 15:24:26 UTC (rev 7757)
@@ -30,7 +30,7 @@
To switch to the release branch use::
- svn switch https://svn.blender.org/svnroot/bf-manual/branches/blender-{VERSION}-release/
+ svn switch https://svn.blender.org/svnroot/bf-manual/branches/blender-{VERSION}-release/blender_docs/
To switch back to the development branch use::
@@ -43,7 +43,7 @@
To merge changes from the release branch to the development branch,
first switch to the development branch and use::
- svn merge https://svn.blender.org/svnroot/bf-manual/branches/blender-{VERSION}-release/
+ svn merge https://svn.blender.org/svnroot/bf-manual/branches/blender-{VERSION}-release/blender_docs/
svn ci -m "Merge branch 'blender-{VERSION}-release'"
More information about the Bf-docboard-svn
mailing list