Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2016-06-15 22:41:44 +0000
committerMatthias Sohn2016-06-15 22:44:48 +0000
commit7672edff6b1ad9a302cf0933c64daf882c959bd4 (patch)
treef00b0d19faded80e7d40fdd2827bb9e764b815ac
parente9b52c7d5f3d161cc773527948571f44403c71cc (diff)
downloadegit-7672edff6b1ad9a302cf0933c64daf882c959bd4.tar.gz
egit-7672edff6b1ad9a302cf0933c64daf882c959bd4.tar.xz
egit-7672edff6b1ad9a302cf0933c64daf882c959bd4.zip
Fix wrong toc.xml in documentation bundle
- fix wrong new and noteworthy version in build-help.xml - regenerate documentation following [1] [1] https://wiki.eclipse.org/EGit/Contributor_Guide#EGit_3 Bug: 496089 Change-Id: I1f60276750b44492d00e78d7b668bce9c4f04d1a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--org.eclipse.egit.doc/build-help.xml4
-rw-r--r--org.eclipse.egit.doc/help/EGit/Contributor_Guide/Documentation.html8
-rw-r--r--org.eclipse.egit.doc/help/toc.xml41
3 files changed, 25 insertions, 28 deletions
diff --git a/org.eclipse.egit.doc/build-help.xml b/org.eclipse.egit.doc/build-help.xml
index 5a207f2d34..de2a09649a 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/4.3" title="EGit 4.3 New and Noteworthy" />
- <path name="JGit/New_and_Noteworthy/4.3" title="JGit 4.3 New and Noteworthy" />
+ <path name="EGit/New_and_Noteworthy/4.4" title="EGit 4.4 New and Noteworthy" />
+ <path name="JGit/New_and_Noteworthy/4.4" title="JGit 4.4 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/Documentation.html b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Documentation.html
index 2547463abe..5e10d17b7a 100644
--- a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Documentation.html
+++ b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Documentation.html
@@ -53,13 +53,17 @@
&lt;id&gt;jgit.website&lt;/id&gt;
&lt;username&gt;username&lt;/username&gt;
&lt;privateKey&gt;${user.home}/.ssh/id_rsa&lt;/privateKey&gt;
+ &lt;password&gt;{&lt;encrypted passphrase&gt;}&lt;/password&gt;
&lt;filePermissions&gt;664&lt;/filePermission&gt;
&lt;directoryPermissions&gt;775&lt;/directoryPermissions&gt;
&lt;configuration&gt;&lt;/configuration&gt;
&lt;/server&gt;
</pre>
- <p>To deploy the site from EGit HIPP (Hudson) at
- <a href="https://hudson.eclipse.org/egit/" target="egit_external">https://hudson.eclipse.org/egit/</a> enable the Maven profile
+ <p>Password encryption for Maven is described in
+ <a href="https://maven.apache.org/guides/mini/guide-encryption.html" target="egit_external">https://maven.apache.org/guides/mini/guide-encryption.html</a>
+ </p>
+ <p>To deploy the site from JGit HIPP (Hudson) at
+ <a href="https://hudson.eclipse.org/jgit/" target="egit_external">https://hudson.eclipse.org/jgit/</a> enable the Maven profile
<b>build-server</b> and add the Maven goals
<b>site:site site:deploy</b>.
</p>
diff --git a/org.eclipse.egit.doc/help/toc.xml b/org.eclipse.egit.doc/help/toc.xml
index 70ee1705d7..5d808ccae8 100644
--- a/org.eclipse.egit.doc/help/toc.xml
+++ b/org.eclipse.egit.doc/help/toc.xml
@@ -442,33 +442,26 @@
</topic>
<topic href="help/JGit/User_Guide/Updating-This-Document.html" label="Updating This Document"></topic>
</topic>
- <topic href="help/EGit/New_and_Noteworthy/4.3/4.3.html" label="EGit 4.3 New and Noteworthy">
- <topic href="help/EGit/New_and_Noteworthy/4.3/4.3.html" label="EGit">
- <topic href="help/EGit/New_and_Noteworthy/4.3/4.3.html#Improve_support_for_submodules_and_nested_repositories" label="Improve support for submodules and nested repositories"></topic>
- <topic href="help/EGit/New_and_Noteworthy/4.3/4.3.html#Staging_View" label="Staging View"></topic>
- <topic href="help/EGit/New_and_Noteworthy/4.3/4.3.html#GitFlow" label="GitFlow"></topic>
- <topic href="help/EGit/New_and_Noteworthy/4.3/4.3.html#Gerrit_support" label="Gerrit support"></topic>
- <topic href="help/EGit/New_and_Noteworthy/4.3/4.3.html#Miscellaneous_enhancements" label="Miscellaneous enhancements"></topic>
- <topic href="help/EGit/New_and_Noteworthy/4.3/4.3.html#EGit_Github_Client" label="EGit Github Client"></topic>
- <topic href="help/EGit/New_and_Noteworthy/4.3/4.3.html#Build_and_release_engineering" label="Build and release engineering"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/4.4/4.4.html" label="EGit 4.4 New and Noteworthy">
+ <topic href="help/EGit/New_and_Noteworthy/4.4/4.4.html" label="EGit">
+ <topic href="help/EGit/New_and_Noteworthy/4.4/4.4.html#Features" label="Features"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/4.4/4.4.html#Gitflow" label="Gitflow"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/4.4/4.4.html#Github" label="Github"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/4.4/4.4.html#Performance" label="Performance"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/4.4/4.4.html#Releng" label="Releng"></topic>
</topic>
- <topic href="help/EGit/New_and_Noteworthy/4.3/Bug-Fixes.html" label="Bug Fixes"></topic>
- <topic href="help/EGit/New_and_Noteworthy/4.3/Contributors.html" label="Contributors"></topic>
- <topic href="help/EGit/New_and_Noteworthy/4.3/Updating-This-Document.html" label="Updating This Document"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/4.4/Bug-Fixes.html" label="Bug Fixes"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/4.4/Contributors.html" label="Contributors"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/4.4/Updating-This-Document.html" label="Updating This Document"></topic>
</topic>
- <topic href="help/JGit/New_and_Noteworthy/4.3/4.3.html" label="JGit 4.3 New and Noteworthy">
- <topic href="help/JGit/New_and_Noteworthy/4.3/4.3.html" label="JGit">
- <topic href="help/JGit/New_and_Noteworthy/4.3/4.3.html#Git_attributes_support" label="Git attributes support"></topic>
- <topic href="help/JGit/New_and_Noteworthy/4.3/4.3.html#Large_File_Storage_.28LFS.29_Extension" label="Large File Storage (LFS) Extension"></topic>
- <topic href="help/JGit/New_and_Noteworthy/4.3/4.3.html#RefTree" label="RefTree"></topic>
- <topic href="help/JGit/New_and_Noteworthy/4.3/4.3.html#Git_Ketch" label="Git Ketch"></topic>
- <topic href="help/JGit/New_and_Noteworthy/4.3/4.3.html#Repo_command" label="Repo command"></topic>
- <topic href="help/JGit/New_and_Noteworthy/4.3/4.3.html#Miscellaneous" label="Miscellaneous"></topic>
- <topic href="help/JGit/New_and_Noteworthy/4.3/4.3.html#Build_and_Release_Engineering" label="Build and Release Engineering"></topic>
+ <topic href="help/JGit/New_and_Noteworthy/4.4/4.4.html" label="JGit 4.4 New and Noteworthy">
+ <topic href="help/JGit/New_and_Noteworthy/4.4/4.4.html" label="JGit">
+ <topic href="help/JGit/New_and_Noteworthy/4.4/4.4.html#Features" label="Features"></topic>
+ <topic href="help/JGit/New_and_Noteworthy/4.4/4.4.html#Releng" label="Releng"></topic>
</topic>
- <topic href="help/JGit/New_and_Noteworthy/4.3/Bug-Fixes.html" label="Bug Fixes"></topic>
- <topic href="help/JGit/New_and_Noteworthy/4.3/Contributors.html" label="Contributors"></topic>
- <topic href="help/JGit/New_and_Noteworthy/4.3/Updating-This-Document.html" label="Updating This Document"></topic>
+ <topic href="help/JGit/New_and_Noteworthy/4.4/Bug-Fixes.html" label="Bug Fixes"></topic>
+ <topic href="help/JGit/New_and_Noteworthy/4.4/Contributors.html" label="Contributors"></topic>
+ <topic href="help/JGit/New_and_Noteworthy/4.4/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>

Back to the top