diff options
author | Matthias Sohn | 2015-06-08 16:50:35 -0400 |
---|---|---|
committer | Matthias Sohn | 2015-06-08 17:11:27 -0400 |
commit | 7d85ce9be99b0fe436f5d227511e241dfe90cc29 (patch) | |
tree | f358a77467516301395f1b25148189a42cbdfb54 | |
parent | 3279d387cb59c0a641c7064ba107de3fdb0f070c (diff) | |
download | egit-7d85ce9be99b0fe436f5d227511e241dfe90cc29.tar.gz egit-7d85ce9be99b0fe436f5d227511e241dfe90cc29.tar.xz egit-7d85ce9be99b0fe436f5d227511e241dfe90cc29.zip |
Update documentation for 4.0
Change-Id: I2e62e59a80f86a747947c56e633b66ec43756b54
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
17 files changed, 313 insertions, 216 deletions
diff --git a/org.eclipse.egit.doc/build-help.xml b/org.eclipse.egit.doc/build-help.xml index 82f92a5a9..e480f4518 100644 --- a/org.eclipse.egit.doc/build-help.xml +++ b/org.eclipse.egit.doc/build-help.xml @@ -47,8 +47,8 @@ > <path name="EGit/User_Guide" title="EGit User Guide" /> <path name="JGit/User_Guide" title="JGit User Guide" /> - <path name="EGit/New_and_Noteworthy/3.7" title="EGit 3.7 New and Noteworthy" /> - <path name="JGit/New_and_Noteworthy/3.7" title="JGit 3.7 New and Noteworthy" /> + <path name="EGit/New_and_Noteworthy/4.0" title="EGit 4.0 New and Noteworthy" /> + <path name="JGit/New_and_Noteworthy/4.0" title="JGit 4.0 New and Noteworthy" /> <path name="EGit/Git_For_Eclipse_Users" title="Git for Eclipse Users" /> <path name="EGit/Contributor_Guide" title="EGit Contributor Guide" /> <stylesheet url="book.css" /> diff --git a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Contributing-Patches.html b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Contributing-Patches.html index e2df24b7b..c86669417 100644 --- a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Contributing-Patches.html +++ b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Contributing-Patches.html @@ -371,11 +371,8 @@ Copyright (C) YEAR Your Name <you@example.org> </p> <ul> <li>Run all existing tests. It does not take very long.</li> - <li>Pay attention to the Java and Eclipse SDK baselines. EGit requires only Java5 and Eclipse 3.5. You cannot use API's that are newer. We often see breakages because Java 6 API's are used.</li> + <li>Pay attention to the Java and Eclipse SDK baselines. EGit requires only Java 7 and Eclipse 3.8.2. You cannot use API's that are newer.</li> </ul> - <p>Note: In order to test in Eclipse 3.5 (Galileo), consider building EGit with the <code>platform-galileo</code> maven profile (see the - <a href="Builds.html#Maven_Build_Sequence">Maven Build Sequence</a> for more details). - </p> <h2 id="Sending_patches_by_mail">Sending patches by mail</h2> <p>Although sending patches by mail is the approved way of interacting with, and asking feedback from, the Git project, please don't send patches via <a href="http://www.kernel.org/pub//software/scm/git/docs/git-send-email.html" target="egit_external">git send-email</a>. Instead, please use diff --git a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Development-IDE-Configuration.html b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Development-IDE-Configuration.html index d9dec5ef3..82f48a612 100644 --- a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Development-IDE-Configuration.html +++ b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Development-IDE-Configuration.html @@ -58,13 +58,13 @@ <li>Restart</li> </ul> <h2 id="Java_Requirements">Java Requirements</h2> - <p>EGit and JGit have Java 5.0 and + <p>EGit and JGit have Java 7.0 and <a href="https://wiki.eclipse.org/EGit/FAQ#What_versions_of_Eclipse_does_EGit_target.3F" target="egit_external">Eclipse Platform 3.8.2 (Juno)</a> as minimum requirements, so dependencies to newer Java and platform versions must be avoided. </p> <p>We are using <i>PDE/API Tools Environment Descriptions</i> (see changes for <a href="https://git.eclipse.org/r/#/c/4785/" target="egit_external">JGit</a> and - <a href="https://git.eclipse.org/r/#/c/4365/" target="egit_external">EGit</a>) to facilitate detecting code which isn't working on Java 5. If you followed the instructions in the + <a href="https://git.eclipse.org/r/#/c/4365/" target="egit_external">EGit</a>) to facilitate detecting code which isn't working on Java 7. If you followed the instructions in the <i>Tools</i> section above, the necessary descriptions should already be installed. Otherwise install <i>PDE/API Tools Environment Descriptions</i> from the release train repository, see <a href="http://wiki.eclipse.org/Execution_Environments#Installing_Execution_Environment_Descriptions" title="Execution_Environments#Installing_Execution_Environment_Descriptions" target="egit_external">Installing Execution Environment Descriptions</a>. diff --git a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Documentation.html b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Documentation.html index a17bd3ef6..257d6e8a9 100644 --- a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Documentation.html +++ b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Documentation.html @@ -63,6 +63,9 @@ <b>build-server</b> and add the Maven goals <b>site:site site:deploy</b>. </p> + <p>If you uploaded the site for a new release update the index + /home/data/httpd/download.eclipse.org/jgit/docs/latest/apidocs/index.html + to refer to the new release's site.</p> <h2 id="EGit_3">EGit</h2> <p>The EGit project sources its documentation from the wiki and generates Eclipse help content from it (under the covers, we are using <a href="http://wiki.eclipse.org/Mylyn/WikiText" target="egit_external">Mylyn WikiText</a> to make this possible). This significantly lowers the barrier for people to contribute documentation to the EGit project. To contribute documentation, simply modify the diff --git a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Tests.html b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Tests.html index 3ff25984b..a3f2ad75a 100644 --- a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Tests.html +++ b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Tests.html @@ -40,8 +40,8 @@ <p>To run these tests from Eclipse the Jetty feature is needed. Use one of the target platforms as described in <a href="Development-IDE-Configuration.html#Dependencies">dependencies</a>. </p> - <p>Alternatively, install "Jetty 7.6.11.v20130520" from - <a href="http://download.eclipse.org/jetty/updates/jetty-bundles-7.x/7.6.11.v20130520/" target="egit_external">http://download.eclipse.org/jetty/updates/jetty-bundles-7.x/7.6.11.v20130520/</a> . + <p>Alternatively, install "Jetty 9.2.10.v20150310" from + <a href="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.2.10.v20150310/" target="egit_external">http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.2.10.v20150310/</a> </p> <h2 id="EGit_Core_Tests">EGit Core Tests</h2> <p>The EGit Core tests are executed during the maven build for the bundle diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.7/3.7.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.7/3.7.html deleted file mode 100644 index 5c8c251ba..000000000 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.7/3.7.html +++ /dev/null @@ -1,77 +0,0 @@ -<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>EGit 3.7 New and Noteworthy</title> - <link type="text/css" rel="stylesheet" href="../../../book.css"/> - </head> - <body> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <th style="width: 100%" align="center" colspan="3">EGit 3.7 New and Noteworthy</th> - </tr> - <tr> - <td style="width: 20%" align="left"></td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right"> - <a href="Bug-Fixes.html" title="Bug Fixes"> - <img alt="Next" border="0" src="../../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top"></td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Bug Fixes</td> - </tr> - </table><hr/> - <h1 id="EGit">EGit</h1> - <h2 id="Features">Features</h2> - <ul> - <li>Enable using staging view for submodule repositories</li> - <li>Double click on conflicting files in staging view opens the merge tool instead of compare view</li> - <li>Consider URLs with and without ".git" when importing project sets</li> - <li>Handle external files in CommitUI.getSelectedFiles()</li> - </ul> - <h3 id="GitHub_Connector">GitHub Connector</h3> - <ul> - <li>No new features</li> - </ul> - <h2 id="Usability_Improvements">Usability Improvements</h2> - <ul> - <li>"Updating index" should indicate that view is "busy"</li> - <li>"Refresh" operation should indicate that view is "busy"</li> - <li>Case insensitive order of remotes in push branch dialog</li> - <li>Transparent icons in push branch dialog</li> - <li>Make EGit Eclipse welcome page more consistent with other team providers</li> - <li>Automatically configure gerrit for projects cloned from a Gerrit server</li> - </ul> - <h2 id="Performance_Improvements">Performance Improvements</h2> - <ul> - <li>Scalability: don't run incremental update if there are too many changes</li> - <li>Scalability: label decorator should cache computed repository branch state. This heavily speeds up resource decoration for large repositories</li> - <li>Fixed many UI freezes reported via Mars automated error reporting (see issue list).</li> - </ul> - <h2 id="Release_Engineering_and_Build">Release Engineering and Build</h2> - <ul> - <li>Update build to Tycho 0.22</li> - <li>Use target platform DSL and generator to maintain target platforms</li> - </ul><hr/> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <td style="width: 20%" align="left"></td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right"> - <a href="Bug-Fixes.html" title="Bug Fixes"> - <img alt="Next" border="0" src="../../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top"></td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Bug Fixes</td> - </tr> - </table> - </body> -</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.0/4.0.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.0/4.0.html new file mode 100644 index 000000000..9a4b0dc22 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.0/4.0.html @@ -0,0 +1,93 @@ +<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + <title>EGit 4.0 New and Noteworthy</title> + <link type="text/css" rel="stylesheet" href="../../../book.css"/> + </head> + <body> + <table class="navigation" style="width: 100%;" border="0" summary="navigation"> + <tr> + <th style="width: 100%" align="center" colspan="3">EGit 4.0 New and Noteworthy</th> + </tr> + <tr> + <td style="width: 20%" align="left"></td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right"> + <a href="Bug-Fixes.html" title="Bug Fixes"> + <img alt="Next" border="0" src="../../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top"></td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Bug Fixes</td> + </tr> + </table><hr/> + <h1 id="EGit">EGit</h1> + <h2 id="Features">Features</h2> + <ul> + <li>Extend EGit to support git-flow + <a href="1">1</a> to automate git branching workflow + </li> + <li>Introduce internal API to integrate Team merging to prepare support for model merge</li> + <li>Wizard for invoking automated project import</li> + <li>Prevent Git Staging view to lose data when precommit hook aborts commit</li> + <li>Show message dialog when hook aborts commit</li> + <li>Java templates variables for Git config variables</li> + </ul> + <p> + <a href="1">1</a> + <a href="http://jeffkreeftmeijer.com/2010/why-arent-you-using-git-flow/" target="egit_external">http://jeffkreeftmeijer.com/2010/why-arent-you-using-git-flow/</a> + </p> + <h2 id="Usability_Improvements">Usability Improvements</h2> + <ul> + <li>Sort branches in "Push to Gerrit" wizard case insensitive</li> + <li>Automatic wildcard matching in "Add Git repositories" dialog</li> + <li>Make PushResultDialog non-modal</li> + <li>Properly style PushResultDialog in dark theme</li> + <li>Fix styling of staging view and commit dialog for dark theme</li> + <li>Add interactive rebase tooltip descriptions</li> + <li>Raise warning if second line of commit message isn't empty</li> + <li>Add sash to PushResultTable to allow resizing text field used to display push message</li> + <li>Avoid blinking cursor in merge result dialog</li> + <li>Accept git clone command as URI in clone wizard</li> + <li>Close commit editor after deleting stash</li> + <li>Consider different users and repo suffixes in project import</li> + <li>Make welcome page contribution more consistent</li> + </ul> + <h2 id="Performance_Improvements">Performance Improvements</h2> + <ul> + <li>Use image descriptors cache for external programs</li> + <li>Optimizations for GitResourceDeltaVisitor visit()</li> + <li>Fix ResourceUtil performance on big repositories/workspaces</li> + <li>Allow to switch the branch sequence off in the commit message viewer</li> + </ul> + <h2 id="Build_and_release_engineering">Build and release engineering</h2> + <ul> + <li>Update minimum required Java version to Java 7</li> + <li>Update build to use eclipse-jarsigner-plugin 1.1.2</li> + <li>Update to Jetty 9.2.10</li> + <li>Update to javax.servlet 3.1</li> + <li>Oomph configuration to setup Eclipse for EGit contributors</li> + <li>Update build to use Tycho 0.23.0</li> + </ul><hr/> + <table class="navigation" style="width: 100%;" border="0" summary="navigation"> + <tr> + <td style="width: 20%" align="left"></td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right"> + <a href="Bug-Fixes.html" title="Bug Fixes"> + <img alt="Next" border="0" src="../../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top"></td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Bug Fixes</td> + </tr> + </table> + </body> +</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.7/Bug-Fixes.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.0/Bug-Fixes.html index 93a54ed77..a473c9da3 100644 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.7/Bug-Fixes.html +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.0/Bug-Fixes.html @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>EGit 3.7 New and Noteworthy - Bug Fixes</title> + <title>EGit 4.0 New and Noteworthy - Bug Fixes</title> <link type="text/css" rel="stylesheet" href="../../../book.css"/> </head> <body> @@ -12,7 +12,7 @@ </tr> <tr> <td style="width: 20%" align="left"> - <a href="3.7.html" title="EGit 3.7 New and Noteworthy"> + <a href="4.0.html" title="EGit 4.0 New and Noteworthy"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> @@ -24,25 +24,25 @@ </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">EGit 3.7 New and Noteworthy</td> + <td style="width: 20%" align="left" valign="top">EGit 4.0 New and Noteworthy</td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right" valign="top">Contributors</td> </tr> </table><hr/> <h1 id="Bug_Fixes">Bug Fixes</h1> <p> - <a href="https://bugs.eclipse.org/bugs/buglist.cgi?resolution=FIXED&resolution=DUPLICATE&classification=Technology&list_id=10006180&order=Importance&product=EGit&query_format=advanced&target_milestone=3.7" target="egit_external">22 Bugs and 1 enhancement requests</a> were closed + <a href="https://bugs.eclipse.org/bugs/buglist.cgi?resolution=FIXED&resolution=DUPLICATE&classification=Technology&list_id=10006180&order=Importance&product=EGit&query_format=advanced&target_milestone=4.0" target="egit_external">40 Bugs and 5 enhancement requests</a> were closed </p><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> <td style="width: 20%" align="left"> - <a href="3.7.html" title="EGit 3.7 New and Noteworthy"> + <a href="4.0.html" title="EGit 4.0 New and Noteworthy"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> <td style="width: 60%" align="center"> - <a href="3.7.html" title="EGit 3.7 New and Noteworthy"> - <img alt="EGit 3.7 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="4.0.html" title="EGit 4.0 New and Noteworthy"> + <img alt="EGit 4.0 New and Noteworthy" border="0" src="../../../images/home.gif"/> </a> </td> <td style="width: 20%" align="right"> @@ -52,7 +52,7 @@ </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">EGit 3.7 New and Noteworthy</td> + <td style="width: 20%" align="left" valign="top">EGit 4.0 New and Noteworthy</td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right" valign="top">Contributors</td> </tr> diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.7/Contributors.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.0/Contributors.html index ffa9e8582..ebd382e83 100644 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.7/Contributors.html +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.0/Contributors.html @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>EGit 3.7 New and Noteworthy - Contributors</title> + <title>EGit 4.0 New and Noteworthy - Contributors</title> <link type="text/css" rel="stylesheet" href="../../../book.css"/> </head> <body> @@ -30,18 +30,28 @@ </tr> </table><hr/> <h1 id="Contributors">Contributors</h1> - <p>The following 11 developers worked on this release:</p> - <p>Alexander Kurtakov, - Andreas Hermann, - Andrey Loskutov, + <p>The following 21 developers worked on this release:</p> + <p>Andrey Loskutov, Christian Georgi, Christian Halstrick, - Johannes Dorn, + Chris Rebert, + Dani Megert, + Erwin van Eyk, + Fabio Zadrozny, + Gunnar Wagenknecht, + Jon Ander Peñalba, + Kyle J. Harms, + Lars Vogel, + Laurent Delaigue, + Laurent Goubet, Markus Keller, Matthias Sohn, + Max Hohenegger, + Michael Mathews, Michael Keppler, - Robin Stocker, - Tomasz Zarna</p><hr/> + Mickael Istria, + Radim Hopp, + rnveach</p><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> <td style="width: 20%" align="left"> @@ -50,8 +60,8 @@ </a> </td> <td style="width: 60%" align="center"> - <a href="3.7.html" title="EGit 3.7 New and Noteworthy"> - <img alt="EGit 3.7 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="4.0.html" title="EGit 4.0 New and Noteworthy"> + <img alt="EGit 4.0 New and Noteworthy" border="0" src="../../../images/home.gif"/> </a> </td> <td style="width: 20%" align="right"> diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.7/Updating-This-Document.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.0/Updating-This-Document.html index 930d7a6a0..bb6ac72dd 100644 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.7/Updating-This-Document.html +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.0/Updating-This-Document.html @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>EGit 3.7 New and Noteworthy - Updating This Document</title> + <title>EGit 4.0 New and Noteworthy - Updating This Document</title> <link type="text/css" rel="stylesheet" href="../../../book.css"/> </head> <body> @@ -29,7 +29,7 @@ <p> This document is maintained in a collaborative wiki. If you wish to update or modify this document please visit - <a href="http://wiki.eclipse.org/EGit/New_and_Noteworthy/3.7" target="egit_external">http://wiki.eclipse.org/EGit/New_and_Noteworthy/3.7</a> + <a href="http://wiki.eclipse.org/EGit/New_and_Noteworthy/4.0" target="egit_external">http://wiki.eclipse.org/EGit/New_and_Noteworthy/4.0</a> </p><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> @@ -39,8 +39,8 @@ </a> </td> <td style="width: 60%" align="center"> - <a href="3.7.html" title="EGit 3.7 New and Noteworthy"> - <img alt="EGit 3.7 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="4.0.html" title="EGit 4.0 New and Noteworthy"> + <img alt="EGit 4.0 New and Noteworthy" border="0" src="../../../images/home.gif"/> </a> </td> <td style="width: 20%" align="right"></td> diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html b/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html index 57dbcef68..db94b0b0c 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html @@ -713,6 +713,20 @@ <p> <img border="0" src="images/Egit-3.1-GerritDownloadCommand.png"/> </p> + <h2 id="Working_with_Gitflow">Working with Gitflow</h2> + <p>If you are using Gitflow ( + <a href="http://nvie.com/posts/a-successful-git-branching-model/" target="egit_external">http://nvie.com/posts/a-successful-git-branching-model/</a>), EGit allows you to work with Gitflow operations, managing feature, release and hotfix branches. + </p> + <h3 id="Enabling_Gitflow_for_a_repository">Enabling Gitflow for a repository</h3> + <p>Gitflow operation will not appear, unless the selected repository is configured for Gitflow. To do that, open the context menu on a repository in the Git Repositories view and select + <b>Init Git Flow</b>. + You can skip this step, if your repository was already configured for Gitflow by another client. + </p> + <h3 id="Starting_a_feature.2Frelease.2Fhotfix">Starting a feature/release/hotfix</h3> + <p>Right-click on a repository, select + <b>Git Flow</b>, and select the appropriate start command. + </p> + <p>A dialog will appear that lets you enter a name for the Gitflow branch, adding the correct prefix automatically.</p> <h2 id="Inspecting_the_state_of_the_Repository">Inspecting the state of the Repository</h2> <h3 id="Label_Decorations">Label Decorations</h3> <p>Label decorations show Git-specific information about resources under Git version control. They appear in all views showing model objects, like Package Explorer, Project Explorer, Navigator, and Hierarchy View.</p> @@ -1025,7 +1039,8 @@ <img border="0" src="images/Egit-1.2-commit-dialog-path-assist.png"/> </p> <p>The commit message editor supports content assist for file names shown in Files section of the commit dialog, which can be activated pressing Ctrl+Space.</p> - <p> + <p><div id="Footer_Tags"></div> + <b>Footer Tags</b> <br/> diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.7/3.7.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.7/3.7.html deleted file mode 100644 index 6bbc8af91..000000000 --- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.7/3.7.html +++ /dev/null @@ -1,63 +0,0 @@ -<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>JGit 3.7 New and Noteworthy</title> - <link type="text/css" rel="stylesheet" href="../../../book.css"/> - </head> - <body> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <th style="width: 100%" align="center" colspan="3">JGit 3.7 New and Noteworthy</th> - </tr> - <tr> - <td style="width: 20%" align="left"></td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right"> - <a href="Bug-Fixes.html" title="Bug Fixes"> - <img alt="Next" border="0" src="../../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top"></td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Bug Fixes</td> - </tr> - </table><hr/> - <h1 id="JGit">JGit</h1> - <h2 id="Features">Features</h2> - <ul> - <li>Add basic support for .gitattributes</li> - <li>Use slf4j for logging</li> - <li>Introduce hook support into the FS implementations (on Posix and Cygwin)</li> - <li>Support for the pre-commit hook</li> - <li>Provide more details in exceptions thrown when packfile is invalid</li> - </ul> - <h2 id="JGit_Command_Line">JGit Command Line</h2> - <ul> - <li>JGit command line: add option --orphan for checkout command</li> - </ul> - <h2 id="Build_and_Release_Engineering">Build and Release Engineering</h2> - <ul> - <li>Update build to use Tycho 0.22</li> - <li>Use target platform DSL and generator to maintain target platforms</li> - </ul><hr/> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <td style="width: 20%" align="left"></td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right"> - <a href="Bug-Fixes.html" title="Bug Fixes"> - <img alt="Next" border="0" src="../../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top"></td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Bug Fixes</td> - </tr> - </table> - </body> -</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.0/4.0.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.0/4.0.html new file mode 100644 index 000000000..4e092a6f8 --- /dev/null +++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.0/4.0.html @@ -0,0 +1,105 @@ +<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + <title>JGit 4.0 New and Noteworthy</title> + <link type="text/css" rel="stylesheet" href="../../../book.css"/> + </head> + <body> + <table class="navigation" style="width: 100%;" border="0" summary="navigation"> + <tr> + <th style="width: 100%" align="center" colspan="3">JGit 4.0 New and Noteworthy</th> + </tr> + <tr> + <td style="width: 20%" align="left"></td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right"> + <a href="Bug-Fixes.html" title="Bug Fixes"> + <img alt="Next" border="0" src="../../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top"></td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Bug Fixes</td> + </tr> + </table><hr/> + <h1 id="JGit">JGit</h1> + <h2 id="Update_to_Java_7">Update to Java 7</h2> + <ul> + <li>Update minimum required Java version from Java 5 to Java 7</li> + <li>Remove bundles org.eclipse.jgit.console and org.eclipse.jgit.java7 which are no longer needed due to update to Java 7</li> + <li>Implement AutoClosable and use it to ensure resource held by JGit get released when they are no longer needed</li> + </ul> + <h2 id="API_cleanup">API cleanup</h2> + <ul> + <li>Replace release() methods by close() to support AutoClosable</li> + <li>Delete some deprecated classes and methods, details are available in Clirr API change report</li> + <li>ObjectReader: remove the walkAdvice API</li> + </ul> + <h2 id="Configuration">Configuration</h2> + <ul> + <li>Remove the gitprefix logic and rework detecting Git system config file</li> + <li>Allow to manually set the path to the Git system config file</li> + <li>Add fsck.allowInvalidPersonIdent to accept invalid author/committers</li> + </ul> + <h2 id="Protocol">Protocol</h2> + <ul> + <li>Add support for quiet capability to ReceivePack</li> + <li>Support agent= capability in wire protocol</li> + </ul> + <h2 id="Hooks">Hooks</h2> + <ul> + <li>Support for the commit-msg hook</li> + </ul> + <h2 id="Misc._Enhancements">Misc. Enhancements</h2> + <ul> + <li>Allow ObjectWalk to be filtered by an arbitrary predicate</li> + <li>Use ANY_DIFF filter in ResolveMerger for bare repositories</li> + <li>ObjectWalk: make setRetainBody(false) the default</li> + <li>Make MyersDiff interruptible</li> + <li>Support --untracked-files in command line status command</li> + <li>Support "--long" option in DescribeCommand and command line describe command</li> + <li>Make s3 domain dynamic to support different s3 regions in AmazonS3 transport</li> + <li>Allow public access to PackIndex</li> + <li>Enhance ArchiveCommand to allow passing options to underlying stream</li> + </ul> + <h2 id="Introduce_logging">Introduce logging</h2> + <ul> + <li>Use slf4j API to enable logging in JGit</li> + <li>Use log4j-slf4j to log from org.eclipse.jgit.pgm</li> + </ul> + <h2 id="Performance_Improvements">Performance Improvements</h2> + <ul> + <li>Optimize EolAwareOutputStream for bulk output</li> + <li>Buffer TemporaryBuffer's overflow output stream used by ResolveMerger to improve performance</li> + <li>RevWalk: Discard uninteresting commits unless RevSort.BOUNDARY</li> + </ul> + <h2 id="Build_and_release_engineering">Build and release engineering</h2> + <ul> + <li>Update build to use eclipse-jarsigner-plugin 1.1.2</li> + <li>Update build to use Tycho 0.23.0</li> + <li>Update all standard maven plugins to latest versions</li> + <li>Update to Jetty 9.2.10</li> + <li>Update to javax.servlet 3.1</li> + <li>Added more reports to Maven site</li> + </ul><hr/> + <table class="navigation" style="width: 100%;" border="0" summary="navigation"> + <tr> + <td style="width: 20%" align="left"></td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right"> + <a href="Bug-Fixes.html" title="Bug Fixes"> + <img alt="Next" border="0" src="../../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top"></td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Bug Fixes</td> + </tr> + </table> + </body> +</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.7/Bug-Fixes.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.0/Bug-Fixes.html index d36eda382..601bb84ea 100644 --- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.7/Bug-Fixes.html +++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.0/Bug-Fixes.html @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>JGit 3.7 New and Noteworthy - Bug Fixes</title> + <title>JGit 4.0 New and Noteworthy - Bug Fixes</title> <link type="text/css" rel="stylesheet" href="../../../book.css"/> </head> <body> @@ -12,7 +12,7 @@ </tr> <tr> <td style="width: 20%" align="left"> - <a href="3.7.html" title="JGit 3.7 New and Noteworthy"> + <a href="4.0.html" title="JGit 4.0 New and Noteworthy"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> @@ -24,25 +24,25 @@ </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">JGit 3.7 New and Noteworthy</td> + <td style="width: 20%" align="left" valign="top">JGit 4.0 New and Noteworthy</td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right" valign="top">Contributors</td> </tr> </table><hr/> <h1 id="Bug_Fixes">Bug Fixes</h1> <p> - <a href="https://bugs.eclipse.org/bugs/buglist.cgi?classification=Technology&list_id=10006180&order=Importance&product=JGit&query_format=advanced&resolution=FIXED&resolution=DUPLICATE&target_milestone=3.7" target="egit_external">3 Bugs and 0 enhancement requests</a> were closed + <a href="https://bugs.eclipse.org/bugs/buglist.cgi?classification=Technology&list_id=10006180&order=Importance&product=JGit&query_format=advanced&resolution=FIXED&resolution=DUPLICATE&target_milestone=4.0" target="egit_external">10 Bugs and 1 enhancement requests</a> were closed </p><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> <td style="width: 20%" align="left"> - <a href="3.7.html" title="JGit 3.7 New and Noteworthy"> + <a href="4.0.html" title="JGit 4.0 New and Noteworthy"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> <td style="width: 60%" align="center"> - <a href="3.7.html" title="JGit 3.7 New and Noteworthy"> - <img alt="JGit 3.7 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="4.0.html" title="JGit 4.0 New and Noteworthy"> + <img alt="JGit 4.0 New and Noteworthy" border="0" src="../../../images/home.gif"/> </a> </td> <td style="width: 20%" align="right"> @@ -52,7 +52,7 @@ </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">JGit 3.7 New and Noteworthy</td> + <td style="width: 20%" align="left" valign="top">JGit 4.0 New and Noteworthy</td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right" valign="top">Contributors</td> </tr> diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.7/Contributors.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.0/Contributors.html index cfdfd5310..882a9cad0 100644 --- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.7/Contributors.html +++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.0/Contributors.html @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>JGit 3.7 New and Noteworthy - Contributors</title> + <title>JGit 4.0 New and Noteworthy - Contributors</title> <link type="text/css" rel="stylesheet" href="../../../book.css"/> </head> <body> @@ -30,21 +30,27 @@ </tr> </table><hr/> <h1 id="Contributors">Contributors</h1> - <p>The following 14 developers worked on this release of JGit:</p> - <p>Alexander Kurtakov, - Andrey Loskutov, - Arthur Daussy, + <p>The following 20 developers worked on this release of JGit :</p> + <p>Andrey Loskutov, + André de Oliveira, Christian Halstrick, Dave Borowitz, + David Ostrovsky, David Pletcher, - Frank Wagner, - Ilmars Poikans, + Hector Oswaldo Caballero, + Hugo Arès, Jonathan Nieder, - Laurent Goubet, + Kaloyan Raev, + Laurent Delaigue, + Markus Duft, + Matthew Spurrier, Matthias Sohn, - Rüdiger Herrmann, + Saša Živkov, + Sebastian Schuberth, Shawn Pearce, - Stefan Beller</p><hr/> + Stefan Beller, + Terry Parker, + Yuxuan 'fishy' Wang</p><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> <td style="width: 20%" align="left"> @@ -53,8 +59,8 @@ </a> </td> <td style="width: 60%" align="center"> - <a href="3.7.html" title="JGit 3.7 New and Noteworthy"> - <img alt="JGit 3.7 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="4.0.html" title="JGit 4.0 New and Noteworthy"> + <img alt="JGit 4.0 New and Noteworthy" border="0" src="../../../images/home.gif"/> </a> </td> <td style="width: 20%" align="right"> diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.7/Updating-This-Document.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.0/Updating-This-Document.html index a28b5f4db..9e937c231 100644 --- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.7/Updating-This-Document.html +++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.0/Updating-This-Document.html @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>JGit 3.7 New and Noteworthy - Updating This Document</title> + <title>JGit 4.0 New and Noteworthy - Updating This Document</title> <link type="text/css" rel="stylesheet" href="../../../book.css"/> </head> <body> @@ -29,7 +29,7 @@ <p> This document is maintained in a collaborative wiki. If you wish to update or modify this document please visit - <a href="http://wiki.eclipse.org/JGit/New_and_Noteworthy/3.7" target="egit_external">http://wiki.eclipse.org/JGit/New_and_Noteworthy/3.7</a> + <a href="http://wiki.eclipse.org/JGit/New_and_Noteworthy/4.0" target="egit_external">http://wiki.eclipse.org/JGit/New_and_Noteworthy/4.0</a> </p><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> @@ -39,8 +39,8 @@ </a> </td> <td style="width: 60%" align="center"> - <a href="3.7.html" title="JGit 3.7 New and Noteworthy"> - <img alt="JGit 3.7 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="4.0.html" title="JGit 4.0 New and Noteworthy"> + <img alt="JGit 4.0 New and Noteworthy" border="0" src="../../../images/home.gif"/> </a> </td> <td style="width: 20%" align="right"></td> diff --git a/org.eclipse.egit.doc/help/toc.xml b/org.eclipse.egit.doc/help/toc.xml index f7fb0f86d..22af51faa 100644 --- a/org.eclipse.egit.doc/help/toc.xml +++ b/org.eclipse.egit.doc/help/toc.xml @@ -99,6 +99,10 @@ </topic> <topic href="help/EGit/User_Guide/Tasks.html#Fetching_a_change_from_a_Gerrit_Code_Review_Server" label="Fetching a change from a Gerrit Code Review Server"></topic> </topic> + <topic href="help/EGit/User_Guide/Tasks.html#Working_with_Gitflow" label="Working with Gitflow"> + <topic href="help/EGit/User_Guide/Tasks.html#Enabling_Gitflow_for_a_repository" label="Enabling Gitflow for a repository"></topic> + <topic href="help/EGit/User_Guide/Tasks.html#Starting_a_feature.2Frelease.2Fhotfix" label="Starting a feature/release/hotfix"></topic> + </topic> <topic href="help/EGit/User_Guide/Tasks.html#Inspecting_the_state_of_the_Repository" label="Inspecting the state of the Repository"> <topic href="help/EGit/User_Guide/Tasks.html#Label_Decorations" label="Label Decorations"> <topic href="help/EGit/User_Guide/Tasks.html#Text_Decorations" label="Text Decorations"></topic> @@ -437,28 +441,32 @@ </topic> <topic href="help/JGit/User_Guide/Updating-This-Document.html" label="Updating This Document"></topic> </topic> - <topic href="help/EGit/New_and_Noteworthy/3.7/3.7.html" label="EGit 3.7 New and Noteworthy"> - <topic href="help/EGit/New_and_Noteworthy/3.7/3.7.html" label="EGit"> - <topic href="help/EGit/New_and_Noteworthy/3.7/3.7.html#Features" label="Features"> - <topic href="help/EGit/New_and_Noteworthy/3.7/3.7.html#GitHub_Connector" label="GitHub Connector"></topic> - </topic> - <topic href="help/EGit/New_and_Noteworthy/3.7/3.7.html#Usability_Improvements" label="Usability Improvements"></topic> - <topic href="help/EGit/New_and_Noteworthy/3.7/3.7.html#Performance_Improvements" label="Performance Improvements"></topic> - <topic href="help/EGit/New_and_Noteworthy/3.7/3.7.html#Release_Engineering_and_Build" label="Release Engineering and Build"></topic> + <topic href="help/EGit/New_and_Noteworthy/4.0/4.0.html" label="EGit 4.0 New and Noteworthy"> + <topic href="help/EGit/New_and_Noteworthy/4.0/4.0.html" label="EGit"> + <topic href="help/EGit/New_and_Noteworthy/4.0/4.0.html#Features" label="Features"></topic> + <topic href="help/EGit/New_and_Noteworthy/4.0/4.0.html#Usability_Improvements" label="Usability Improvements"></topic> + <topic href="help/EGit/New_and_Noteworthy/4.0/4.0.html#Performance_Improvements" label="Performance Improvements"></topic> + <topic href="help/EGit/New_and_Noteworthy/4.0/4.0.html#Build_and_release_engineering" label="Build and release engineering"></topic> </topic> - <topic href="help/EGit/New_and_Noteworthy/3.7/Bug-Fixes.html" label="Bug Fixes"></topic> - <topic href="help/EGit/New_and_Noteworthy/3.7/Contributors.html" label="Contributors"></topic> - <topic href="help/EGit/New_and_Noteworthy/3.7/Updating-This-Document.html" label="Updating This Document"></topic> + <topic href="help/EGit/New_and_Noteworthy/4.0/Bug-Fixes.html" label="Bug Fixes"></topic> + <topic href="help/EGit/New_and_Noteworthy/4.0/Contributors.html" label="Contributors"></topic> + <topic href="help/EGit/New_and_Noteworthy/4.0/Updating-This-Document.html" label="Updating This Document"></topic> </topic> - <topic href="help/JGit/New_and_Noteworthy/3.7/3.7.html" label="JGit 3.7 New and Noteworthy"> - <topic href="help/JGit/New_and_Noteworthy/3.7/3.7.html" label="JGit"> - <topic href="help/JGit/New_and_Noteworthy/3.7/3.7.html#Features" label="Features"></topic> - <topic href="help/JGit/New_and_Noteworthy/3.7/3.7.html#JGit_Command_Line" label="JGit Command Line"></topic> - <topic href="help/JGit/New_and_Noteworthy/3.7/3.7.html#Build_and_Release_Engineering" label="Build and Release Engineering"></topic> + <topic href="help/JGit/New_and_Noteworthy/4.0/4.0.html" label="JGit 4.0 New and Noteworthy"> + <topic href="help/JGit/New_and_Noteworthy/4.0/4.0.html" label="JGit"> + <topic href="help/JGit/New_and_Noteworthy/4.0/4.0.html#Update_to_Java_7" label="Update to Java 7"></topic> + <topic href="help/JGit/New_and_Noteworthy/4.0/4.0.html#API_cleanup" label="API cleanup"></topic> + <topic href="help/JGit/New_and_Noteworthy/4.0/4.0.html#Configuration" label="Configuration"></topic> + <topic href="help/JGit/New_and_Noteworthy/4.0/4.0.html#Protocol" label="Protocol"></topic> + <topic href="help/JGit/New_and_Noteworthy/4.0/4.0.html#Hooks" label="Hooks"></topic> + <topic href="help/JGit/New_and_Noteworthy/4.0/4.0.html#Misc._Enhancements" label="Misc. Enhancements"></topic> + <topic href="help/JGit/New_and_Noteworthy/4.0/4.0.html#Introduce_logging" label="Introduce logging"></topic> + <topic href="help/JGit/New_and_Noteworthy/4.0/4.0.html#Performance_Improvements" label="Performance Improvements"></topic> + <topic href="help/JGit/New_and_Noteworthy/4.0/4.0.html#Build_and_release_engineering" label="Build and release engineering"></topic> </topic> - <topic href="help/JGit/New_and_Noteworthy/3.7/Bug-Fixes.html" label="Bug Fixes"></topic> - <topic href="help/JGit/New_and_Noteworthy/3.7/Contributors.html" label="Contributors"></topic> - <topic href="help/JGit/New_and_Noteworthy/3.7/Updating-This-Document.html" label="Updating This Document"></topic> + <topic href="help/JGit/New_and_Noteworthy/4.0/Bug-Fixes.html" label="Bug Fixes"></topic> + <topic href="help/JGit/New_and_Noteworthy/4.0/Contributors.html" label="Contributors"></topic> + <topic href="help/JGit/New_and_Noteworthy/4.0/Updating-This-Document.html" label="Updating This Document"></topic> </topic> <topic href="help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html" label="Git for Eclipse Users"> <topic href="help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html" label="Centralised version control systems"></topic> |