Author: kschenk
Date: Mon Aug 3 20:50:30 2015
New Revision: 1693969
URL: http://svn.apache.org/r1693969
Log:
Fix inline link syntax.
Modified:
openoffice/site/trunk/content/svn-basics.mdtext
Modified: openoffice/site/trunk/content/svn-basics.mdtext
URL:
http://svn.apache.org/viewvc/openoffice/site/trunk/content/svn-basics.mdtext?rev=1693969&r1=1693968&r2=1693969&view=diff
==============================================================================
--- openoffice/site/trunk/content/svn-basics.mdtext (original)
+++ openoffice/site/trunk/content/svn-basics.mdtext Mon Aug 3 20:50:30 2015
@@ -289,7 +289,7 @@ Create the patch file from `svn diff` wh
## <a id="merging_changes"></a>Merging changes to a branch
New development is done in the "trunk", development area, of the tree. Stable,
release branches, are specifically named and can be found
-in the [branches] (http://svn.apache.org/viewvc/openoffice/branches/) area of
the openoffice svn tree. With few exceptions you do **NOT** do direct commits
to the stable, release,
+in the [branches](http://svn.apache.org/viewvc/openoffice/branches/) area of
the openoffice svn tree. With few exceptions you do **NOT** do direct commits
to the stable, release,
branches. Changes, commits, to stable branch are typically only done during a
formal release cycle and must be discussed on the "dev" list.
When a new release is in preparation, bug fixes are reviewed, and fixes that
have been made to "trunk" get applied to the stable, release, branch. This is
done using the "svn merge" command which finds previous changes and replays
them. SVN also keeps a record
