diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2018-01-31 10:31:15 -0500 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2018-01-31 10:31:15 -0500 |
| commit | 05102ddc45c8f6ebdf93c9ade0ae2d77c5f2b520 (patch) | |
| tree | f144cb2970f7562012a73497dfc5201c02a9f056 /doc/developer/workflow.rst | |
| parent | 612b3314f2277a751e917d1e36f267809fc01a49 (diff) | |
doc: move dev doc figures to figures/
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Diffstat (limited to 'doc/developer/workflow.rst')
| -rw-r--r-- | doc/developer/workflow.rst | 6 |
1 files changed, 5 insertions, 1 deletions
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 <https://github.com/frrouting/frr>`__. -.. 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 |