svn commit: r1033564 - /incubator/river/site/trunk/content/development-process.mdtext

[th...@apache.org]

Author: thobbs
Date: Wed Nov 10 16:21:17 2010
New Revision: 1033564

URL: http://svn.apache.org/viewvc?rev=1033564&view=rev
Log:
Fixed the branch asci-diagram

Modified:
    incubator/river/site/trunk/content/development-process.mdtext

Modified: incubator/river/site/trunk/content/development-process.mdtext
URL: http://svn.apache.org/viewvc/incubator/river/site/trunk/content/development-process.mdtext?rev=1033564&r1=1033563&r2=1033564&view=diff
==============================================================================
--- incubator/river/site/trunk/content/development-process.mdtext (original)
+++ incubator/river/site/trunk/content/development-process.mdtext Wed Nov 10 16:21:17 2010
@@ -56,7 +56,6 @@ The major version number will in general
 
 ## Branching Policy
 
-
 Ongoing development for the next release takes place in the {{/trunk}}. Once feature complete for a (non maintenance) release the trunk is branched into {{/branches/<m.n>}} which in general also reflects the moment a release candidate is presented to the public in a fairly short period of time. Ongoing development continues in the {{/trunk}}, issues found against the release candidate will be fixed in {{/branches/<m.n>}} and likely merged into the {{/trunk}}.
 
 Once a release candidate is ready for a first customer release {{/branches/<m.n>}} is branched into {{/tags/<m.n>.0}}. When support is required for a particular release {{m.n}}, the development for a fix-release is conducted in {{/branches/<m.n>}}. When a bug-fix release is ready it is branched into {{/tags/<m.n.r>}} where {{r}} is a positive number and increased for each maintenance release.
@@ -70,7 +69,8 @@ Although ongoing development should take
 |{{.../river/<product>/branches}}|maintenance branches|
 |{{.../river/<product>/tags}}|frozen release tags|
 |{{.../river/<product>/skunk}}|development and 'skunk works' branches|
-{noformat:nopanel=true}
+
+<pre>
 /trunk
    |
    |--------  /branches/2.1/
@@ -93,4 +93,4 @@ Although ongoing development should take
    |         \ -------  /tags/3.0.0/
    |          \
    |           \ -------  /tags/3.0.1/
-{noformat}
+</pre>