Modified: websites/staging/maven-doxia/trunk/content/source-repository.html ============================================================================== --- websites/staging/maven-doxia/trunk/content/source-repository.html (original) +++ websites/staging/maven-doxia/trunk/content/source-repository.html Sun Oct 22 10:32:54 2017 @@ -1,15 +1,15 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-10-15 + | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-10-22 | Rendered using Apache Maven Fluido Skin 1.5 --> <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20171015" /> + <meta name="Date-Revision-yyyymmdd" content="20171022" /> <meta http-equiv="Content-Language" content="en" /> - <title>Doxia – Source Code Management</title> + <title>Doxia – Source Repository</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.5.min.css" /> <link rel="stylesheet" href="./css/site.css" /> <link rel="stylesheet" href="./css/print.css" media="print" /> @@ -69,10 +69,10 @@ Doxia</a> <span class="divider">/</span> </li> - <li class="active ">Source Code Management</li> + <li class="active ">Source Repository</li> - <li id="publishDate" class="pull-right">Last Published: 2017-10-15</li> + <li id="publishDate" class="pull-right">Last Published: 2017-10-22</li> </ul> </div> @@ -316,55 +316,13 @@ Doxia IDE</a> </li> <li class="nav-header">Project Documentation</li> - + <li> <a href="project-info.html" title="Project Information"> - <span class="icon-chevron-down"></span> + <span class="icon-chevron-right"></span> Project Information</a> - <ul class="nav nav-list"> - - <li> - - <a href="index.html" title="About"> - <span class="none"></span> - About</a> - </li> - - <li> - - <a href="team-list.html" title="Team"> - <span class="none"></span> - Team</a> - </li> - - <li> - - <a href="mail-lists.html" title="Mailing Lists"> - <span class="none"></span> - Mailing Lists</a> - </li> - - <li class="active"> - - <a href="#"><span class="none"></span>Source Code Management</a> - </li> - - <li> - - <a href="issue-tracking.html" title="Issue Management"> - <span class="none"></span> - Issue Management</a> - </li> - - <li> - - <a href="integration.html" title="CI Management"> - <span class="none"></span> - CI Management</a> - </li> - </ul> - </li> + </li> <li class="nav-header">Maven Projects</li> <li> @@ -525,36 +483,103 @@ <div id="bodyColumn" class="span10" > - <div class="section"> -<h2><a name="Overview"></a>Overview</h2><a name="Overview"></a> -<p>This project uses <a class="externalLink" href="http://subversion.apache.org/";>Subversion</a> to manage its source code. Instructions on Subversion use can be found at <a class="externalLink" href="http://svnbook.red-bean.com/";>http://svnbook.red-bean.com/</a>.</p></div> -<div class="section"> -<h2><a name="Web_Browser_Access"></a>Web Browser Access</h2><a name="Web_Browser_Access"></a> -<p>The following is a link to a browsable version of the source repository:</p> -<div class="source"><pre class="prettyprint linenums"><a class="externalLink" href="http://svn.apache.org/viewvc/maven/doxia/";>http://svn.apache.org/viewvc/maven/doxia/</a></pre></div></div> -<div class="section"> -<h2><a name="Anonymous_Access"></a>Anonymous Access</h2><a name="Anonymous_Access"></a> -<p>The source can be checked out anonymously from Subversion with this command:</p> -<div class="source"><pre class="prettyprint linenums">$ svn checkout http://svn.apache.org/repos/asf/maven/doxia/trunks/ doxia</pre></div></div> + + + <div class="section"> +<h2><a name="Source_Repository"></a>Source Repository</h2> + +<p> + Maven Doxia projects use <a class="externalLink" href="http://git-scm.com/";>Git</a> or <a class="externalLink" href="http://subversion.apache.org/";>Subversion</a> to manage their source code: + decisions to stay with Subversion or move to Git are tracked on <a class="externalLink" href="https://cwiki.apache.org/confluence/display/MAVEN/Git+Migration";>Maven's Wiki</a>. + </p> + +<p> + Instructions on Subversion use can be found in the online book <a class="externalLink" href="http://svnbook.red-bean.com/";>Version Control with Subversion</a>. + Instructions on Git use can be found in the online book <a class="externalLink" href="http://git-scm.com/book/";>Pro Git</a>. + Instructions for using the Apache Software Foundation Git repositories are at <a class="externalLink" href="https://git-wip-us.apache.org/";>https://git-wip-us.apache.org</a>. + </p> + + <div class="section"> -<h2><a name="Developer_Access"></a>Developer Access</h2><a name="Developer_Access"></a> -<p>Everyone can access the Subversion repository via HTTP, but committers must checkout the Subversion repository via HTTPS.</p> -<div class="source"><pre class="prettyprint linenums">$ svn checkout https://svn.apache.org/repos/asf/maven/doxia/trunks/ doxia</pre></div> -<p>To commit changes to the repository, execute the following command to commit your changes (svn will prompt you for your password):</p> -<div class="source"><pre class="prettyprint linenums">$ svn commit --username your-username -m "A message"</pre></div></div> +<h3><a name="Components_in_Git"></a>Components in Git</h3> + +<p> + The components in git are: + </p> +<table border="0" class="table table-striped"> + +<tr class="a"> + +<td><a href="/doxia/doxia/">Apache Maven Doxia base</a></td> + +<td> +<div class="source"><pre class="prettyprint linenums"><a class="externalLink" href="https://gitbox.apache.org/repos/asf/maven-doxia.git";>https://gitbox.apache.org/repos/asf/maven-doxia.git</a></pre></div></td> + +<td><a class="externalLink" href="https://github.com/apache/maven-doxia/";>(GitHub mirror)</a></td> + </tr> + +<tr class="b"> + +<td><a href="/doxia/doxia-sitetools/">Apache Maven Doxia Sitetools</a></td> + +<td> +<div class="source"><pre class="prettyprint linenums"><a class="externalLink" href="https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git";>https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git</a></pre></div></td> + +<td><a class="externalLink" href="https://github.com/apache/maven-doxia-sitetools/";>(GitHub mirror)</a></td> + </tr> + </table> + + </div> + + <div class="section"> -<h2><a name="Access_from_Behind_a_Firewall"></a>Access from Behind a Firewall</h2><a name="Access_from_Behind_a_Firewall"></a> -<p>For those users who are stuck behind a corporate firewall which is blocking HTTP access to the Subversion repository, you can try to access it via the developer connection:</p> -<div class="source"><pre class="prettyprint linenums">$ svn checkout https://svn.apache.org/repos/asf/maven/doxia/trunks/ doxia</pre></div></div> +<h3><a name="Components_in_Subversion"></a>Components in Subversion</h3> + +<p> + Everything in Subversion can be checked-out from a single entry point, referencing each part through svn:externals + </p> +<div class="source"><pre class="prettyprint linenums"><a class="externalLink" href="http://svn.apache.org/viewvc/maven/doxia/trunks/";>https://svn.apache.org/repos/asf/maven/doxia/trunks/</a></pre></div> + + +<p> + You can also check out every component separately. The components in Subversion are: + </p> +<table border="0" class="table table-striped"> + +<tr class="a"> + +<td><a href="/doxia/doxia-tools/">Apache Maven Doxia Tools: Linkcheck, Converter, ...</a></td> + +<td> +<div class="source"><pre class="prettyprint linenums"><a class="externalLink" href="https://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/";>https://svn.apache.org/repos/asf/maven/doxia/doxia-tools/trunk/</a></pre></div></td> + +<td><a class="externalLink" href="https://github.com/apache/maven-doxia-tools/";>(GitHub mirror)</a></td> + </tr> + +<tr class="b"> + +<td><a href="/doxia/doxia-ide.html">Apache Maven Doxia IDE</a></td> + +<td> +<div class="source"><pre class="prettyprint linenums"><a class="externalLink" href="https://svn.apache.org/viewvc/maven/doxia/doxia-ide/trunk/";>https://svn.apache.org/repos/asf/maven/doxia/doxia-ide/trunk/</a></pre></div></td> + +<td><a class="externalLink" href="https://github.com/apache/maven-doxia-ide/";>(GitHub mirror)</a></td> + </tr> + </table> + + </div> + + <div class="section"> -<h2><a name="Access_Through_a_Proxy"></a>Access Through a Proxy</h2><a name="Access_Through_a_Proxy"></a> -<p>The Subversion client can go through a proxy, if you configure it to do so. First, edit your "servers" configuration file to indicate which proxy to use. The file's location depends on your operating system. On Linux or Unix it is located in the directory "~/.subversion". On Windows it is in "%APPDATA%\Subversion". (Try "echo %APPDATA%", note this is a hidden directory.)</p> -<p>There are comments in the file explaining what to do. If you don't have that file, get the latest Subversion client and run any command; this will cause the configuration directory and template files to be created.</p> -<p>Example: Edit the 'servers' file and add something like:</p> -<div class="source"><pre class="prettyprint linenums">[global] -http-proxy-host = your.proxy.name -http-proxy-port = 3128 -</pre></div></div> +<h3><a name="Doxia_website"></a>Doxia website</h3> + +<p>The sources for this site are available in a separate Subversion location:</p> + +<div class="source"><pre class="prettyprint linenums"><a class="externalLink" href="https://svn.apache.org/viewvc/maven/doxia/site/trunk";>https://svn.apache.org/repos/asf/maven/doxia/site/trunk</a></pre></div> + </div> + </div> + + </div> </div> </div>
Modified: websites/staging/maven-doxia/trunk/content/team-list.html ============================================================================== --- websites/staging/maven-doxia/trunk/content/team-list.html (original) +++ websites/staging/maven-doxia/trunk/content/team-list.html Sun Oct 22 10:32:54 2017 @@ -1,13 +1,13 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-10-15 + | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-10-22 | Rendered using Apache Maven Fluido Skin 1.5 --> <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20171015" /> + <meta name="Date-Revision-yyyymmdd" content="20171022" /> <meta http-equiv="Content-Language" content="en" /> <title>Doxia – Project Team</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.5.min.css" /> @@ -72,7 +72,7 @@ <li class="active ">Project Team</li> - <li id="publishDate" class="pull-right">Last Published: 2017-10-15</li> + <li id="publishDate" class="pull-right">Last Published: 2017-10-22</li> </ul> </div> @@ -316,7 +316,7 @@ Doxia IDE</a> </li> <li class="nav-header">Project Documentation</li> - + <li> <a href="project-info.html" title="Project Information"> @@ -324,13 +324,6 @@ Project Information</a> <ul class="nav nav-list"> - <li> - - <a href="index.html" title="About"> - <span class="none"></span> - About</a> - </li> - <li class="active"> <a href="#"><span class="none"></span>Team</a> @@ -344,13 +337,6 @@ </li> <li> - - <a href="source-repository.html" title="Source Code Management"> - <span class="none"></span> - Source Code Management</a> - </li> - - <li> <a href="issue-tracking.html" title="Issue Management"> <span class="none"></span> Modified: websites/staging/maven-doxia/trunk/content/upgrading.html ============================================================================== --- websites/staging/maven-doxia/trunk/content/upgrading.html (original) +++ websites/staging/maven-doxia/trunk/content/upgrading.html Sun Oct 22 10:32:54 2017 @@ -1,6 +1,6 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-10-15 + | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-10-22 | Rendered using Apache Maven Fluido Skin 1.5 --> <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> @@ -9,7 +9,7 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="author" content="Lukas Theussl" /> <meta name="Date-Creation-yyyymmdd" content="20110528" /> - <meta name="Date-Revision-yyyymmdd" content="20171015" /> + <meta name="Date-Revision-yyyymmdd" content="20171022" /> <meta http-equiv="Content-Language" content="en" /> <title>Doxia – Upgrading from old versions</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.5.min.css" /> @@ -74,7 +74,7 @@ <li class="active ">Upgrading from old versions</li> - <li id="publishDate" class="pull-right">Last Published: 2017-10-15</li> + <li id="publishDate" class="pull-right">Last Published: 2017-10-22</li> </ul> </div> @@ -332,7 +332,7 @@ Doxia IDE</a> </li> <li class="nav-header">Project Documentation</li> - + <li> <a href="project-info.html" title="Project Information"> Modified: websites/staging/maven-doxia/trunk/content/whatsnew-1.1.html ============================================================================== --- websites/staging/maven-doxia/trunk/content/whatsnew-1.1.html (original) +++ websites/staging/maven-doxia/trunk/content/whatsnew-1.1.html Sun Oct 22 10:32:54 2017 @@ -1,6 +1,6 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-10-15 + | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2017-10-22 | Rendered using Apache Maven Fluido Skin 1.5 --> <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> @@ -9,7 +9,7 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="author" content="Vincent Siveton" /> <meta name="Date-Creation-yyyymmdd" content="20090531" /> - <meta name="Date-Revision-yyyymmdd" content="20171015" /> + <meta name="Date-Revision-yyyymmdd" content="20171022" /> <meta http-equiv="Content-Language" content="en" /> <title>Doxia – What's new in 1.1?</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.5.min.css" /> @@ -74,7 +74,7 @@ <li class="active ">What's new in 1.1?</li> - <li id="publishDate" class="pull-right">Last Published: 2017-10-15</li> + <li id="publishDate" class="pull-right">Last Published: 2017-10-22</li> </ul> </div> @@ -332,7 +332,7 @@ Doxia IDE</a> </li> <li class="nav-header">Project Documentation</li> - + <li> <a href="project-info.html" title="Project Information">
