deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rsme...@apache.org
Subject svn commit: r1678277 [3/3] - /deltaspike/site/trunk/content/staging/
Date Fri, 08 May 2015 00:24:50 GMT
Modified: deltaspike/site/trunk/content/staging/release-preparation.html
URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/staging/release-preparation.html?rev=1678277&r1=1678276&r2=1678277&view=diff
==============================================================================
--- deltaspike/site/trunk/content/staging/release-preparation.html (original)
+++ deltaspike/site/trunk/content/staging/release-preparation.html Fri May  8 00:24:50 2015
@@ -1,44 +1,47 @@
 <!DOCTYPE html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<meta name="description" content="deltaspike-generate-pages">
-<meta name="author" content="chm">
-<!-- No caching headers -->
-<meta http-equiv="cache-control" content="no-cache" />
-<meta http-equiv="pragma" content="no-cache" />
-<meta http-equiv="expires" content="-1" />
-
-<title>Reviewing an Apache Release</title>
-
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-
-<!-- Styles -->
-
-<link href="https://deltaspike.apache.org/resources/css/bootstrap.css" rel="stylesheet">
-<link href="https://deltaspike.apache.org/resources/css/bootstrap-responsive.css" rel="stylesheet">
-<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.1.0/css/font-awesome.min.css" rel="stylesheet" >
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="deltaspike-generate-pages">
+    <meta name="author" content="chm">
+    <!-- No caching headers -->
+    <meta http-equiv="cache-control" content="no-cache"/>
+    <meta http-equiv="pragma" content="no-cache"/>
+    <meta http-equiv="expires" content="-1"/>
+
+    <title>Reviewing an Apache Release</title>
+
+    <!--
+        Licensed to the Apache Software Foundation (ASF) under one
+        or more contributor license agreements.  See the NOTICE file
+        distributed with this work for additional information
+        regarding copyright ownership.  The ASF licenses this file
+        to you under the Apache License, Version 2.0 (the
+        "License"); you may not use this file except in compliance
+        with the License.  You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+        Unless required by applicable law or agreed to in writing,
+        software distributed under the License is distributed on an
+        "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+        KIND, either express or implied.  See the License for the
+        specific language governing permissions and limitations
+        under the License.
+    -->
+
+    <!-- Styles -->
+    <link href="https://deltaspike.apache.org/resources/css/bootstrap.css" rel="stylesheet">
+    <link href="https://deltaspike.apache.org/resources/css/bootstrap-responsive.css" rel="stylesheet">
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.1.0/css/font-awesome.min.css" rel="stylesheet">
 
-<style type="text/css">
-/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
+    
+
+    
+
+    <style type="text/css">
+        /* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
 /*pre.CodeRay {background-color:#f7f7f8;}*/
 .CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em}
 .CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)}
@@ -128,79 +131,129 @@ table.CodeRay td.code>pre{padding:0}
 .CodeRay .change .change{color:#66f}
 .CodeRay .head .head{color:#f4f}
 
-body {
-  padding-top: 60px;
-  padding-bottom: 40px;
-}
-</style>
-
-<script type="text/javascript">
-
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', 'UA-36103647-1']);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-    })();
+        body {
+            padding-top: 60px;
+            padding-bottom: 40px;
+        }
+
+        .toc-like {
+            border-radius: 6px;
+            border: 1px solid #ccc;
+        }
+
+        .toc-like li {
+            line-height: 30px;
+            text-indent: 10px;
+        }
+
+        .toc-like li.custom-toc-header {
+            font-weight: bold;
+            background: #666;
+            color: white;
+            cursor: initial !important;
+            padding: 5px;
+        }
+
+        .toc-like li.custom-toc-header a {
+            color: white;
+            font-style: normal;
+            text-shadow: none;
+            padding: 0;
+        }
+
+        .toc-like li.custom-toc-header:hover a {
+            background: #666;
+        }
+
+        .page-title {
+            text-align: left;
+        }
+
+        #doc-content h2,
+        #doc-content h3,
+        #doc-content h4,
+        #doc-content h5,
+        #doc-content h6 {
+            padding-top: 0;
+            margin-top: 25px;
+            margin-bottom: 10px;
+            line-height: 1.4em;
+        }
+
+        #doc-content h2 {
+            border-bottom: 1px solid lightgrey;
+        }
+
+
+    </style>
+
+    <script type="text/javascript">
+
+        var _gaq = _gaq || [];
+        _gaq.push(['_setAccount', 'UA-36103647-1']);
+        _gaq.push(['_trackPageview']);
+
+        (function () {
+            var ga = document.createElement('script');
+            ga.type = 'text/javascript';
+            ga.async = true;
+            ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+            var s = document.getElementsByTagName('script')[0];
+            s.parentNode.insertBefore(ga, s);
+        })();
 
-  </script>
+    </script>
 </head>
 
 <body>
 
-  <div class="navbar navbar-fixed-top">
+<div class="navbar navbar-fixed-top">
     <div class="navbar-inner">
-      <div class="container">
-        <a class="btn btn-navbar" data-toggle="collapse"
-          data-target=".nav-collapse"> <span class="icon-bar"></span> <span
-          class="icon-bar"></span> <span class="icon-bar"></span>
-        </a>
-        <a class="brand logocolor" href="./index.html">Apache DeltaSpike</a>
-        <div class="nav-collapse">
-     
-          
-          <ul class="nav">
-            <li><a href="./index.html">Home</a></li>
-            <li ><a href="./documentation">Documentation</a></li>
-            <li  ><a href="./javadoc.html">Javadoc</a></li>
-            <li ><a href="./source.html">Source</a></li>
-            <li ><a href="./download.html">Download</a></li>
-            <li ><a href="./community.html">Community</a></li>
-            <!-- <li><a href="./support.html">Support</a></li>  -->
-            <li ><a href="./news.html">News</a></li>
-            <li ><a href="./migration-guide.html">Migration</a></li>
-          </ul>
+        <div class="container">
+            <a class="btn btn-navbar" data-toggle="collapse"
+               data-target=".nav-collapse"> <span class="icon-bar"></span> <span
+            class="icon-bar"></span> <span class="icon-bar"></span>
+            </a>
+            <a class="brand logocolor" href="./index.html">Apache DeltaSpike</a>
+
+            <div class="nav-collapse">
+
+                
+                <ul class="nav">
+                    <li><a href="./index.html">Home</a></li>
+                    <li ><a href="./documentation">Documentation</a></li>
+                    <li  ><a href="./javadoc.html">Javadoc</a></li>
+                    <li ><a href="./source.html">Source</a></li>
+                    <li ><a href="./download.html">Download</a></li>
+                    <li ><a href="./community.html">Community</a></li>
+                    <!-- <li><a href="./support.html">Support</a></li>  -->
+                    <li ><a href="./news.html">News</a></li>
+                    <li ><a href="./migration-guide.html">Migration</a></li>
+                </ul>
+            </div>
+            <!--/.nav-collapse -->
+            <form id="search-form" action="https://www.google.com/search"
+                  method="get" class="navbar-search pull-right">
+                <input value="deltaspike.apache.org" name="sitesearch"
+                       type="hidden"> <input class="search-query" name="q"
+                                             id="query" type="text">
+            </form>
         </div>
-        <!--/.nav-collapse -->
-        <form id="search-form" action="https://www.google.com/search"
-          method="get" class="navbar-search pull-right">
-          <input value="deltaspike.apache.org" name="sitesearch"
-            type="hidden"> <input class="search-query" name="q"
-            id="query" type="text">
-        </form>
-      </div>
     </div>
-  </div>
+</div>
 
-  <div class="container">
-    <div class="row">
-      <div class="span12">
-        <div class="page-title">
-          <h1>Reviewing an Apache Release</h1>
-        </div>
+<div class="container">
+    <div class="row-fluid">
 
-        <div id="toc" class="toc">
-            <ul class="sectlevel1">
-<li><a href="#_introduction">Introduction</a></li>
-</ul>
-            <hr>
-            <div class="sect1">
-<h2 id="_introduction">Introduction</h2>
-<div class="sectionbody">
-<div class="paragraph">
+        
+
+        <div class="span12">
+            <div class="page-title">
+                <h1>Reviewing an Apache Release</h1>
+            </div>
+
+            <div id="doc-content">
+                <div class="paragraph">
 <p>Once a Release has been staged on <a href="http://repository.apache.org" class="bare">http://repository.apache.org</a> it must
 be reviewed by each PMC member <strong>before</strong> casting his VOTE.</p>
 </div>
@@ -241,19 +294,22 @@ only if they are optional, etc! See
 </li>
 </ul>
 </div>
-</div>
-</div>
+            </div>
         </div>
 
-        <hr>
+        
 
+    </div>
+    <div class="row">
+        <hr>
         <footer>
-          <p>Copyright © 2011-2014 The Apache Software Foundation,
-            Licensed under the Apache License, Version 2.0.</p>
-          <p>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+            <p>Copyright &copy; 2011-2014 The Apache Software Foundation,
+                Licensed under the Apache License, Version 2.0.</p>
+
+            <p>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
         </footer>
-      </div>
     </div>
-  </div>
+</div>
+
 </body>
 </html>
\ No newline at end of file

Modified: deltaspike/site/trunk/content/staging/source.html
URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/staging/source.html?rev=1678277&r1=1678276&r2=1678277&view=diff
==============================================================================
--- deltaspike/site/trunk/content/staging/source.html (original)
+++ deltaspike/site/trunk/content/staging/source.html Fri May  8 00:24:50 2015
@@ -1,44 +1,47 @@
 <!DOCTYPE html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<meta name="description" content="deltaspike-generate-pages">
-<meta name="author" content="chm">
-<!-- No caching headers -->
-<meta http-equiv="cache-control" content="no-cache" />
-<meta http-equiv="pragma" content="no-cache" />
-<meta http-equiv="expires" content="-1" />
-
-<title>Contribute to the DeltaSpike Source</title>
-
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-
-<!-- Styles -->
-
-<link href="https://deltaspike.apache.org/resources/css/bootstrap.css" rel="stylesheet">
-<link href="https://deltaspike.apache.org/resources/css/bootstrap-responsive.css" rel="stylesheet">
-<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.1.0/css/font-awesome.min.css" rel="stylesheet" >
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="deltaspike-generate-pages">
+    <meta name="author" content="chm">
+    <!-- No caching headers -->
+    <meta http-equiv="cache-control" content="no-cache"/>
+    <meta http-equiv="pragma" content="no-cache"/>
+    <meta http-equiv="expires" content="-1"/>
+
+    <title>Contribute to the DeltaSpike Source</title>
+
+    <!--
+        Licensed to the Apache Software Foundation (ASF) under one
+        or more contributor license agreements.  See the NOTICE file
+        distributed with this work for additional information
+        regarding copyright ownership.  The ASF licenses this file
+        to you under the Apache License, Version 2.0 (the
+        "License"); you may not use this file except in compliance
+        with the License.  You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+        Unless required by applicable law or agreed to in writing,
+        software distributed under the License is distributed on an
+        "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+        KIND, either express or implied.  See the License for the
+        specific language governing permissions and limitations
+        under the License.
+    -->
+
+    <!-- Styles -->
+    <link href="https://deltaspike.apache.org/resources/css/bootstrap.css" rel="stylesheet">
+    <link href="https://deltaspike.apache.org/resources/css/bootstrap-responsive.css" rel="stylesheet">
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.1.0/css/font-awesome.min.css" rel="stylesheet">
 
-<style type="text/css">
-/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
+    
+
+    
+
+    <style type="text/css">
+        /* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
 /*pre.CodeRay {background-color:#f7f7f8;}*/
 .CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em}
 .CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)}
@@ -128,85 +131,129 @@ table.CodeRay td.code>pre{padding:0}
 .CodeRay .change .change{color:#66f}
 .CodeRay .head .head{color:#f4f}
 
-body {
-  padding-top: 60px;
-  padding-bottom: 40px;
-}
-</style>
-
-<script type="text/javascript">
-
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', 'UA-36103647-1']);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-    })();
+        body {
+            padding-top: 60px;
+            padding-bottom: 40px;
+        }
+
+        .toc-like {
+            border-radius: 6px;
+            border: 1px solid #ccc;
+        }
+
+        .toc-like li {
+            line-height: 30px;
+            text-indent: 10px;
+        }
+
+        .toc-like li.custom-toc-header {
+            font-weight: bold;
+            background: #666;
+            color: white;
+            cursor: initial !important;
+            padding: 5px;
+        }
+
+        .toc-like li.custom-toc-header a {
+            color: white;
+            font-style: normal;
+            text-shadow: none;
+            padding: 0;
+        }
+
+        .toc-like li.custom-toc-header:hover a {
+            background: #666;
+        }
+
+        .page-title {
+            text-align: left;
+        }
+
+        #doc-content h2,
+        #doc-content h3,
+        #doc-content h4,
+        #doc-content h5,
+        #doc-content h6 {
+            padding-top: 0;
+            margin-top: 25px;
+            margin-bottom: 10px;
+            line-height: 1.4em;
+        }
+
+        #doc-content h2 {
+            border-bottom: 1px solid lightgrey;
+        }
+
+
+    </style>
+
+    <script type="text/javascript">
+
+        var _gaq = _gaq || [];
+        _gaq.push(['_setAccount', 'UA-36103647-1']);
+        _gaq.push(['_trackPageview']);
+
+        (function () {
+            var ga = document.createElement('script');
+            ga.type = 'text/javascript';
+            ga.async = true;
+            ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+            var s = document.getElementsByTagName('script')[0];
+            s.parentNode.insertBefore(ga, s);
+        })();
 
-  </script>
+    </script>
 </head>
 
 <body>
 
-  <div class="navbar navbar-fixed-top">
+<div class="navbar navbar-fixed-top">
     <div class="navbar-inner">
-      <div class="container">
-        <a class="btn btn-navbar" data-toggle="collapse"
-          data-target=".nav-collapse"> <span class="icon-bar"></span> <span
-          class="icon-bar"></span> <span class="icon-bar"></span>
-        </a>
-        <a class="brand logocolor" href="./index.html">Apache DeltaSpike</a>
-        <div class="nav-collapse">
-     
-          
-          <ul class="nav">
-            <li><a href="./index.html">Home</a></li>
-            <li ><a href="./documentation">Documentation</a></li>
-            <li  ><a href="./javadoc.html">Javadoc</a></li>
-            <li class="active"><a href="./source.html">Source</a></li>
-            <li ><a href="./download.html">Download</a></li>
-            <li ><a href="./community.html">Community</a></li>
-            <!-- <li><a href="./support.html">Support</a></li>  -->
-            <li ><a href="./news.html">News</a></li>
-            <li ><a href="./migration-guide.html">Migration</a></li>
-          </ul>
+        <div class="container">
+            <a class="btn btn-navbar" data-toggle="collapse"
+               data-target=".nav-collapse"> <span class="icon-bar"></span> <span
+            class="icon-bar"></span> <span class="icon-bar"></span>
+            </a>
+            <a class="brand logocolor" href="./index.html">Apache DeltaSpike</a>
+
+            <div class="nav-collapse">
+
+                
+                <ul class="nav">
+                    <li><a href="./index.html">Home</a></li>
+                    <li ><a href="./documentation">Documentation</a></li>
+                    <li  ><a href="./javadoc.html">Javadoc</a></li>
+                    <li class="active"><a href="./source.html">Source</a></li>
+                    <li ><a href="./download.html">Download</a></li>
+                    <li ><a href="./community.html">Community</a></li>
+                    <!-- <li><a href="./support.html">Support</a></li>  -->
+                    <li ><a href="./news.html">News</a></li>
+                    <li ><a href="./migration-guide.html">Migration</a></li>
+                </ul>
+            </div>
+            <!--/.nav-collapse -->
+            <form id="search-form" action="https://www.google.com/search"
+                  method="get" class="navbar-search pull-right">
+                <input value="deltaspike.apache.org" name="sitesearch"
+                       type="hidden"> <input class="search-query" name="q"
+                                             id="query" type="text">
+            </form>
         </div>
-        <!--/.nav-collapse -->
-        <form id="search-form" action="https://www.google.com/search"
-          method="get" class="navbar-search pull-right">
-          <input value="deltaspike.apache.org" name="sitesearch"
-            type="hidden"> <input class="search-query" name="q"
-            id="query" type="text">
-        </form>
-      </div>
     </div>
-  </div>
+</div>
 
-  <div class="container">
-    <div class="row">
-      <div class="span12">
-        <div class="page-title">
-          <h1>Contribute to the DeltaSpike Source</h1>
-        </div>
+<div class="container">
+    <div class="row-fluid">
 
-        <div id="toc" class="toc">
-            <ul class="sectlevel1">
-<li><a href="#_1_get_the_source">1. Get the Source</a></li>
-<li><a href="#_2_make_additions_and_changes_to_the_source">2. Make Additions and Changes to the Source</a>
-<ul class="sectlevel2">
-<li><a href="#_intellij">IntelliJ</a></li>
-<li><a href="#_eclipse">Eclipse</a></li>
-</ul>
-</li>
-<li><a href="#_3_build_the_source">3. Build the Source</a></li>
-<li><a href="#_4_make_a_pull_request">4. Make a Pull Request</a></li>
-<li><a href="#_git_resources">Git Resources</a></li>
-</ul>
-            <hr>
-            <div id="preamble">
+        
+
+        <div class="span12">
+            <div class="page-title">
+                <h1>Contribute to the DeltaSpike Source</h1>
+            </div>
+
+            <div id="doc-content">
+                <div id="preamble">
 <div class="sectionbody">
 <div class="paragraph">
 <p>If you are looking to contribute to the DeltaSpike source, you must start with the latest version of the code base. DeltaSpike source is stored in the Apache Git repository at <a href="https://git-wip-us.apache.org/repos/asf/deltaspike.git" class="bare">https://git-wip-us.apache.org/repos/asf/deltaspike.git</a></p>
@@ -317,17 +364,22 @@ Settings</p>
 </div>
 </div>
 </div>
+            </div>
         </div>
 
-        <hr>
+        
 
+    </div>
+    <div class="row">
+        <hr>
         <footer>
-          <p>Copyright © 2011-2014 The Apache Software Foundation,
-            Licensed under the Apache License, Version 2.0.</p>
-          <p>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+            <p>Copyright &copy; 2011-2014 The Apache Software Foundation,
+                Licensed under the Apache License, Version 2.0.</p>
+
+            <p>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
         </footer>
-      </div>
     </div>
-  </div>
+</div>
+
 </body>
 </html>
\ No newline at end of file

Modified: deltaspike/site/trunk/content/staging/steps_for_a_release.html
URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/staging/steps_for_a_release.html?rev=1678277&r1=1678276&r2=1678277&view=diff
==============================================================================
--- deltaspike/site/trunk/content/staging/steps_for_a_release.html (original)
+++ deltaspike/site/trunk/content/staging/steps_for_a_release.html Fri May  8 00:24:50 2015
@@ -1,44 +1,66 @@
 <!DOCTYPE html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<meta name="description" content="deltaspike-generate-pages">
-<meta name="author" content="chm">
-<!-- No caching headers -->
-<meta http-equiv="cache-control" content="no-cache" />
-<meta http-equiv="pragma" content="no-cache" />
-<meta http-equiv="expires" content="-1" />
-
-<title>Steps for a Release</title>
-
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-
-<!-- Styles -->
-
-<link href="https://deltaspike.apache.org/resources/css/bootstrap.css" rel="stylesheet">
-<link href="https://deltaspike.apache.org/resources/css/bootstrap-responsive.css" rel="stylesheet">
-<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.1.0/css/font-awesome.min.css" rel="stylesheet" >
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="deltaspike-generate-pages">
+    <meta name="author" content="chm">
+    <!-- No caching headers -->
+    <meta http-equiv="cache-control" content="no-cache"/>
+    <meta http-equiv="pragma" content="no-cache"/>
+    <meta http-equiv="expires" content="-1"/>
+
+    <title>Steps for a Release</title>
+
+    <!--
+        Licensed to the Apache Software Foundation (ASF) under one
+        or more contributor license agreements.  See the NOTICE file
+        distributed with this work for additional information
+        regarding copyright ownership.  The ASF licenses this file
+        to you under the Apache License, Version 2.0 (the
+        "License"); you may not use this file except in compliance
+        with the License.  You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+        Unless required by applicable law or agreed to in writing,
+        software distributed under the License is distributed on an
+        "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+        KIND, either express or implied.  See the License for the
+        specific language governing permissions and limitations
+        under the License.
+    -->
+
+    <!-- Styles -->
+    <link href="https://deltaspike.apache.org/resources/css/bootstrap.css" rel="stylesheet">
+    <link href="https://deltaspike.apache.org/resources/css/bootstrap-responsive.css" rel="stylesheet">
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.1.0/css/font-awesome.min.css" rel="stylesheet">
+
+    
+
+    
+        <!-- Tocify - nice dynamic autoscrolling TOC -->
+        <link href="https://cdnjs.cloudflare.com/ajax/libs/jquery.tocify/1.9.0/stylesheets/jquery.tocify.min.css" rel="stylesheet">
+        <script src="https://code.jquery.com/jquery-1.11.3.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.tocify/1.9.0/javascripts/jquery.tocify.min.js"></script>
+
+
+        <script type="text/javascript">
+            $(function () {
+                $("#toc").tocify({
+                    scrollTo: 50,
+                    extendPage: true,
+                    context: "#doc-content",
+                    selectors: "h2,h3,h4,h5"
+                });
+                $(".fallback-toc").hide();
+            });
+        </script>
+    
 
-<style type="text/css">
-/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
+    <style type="text/css">
+        /* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
 /*pre.CodeRay {background-color:#f7f7f8;}*/
 .CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em}
 .CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)}
@@ -128,97 +150,129 @@ table.CodeRay td.code>pre{padding:0}
 .CodeRay .change .change{color:#66f}
 .CodeRay .head .head{color:#f4f}
 
-body {
-  padding-top: 60px;
-  padding-bottom: 40px;
-}
-</style>
-
-<script type="text/javascript">
-
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', 'UA-36103647-1']);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-    })();
+        body {
+            padding-top: 60px;
+            padding-bottom: 40px;
+        }
+
+        .toc-like {
+            border-radius: 6px;
+            border: 1px solid #ccc;
+        }
+
+        .toc-like li {
+            line-height: 30px;
+            text-indent: 10px;
+        }
+
+        .toc-like li.custom-toc-header {
+            font-weight: bold;
+            background: #666;
+            color: white;
+            cursor: initial !important;
+            padding: 5px;
+        }
+
+        .toc-like li.custom-toc-header a {
+            color: white;
+            font-style: normal;
+            text-shadow: none;
+            padding: 0;
+        }
+
+        .toc-like li.custom-toc-header:hover a {
+            background: #666;
+        }
+
+        .page-title {
+            text-align: left;
+        }
+
+        #doc-content h2,
+        #doc-content h3,
+        #doc-content h4,
+        #doc-content h5,
+        #doc-content h6 {
+            padding-top: 0;
+            margin-top: 25px;
+            margin-bottom: 10px;
+            line-height: 1.4em;
+        }
+
+        #doc-content h2 {
+            border-bottom: 1px solid lightgrey;
+        }
+
+
+    </style>
+
+    <script type="text/javascript">
+
+        var _gaq = _gaq || [];
+        _gaq.push(['_setAccount', 'UA-36103647-1']);
+        _gaq.push(['_trackPageview']);
+
+        (function () {
+            var ga = document.createElement('script');
+            ga.type = 'text/javascript';
+            ga.async = true;
+            ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+            var s = document.getElementsByTagName('script')[0];
+            s.parentNode.insertBefore(ga, s);
+        })();
 
-  </script>
+    </script>
 </head>
 
 <body>
 
-  <div class="navbar navbar-fixed-top">
+<div class="navbar navbar-fixed-top">
     <div class="navbar-inner">
-      <div class="container">
-        <a class="btn btn-navbar" data-toggle="collapse"
-          data-target=".nav-collapse"> <span class="icon-bar"></span> <span
-          class="icon-bar"></span> <span class="icon-bar"></span>
-        </a>
-        <a class="brand logocolor" href="./index.html">Apache DeltaSpike</a>
-        <div class="nav-collapse">
-     
-          
-          <ul class="nav">
-            <li><a href="./index.html">Home</a></li>
-            <li ><a href="./documentation">Documentation</a></li>
-            <li  ><a href="./javadoc.html">Javadoc</a></li>
-            <li ><a href="./source.html">Source</a></li>
-            <li ><a href="./download.html">Download</a></li>
-            <li ><a href="./community.html">Community</a></li>
-            <!-- <li><a href="./support.html">Support</a></li>  -->
-            <li ><a href="./news.html">News</a></li>
-            <li ><a href="./migration-guide.html">Migration</a></li>
-          </ul>
+        <div class="container">
+            <a class="btn btn-navbar" data-toggle="collapse"
+               data-target=".nav-collapse"> <span class="icon-bar"></span> <span
+            class="icon-bar"></span> <span class="icon-bar"></span>
+            </a>
+            <a class="brand logocolor" href="./index.html">Apache DeltaSpike</a>
+
+            <div class="nav-collapse">
+
+                
+                <ul class="nav">
+                    <li><a href="./index.html">Home</a></li>
+                    <li ><a href="./documentation">Documentation</a></li>
+                    <li  ><a href="./javadoc.html">Javadoc</a></li>
+                    <li ><a href="./source.html">Source</a></li>
+                    <li ><a href="./download.html">Download</a></li>
+                    <li ><a href="./community.html">Community</a></li>
+                    <!-- <li><a href="./support.html">Support</a></li>  -->
+                    <li ><a href="./news.html">News</a></li>
+                    <li ><a href="./migration-guide.html">Migration</a></li>
+                </ul>
+            </div>
+            <!--/.nav-collapse -->
+            <form id="search-form" action="https://www.google.com/search"
+                  method="get" class="navbar-search pull-right">
+                <input value="deltaspike.apache.org" name="sitesearch"
+                       type="hidden"> <input class="search-query" name="q"
+                                             id="query" type="text">
+            </form>
         </div>
-        <!--/.nav-collapse -->
-        <form id="search-form" action="https://www.google.com/search"
-          method="get" class="navbar-search pull-right">
-          <input value="deltaspike.apache.org" name="sitesearch"
-            type="hidden"> <input class="search-query" name="q"
-            id="query" type="text">
-        </form>
-      </div>
     </div>
-  </div>
+</div>
 
-  <div class="container">
-    <div class="row">
-      <div class="span12">
-        <div class="page-title">
-          <h1>Steps for a Release</h1>
-        </div>
+<div class="container">
+    <div class="row-fluid">
 
-        <div id="toc" class="toc">
-            <ul class="sectlevel1">
-<li><a href="#_preparations">Preparations</a></li>
-<li><a href="#_first_steps">First steps</a></li>
-<li><a href="#_vote">Vote</a>
-<ul class="sectlevel2">
-<li><a href="#_start_the_vote">Start the Vote</a></li>
-</ul>
-</li>
-<li><a href="#_announce_the_vote">Announce the Vote</a></li>
-<li><a href="#_perform_the_final_release">Perform the final release</a>
-<ul class="sectlevel2">
-<li><a href="#_close_the_vote">Close the Vote</a></li>
-<li><a href="#_upload_artifacts">Upload Artifacts</a></li>
-<li><a href="#_check_downloads">Check Downloads</a></li>
-<li><a href="#_update_site_content">Update site content</a></li>
-<li><a href="#_announce_the_release">Announce the Release</a>
-<ul class="sectlevel3">
-<li><a href="#_e_mails">E-mails</a></li>
-<li><a href="#_twitter">Twitter</a></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-            <hr>
-            <div class="sect1">
+        
+
+        <div class="span8">
+            <div class="page-title">
+                <h1>Steps for a Release</h1>
+            </div>
+
+            <div id="doc-content">
+                <div class="sect1">
 <h2 id="_preparations">Preparations</h2>
 <div class="sectionbody">
 <div class="ulist">
@@ -537,17 +591,62 @@ Enjoy!
 </div>
 </div>
 </div>
+            </div>
         </div>
 
-        <hr>
+        
+            <div class="span4">
+                <div id="toc">
+                    <div class="moduledeps">
+                        <ul class="toc-like nav nav-list">
+                            
+                            
+                            
+                        </ul>
+                    </div>
+                </div>
+                
+                    <div class="fallback-toc">
+                        <ul class="sectlevel1">
+<li><a href="#_preparations">Preparations</a></li>
+<li><a href="#_first_steps">First steps</a></li>
+<li><a href="#_vote">Vote</a>
+<ul class="sectlevel2">
+<li><a href="#_start_the_vote">Start the Vote</a></li>
+</ul>
+</li>
+<li><a href="#_announce_the_vote">Announce the Vote</a></li>
+<li><a href="#_perform_the_final_release">Perform the final release</a>
+<ul class="sectlevel2">
+<li><a href="#_close_the_vote">Close the Vote</a></li>
+<li><a href="#_upload_artifacts">Upload Artifacts</a></li>
+<li><a href="#_check_downloads">Check Downloads</a></li>
+<li><a href="#_update_site_content">Update site content</a></li>
+<li><a href="#_announce_the_release">Announce the Release</a>
+<ul class="sectlevel3">
+<li><a href="#_e_mails">E-mails</a></li>
+<li><a href="#_twitter">Twitter</a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+                    </div>
+                
+            </div>
+        
 
+    </div>
+    <div class="row">
+        <hr>
         <footer>
-          <p>Copyright © 2011-2014 The Apache Software Foundation,
-            Licensed under the Apache License, Version 2.0.</p>
-          <p>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+            <p>Copyright &copy; 2011-2014 The Apache Software Foundation,
+                Licensed under the Apache License, Version 2.0.</p>
+
+            <p>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
         </footer>
-      </div>
     </div>
-  </div>
+</div>
+
 </body>
 </html>
\ No newline at end of file

Modified: deltaspike/site/trunk/content/staging/suggested-git-workflows.html
URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/staging/suggested-git-workflows.html?rev=1678277&r1=1678276&r2=1678277&view=diff
==============================================================================
--- deltaspike/site/trunk/content/staging/suggested-git-workflows.html (original)
+++ deltaspike/site/trunk/content/staging/suggested-git-workflows.html Fri May  8 00:24:50 2015
@@ -1,44 +1,66 @@
 <!DOCTYPE html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<meta name="description" content="deltaspike-generate-pages">
-<meta name="author" content="chm">
-<!-- No caching headers -->
-<meta http-equiv="cache-control" content="no-cache" />
-<meta http-equiv="pragma" content="no-cache" />
-<meta http-equiv="expires" content="-1" />
-
-<title>Suggested GIT workflows</title>
-
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-
-<!-- Styles -->
-
-<link href="https://deltaspike.apache.org/resources/css/bootstrap.css" rel="stylesheet">
-<link href="https://deltaspike.apache.org/resources/css/bootstrap-responsive.css" rel="stylesheet">
-<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.1.0/css/font-awesome.min.css" rel="stylesheet" >
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="deltaspike-generate-pages">
+    <meta name="author" content="chm">
+    <!-- No caching headers -->
+    <meta http-equiv="cache-control" content="no-cache"/>
+    <meta http-equiv="pragma" content="no-cache"/>
+    <meta http-equiv="expires" content="-1"/>
+
+    <title>Suggested GIT workflows</title>
+
+    <!--
+        Licensed to the Apache Software Foundation (ASF) under one
+        or more contributor license agreements.  See the NOTICE file
+        distributed with this work for additional information
+        regarding copyright ownership.  The ASF licenses this file
+        to you under the Apache License, Version 2.0 (the
+        "License"); you may not use this file except in compliance
+        with the License.  You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+        Unless required by applicable law or agreed to in writing,
+        software distributed under the License is distributed on an
+        "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+        KIND, either express or implied.  See the License for the
+        specific language governing permissions and limitations
+        under the License.
+    -->
+
+    <!-- Styles -->
+    <link href="https://deltaspike.apache.org/resources/css/bootstrap.css" rel="stylesheet">
+    <link href="https://deltaspike.apache.org/resources/css/bootstrap-responsive.css" rel="stylesheet">
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.1.0/css/font-awesome.min.css" rel="stylesheet">
+
+    
+
+    
+        <!-- Tocify - nice dynamic autoscrolling TOC -->
+        <link href="https://cdnjs.cloudflare.com/ajax/libs/jquery.tocify/1.9.0/stylesheets/jquery.tocify.min.css" rel="stylesheet">
+        <script src="https://code.jquery.com/jquery-1.11.3.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.tocify/1.9.0/javascripts/jquery.tocify.min.js"></script>
+
+
+        <script type="text/javascript">
+            $(function () {
+                $("#toc").tocify({
+                    scrollTo: 50,
+                    extendPage: true,
+                    context: "#doc-content",
+                    selectors: "h2,h3,h4,h5"
+                });
+                $(".fallback-toc").hide();
+            });
+        </script>
+    
 
-<style type="text/css">
-/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
+    <style type="text/css">
+        /* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
 /*pre.CodeRay {background-color:#f7f7f8;}*/
 .CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em}
 .CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)}
@@ -128,87 +150,129 @@ table.CodeRay td.code>pre{padding:0}
 .CodeRay .change .change{color:#66f}
 .CodeRay .head .head{color:#f4f}
 
-body {
-  padding-top: 60px;
-  padding-bottom: 40px;
-}
-</style>
-
-<script type="text/javascript">
-
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', 'UA-36103647-1']);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-    })();
+        body {
+            padding-top: 60px;
+            padding-bottom: 40px;
+        }
+
+        .toc-like {
+            border-radius: 6px;
+            border: 1px solid #ccc;
+        }
+
+        .toc-like li {
+            line-height: 30px;
+            text-indent: 10px;
+        }
+
+        .toc-like li.custom-toc-header {
+            font-weight: bold;
+            background: #666;
+            color: white;
+            cursor: initial !important;
+            padding: 5px;
+        }
+
+        .toc-like li.custom-toc-header a {
+            color: white;
+            font-style: normal;
+            text-shadow: none;
+            padding: 0;
+        }
+
+        .toc-like li.custom-toc-header:hover a {
+            background: #666;
+        }
+
+        .page-title {
+            text-align: left;
+        }
+
+        #doc-content h2,
+        #doc-content h3,
+        #doc-content h4,
+        #doc-content h5,
+        #doc-content h6 {
+            padding-top: 0;
+            margin-top: 25px;
+            margin-bottom: 10px;
+            line-height: 1.4em;
+        }
+
+        #doc-content h2 {
+            border-bottom: 1px solid lightgrey;
+        }
+
+
+    </style>
+
+    <script type="text/javascript">
+
+        var _gaq = _gaq || [];
+        _gaq.push(['_setAccount', 'UA-36103647-1']);
+        _gaq.push(['_trackPageview']);
+
+        (function () {
+            var ga = document.createElement('script');
+            ga.type = 'text/javascript';
+            ga.async = true;
+            ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+            var s = document.getElementsByTagName('script')[0];
+            s.parentNode.insertBefore(ga, s);
+        })();
 
-  </script>
+    </script>
 </head>
 
 <body>
 
-  <div class="navbar navbar-fixed-top">
+<div class="navbar navbar-fixed-top">
     <div class="navbar-inner">
-      <div class="container">
-        <a class="btn btn-navbar" data-toggle="collapse"
-          data-target=".nav-collapse"> <span class="icon-bar"></span> <span
-          class="icon-bar"></span> <span class="icon-bar"></span>
-        </a>
-        <a class="brand logocolor" href="./index.html">Apache DeltaSpike</a>
-        <div class="nav-collapse">
-     
-          
-          <ul class="nav">
-            <li><a href="./index.html">Home</a></li>
-            <li ><a href="./documentation">Documentation</a></li>
-            <li  ><a href="./javadoc.html">Javadoc</a></li>
-            <li ><a href="./source.html">Source</a></li>
-            <li ><a href="./download.html">Download</a></li>
-            <li ><a href="./community.html">Community</a></li>
-            <!-- <li><a href="./support.html">Support</a></li>  -->
-            <li ><a href="./news.html">News</a></li>
-            <li ><a href="./migration-guide.html">Migration</a></li>
-          </ul>
+        <div class="container">
+            <a class="btn btn-navbar" data-toggle="collapse"
+               data-target=".nav-collapse"> <span class="icon-bar"></span> <span
+            class="icon-bar"></span> <span class="icon-bar"></span>
+            </a>
+            <a class="brand logocolor" href="./index.html">Apache DeltaSpike</a>
+
+            <div class="nav-collapse">
+
+                
+                <ul class="nav">
+                    <li><a href="./index.html">Home</a></li>
+                    <li ><a href="./documentation">Documentation</a></li>
+                    <li  ><a href="./javadoc.html">Javadoc</a></li>
+                    <li ><a href="./source.html">Source</a></li>
+                    <li ><a href="./download.html">Download</a></li>
+                    <li ><a href="./community.html">Community</a></li>
+                    <!-- <li><a href="./support.html">Support</a></li>  -->
+                    <li ><a href="./news.html">News</a></li>
+                    <li ><a href="./migration-guide.html">Migration</a></li>
+                </ul>
+            </div>
+            <!--/.nav-collapse -->
+            <form id="search-form" action="https://www.google.com/search"
+                  method="get" class="navbar-search pull-right">
+                <input value="deltaspike.apache.org" name="sitesearch"
+                       type="hidden"> <input class="search-query" name="q"
+                                             id="query" type="text">
+            </form>
         </div>
-        <!--/.nav-collapse -->
-        <form id="search-form" action="https://www.google.com/search"
-          method="get" class="navbar-search pull-right">
-          <input value="deltaspike.apache.org" name="sitesearch"
-            type="hidden"> <input class="search-query" name="q"
-            id="query" type="text">
-        </form>
-      </div>
     </div>
-  </div>
+</div>
 
-  <div class="container">
-    <div class="row">
-      <div class="span12">
-        <div class="page-title">
-          <h1>Suggested GIT workflows</h1>
-        </div>
+<div class="container">
+    <div class="row-fluid">
 
-        <div id="toc" class="toc">
-            <ul class="sectlevel1">
-<li><a href="#_avoid_git_pull">Avoid git-pull!</a></li>
-<li><a href="#_git_pull_rebase">git pull --rebase</a>
-<ul class="sectlevel2">
-<li><a href="#_working_in_an_own_branch">Working in an own branch</a></li>
-</ul>
-</li>
-<li><a href="#_contribution_workflow">Contribution workflow</a>
-<ul class="sectlevel2">
-<li><a href="#_creating_patches">Creating patches</a></li>
-</ul>
-</li>
-<li><a href="#_discussion_workflow_optional">Discussion workflow (optional)</a></li>
-</ul>
-            <hr>
-            <div class="sect1">
+        
+
+        <div class="span8">
+            <div class="page-title">
+                <h1>Suggested GIT workflows</h1>
+            </div>
+
+            <div id="doc-content">
+                <div class="sect1">
 <h2 id="_avoid_git_pull">Avoid git-pull!</h2>
 <div class="sectionbody">
 <div class="paragraph">
@@ -464,17 +528,52 @@ $ git branch -d DELTASPIKE-XXX</pre>
 </div>
 </div>
 </div>
+            </div>
         </div>
 
-        <hr>
+        
+            <div class="span4">
+                <div id="toc">
+                    <div class="moduledeps">
+                        <ul class="toc-like nav nav-list">
+                            
+                            
+                            
+                        </ul>
+                    </div>
+                </div>
+                
+                    <div class="fallback-toc">
+                        <ul class="sectlevel1">
+<li><a href="#_avoid_git_pull">Avoid git-pull!</a></li>
+<li><a href="#_git_pull_rebase">git pull --rebase</a>
+<ul class="sectlevel2">
+<li><a href="#_working_in_an_own_branch">Working in an own branch</a></li>
+</ul>
+</li>
+<li><a href="#_contribution_workflow">Contribution workflow</a>
+<ul class="sectlevel2">
+<li><a href="#_creating_patches">Creating patches</a></li>
+</ul>
+</li>
+<li><a href="#_discussion_workflow_optional">Discussion workflow (optional)</a></li>
+</ul>
+                    </div>
+                
+            </div>
+        
 
+    </div>
+    <div class="row">
+        <hr>
         <footer>
-          <p>Copyright © 2011-2014 The Apache Software Foundation,
-            Licensed under the Apache License, Version 2.0.</p>
-          <p>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+            <p>Copyright &copy; 2011-2014 The Apache Software Foundation,
+                Licensed under the Apache License, Version 2.0.</p>
+
+            <p>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
         </footer>
-      </div>
     </div>
-  </div>
+</div>
+
 </body>
 </html>
\ No newline at end of file



Mime
View raw message