[Bf-committers] Documentation branching during bcon3

[Dalai Felinto]

Hi,

I just did the branching. To continue working in the 2.92 branch use:
https://svn.blender.org/svnroot/bf-manual/branches/blender-2.92-release/blender_docs

For 2.93 features use trunk as before:
https://svn.blender.org/svnroot/bf-manual/trunk/blender_docs

I will update the docs throughout the day. Later this week James Monteath
will look into updating the building and freezing scripts. This way we can
have both 2.92 and 2.93 built automatically.

For the time being that means https://docs.blender.org/manual/en/dev/ will
show 2.93 features even if the tagging is 2.92. I think this is an
acceptable drawback for a few days.

Regards,
Dalai

Op vr 15 jan. 2021 om 16:15 schreef Dalai Felinto <dalai at blender.org>:

> Hi,
>
> I would like to propose a short term solution for handling the branching
> of the documentation while we are still using SVN there.
>
> During bcon3 we create a new branch in SVN for the upcoming release. This
> branch will be what will eventually be tagged as the final documentation
> for a given release. Master is then open for the documentation of the new
> features.
>
> So far this all matches what we do for the Blender code repository. Now
> for the difference:
>
> - We only merge 2.92 into master AFTER it is finally released. As oppose
> to do it every so often.
>
> Nothing prevents the documentation team to do the merge often. But unlike
> the main blender source code we won't expect the documentation
> collaborators to handle that.
>
> Regards,
> -Dalai-
> --------------------------------------------------------------------
> Dalai Felinto - dalai at blender.org - www.blender.org
> Blender Development Coordinator
> Buikslotermeerplein 161, 1025 ET Amsterdam, the Netherlands
>


-- 

-Dalai-
--------------------------------------------------------------------
Dalai Felinto - dalai at blender.org - www.blender.org
Blender Development Coordinator
Buikslotermeerplein 161, 1025 ET Amsterdam, the Netherlands