From: Quentin Young Date: Wed, 31 Jan 2018 15:31:15 +0000 (-0500) Subject: doc: move dev doc figures to figures/ X-Git-Tag: frr-5.0-dev~165^2~57 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=05102ddc45c8f6ebdf93c9ade0ae2d77c5f2b520;p=mirror%2Ffrr.git doc: move dev doc figures to figures/ Signed-off-by: Quentin Young --- diff --git a/doc/developer/git_branches.png b/doc/developer/git_branches.png deleted file mode 100644 index 21001c30a1..0000000000 Binary files a/doc/developer/git_branches.png and /dev/null differ diff --git a/doc/developer/git_branches.svg b/doc/developer/git_branches.svg deleted file mode 100644 index 0c2c96e39e..0000000000 --- a/doc/developer/git_branches.svg +++ /dev/null @@ -1,720 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - 1.0ReleaseBranch - - - - - - - - - - Master(Stable) - - - - - - - - - 1.1ReleaseBranch - Version 1.0.a1 - Version 1.1.a1 - Version 1.1.a2 - - - - - Version 1.1.b1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Patch Email (Patchwork) - Github Pull Request - Github Pull Request - Patch Email (Patchwork) - Patch Email (Patchwork) - Github Pull Request - Github Pull Request - Github Pull Request - Patch Email (Patchwork) - Github Pull Request - Github Pull Request - Github Pull Request - Github Pull Request - Github Pull Request - Github Pull Request - - - - - - - - - Version 1.0.a2 - Version 1.0.b1 - Version 1.0.0 - Version 1.1.0 - Version 1.1.1 - Version 1.1.2 - - - - - - - - - - - - - - - - - - diff --git a/doc/developer/workflow.rst b/doc/developer/workflow.rst index b5844d073b..88ae7ef761 100644 --- a/doc/developer/workflow.rst +++ b/doc/developer/workflow.rst @@ -17,7 +17,11 @@ Git Structure The master Git for FRR resides on `Github `__. -.. figure:: git_branches.png +.. figure:: ../figures/git_branches.png + :align: right + :alt: merging get branches into a central trunk + + Rough outline of FRR development workflow There is one main branch for development, ``master``. For each major release (2.0, 3.0 etc) a new release branch is created based on the master. Subsequent diff --git a/doc/figures/git_branches.png b/doc/figures/git_branches.png new file mode 100644 index 0000000000..21001c30a1 Binary files /dev/null and b/doc/figures/git_branches.png differ