Modified: websites/staging/deltaspike/trunk/content/staging/steps_for_a_release.html ============================================================================== --- websites/staging/deltaspike/trunk/content/staging/steps_for_a_release.html (original) +++ websites/staging/deltaspike/trunk/content/staging/steps_for_a_release.html Tue Dec 30 22:27:06 2014 @@ -12,7 +12,24 @@ <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. --> +<!-- + 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 --> @@ -112,69 +129,69 @@ table.CodeRay td.code>pre{padding:0} .CodeRay .head .head{color:#f4f} body { - padding-top: 60px; - padding-bottom: 40px; + 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); - })(); - - </script> + 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> </head> <body> - <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 class="active"><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="./documentation/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="http://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 class="container"> - <div class="row"> - <div class="span12"> - <div class="page-title"> - <h1>Steps for a Release</h1> - </div> + <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 class="active"><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="./documentation/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="http://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 class="container"> + <div class="row"> + <div class="span12"> + <div class="page-title"> + <h1>Steps for a Release</h1> + </div> - <div id="toc" class="toc"> - <ul class="sectlevel1"> + <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> @@ -198,9 +215,8 @@ body { </ul> </li> </ul> - <hr> - - <div class="sect1"> + <hr> + <div class="sect1"> <h2 id="_preparations">Preparations</h2> <div class="sectionbody"> <div class="ulist"> @@ -519,17 +535,17 @@ Enjoy! </div> </div> </div> - </div> - - <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> - </footer> + </div> - </div> - <!-- /.container --> + <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> + </footer> + </div> + </div> + </div> </body> </html> \ No newline at end of file
Modified: websites/staging/deltaspike/trunk/content/staging/suggested-git-workflows.html ============================================================================== --- websites/staging/deltaspike/trunk/content/staging/suggested-git-workflows.html (original) +++ websites/staging/deltaspike/trunk/content/staging/suggested-git-workflows.html Tue Dec 30 22:27:06 2014 @@ -12,7 +12,24 @@ <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. --> +<!-- + 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 --> @@ -112,69 +129,69 @@ table.CodeRay td.code>pre{padding:0} .CodeRay .head .head{color:#f4f} body { - padding-top: 60px; - padding-bottom: 40px; + 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); - })(); - - </script> + 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> </head> <body> - <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 class="active"><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="./documentation/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="http://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 class="container"> - <div class="row"> - <div class="span12"> - <div class="page-title"> - <h1>Suggested GIT workflows</h1> - </div> + <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 class="active"><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="./documentation/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="http://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 class="container"> + <div class="row"> + <div class="span12"> + <div class="page-title"> + <h1>Suggested GIT workflows</h1> + </div> - <div id="toc" class="toc"> - <ul class="sectlevel1"> + <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"> @@ -188,9 +205,8 @@ body { </li> <li><a href="#_discussion_workflow_optional">Discussion workflow (optional)</a></li> </ul> - <hr> - - <div class="sect1"> + <hr> + <div class="sect1"> <h2 id="_avoid_git_pull">Avoid git-pull!</h2> <div class="sectionbody"> <div class="paragraph"> @@ -446,17 +462,17 @@ $ git branch -d DELTASPIKE-XXX</pre> </div> </div> </div> - </div> - - <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> - </footer> + </div> - </div> - <!-- /.container --> + <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> + </footer> + </div> + </div> + </div> </body> </html> \ No newline at end of file
