Merge pull request #7286 from afvincent/doc_fix_url_development_workflow

NelleV · web-flow · commit 2a4ce9ac84d7 · 2016-10-16T20:49:55.000-07:00
DOC: Fix for #7283 by adding a trailing underscore to misrendered URLs
diff --git a/doc/devel/gitwash/development_workflow.rst b/doc/devel/gitwash/development_workflow.rst
@@ -160,9 +160,9 @@ upstream changes, and resolving conflicts.
 In git, rebasing is a mild form of re-writing history: it effectively forwards
 all your commits to the updated upstream commit. For a much more detailed
 explanation (with pictures!) see `this nice write up
-<https://git-scm.com/book/en/Git-Branching-Rebasing>`.  The NumPy team has also
+<https://git-scm.com/book/en/Git-Branching-Rebasing>`_.  The NumPy team has also
 `documented how to do this
-<http://docs.scipy.org/doc/numpy/dev/gitwash/development_workflow.html#rebasing-on-master>`
+<http://docs.scipy.org/doc/numpy/dev/gitwash/development_workflow.html#rebasing-on-master>`_.
 In general, re-writing history, particularly published history, is considered
 bad practice, but in this case it is very useful.
 
