Added two new help pages for the 'Automatic Updates' and the 'Network Connecitons' preferences pages.
git-svn-id: https://svn.apache.org/repos/asf/directory/studio/branches/1.1.0@659045 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/rcp-help/src/main/docbook/0_index.xml b/rcp-help/src/main/docbook/0_index.xml
index b8e12ff..41ce6b9 100644
--- a/rcp-help/src/main/docbook/0_index.xml
+++ b/rcp-help/src/main/docbook/0_index.xml
@@ -14,12 +14,14 @@
<!ENTITY help SYSTEM "3.1.1_help.xml">
<!ENTITY help_server SYSTEM "3.1.1.1_help_server.xml">
<!ENTITY install_update SYSTEM "3.1.2_install_update.xml">
- <!ENTITY text_editors SYSTEM "3.1.3_text_editors.xml">
- <!ENTITY accessibility SYSTEM "3.1.3.1_accessibility.xml">
- <!ENTITY annotations SYSTEM "3.1.3.2_annotations.xml">
- <!ENTITY linked_mode SYSTEM "3.1.3.3_linked_mode.xml">
- <!ENTITY quick_diff SYSTEM "3.1.3.4_quick_diff.xml">
- <!ENTITY spelling SYSTEM "3.1.3.5_spelling.xml">
+ <!ENTITY automatic_updates SYSTEM "3.1.2.1_automatic_updates.xml">
+ <!ENTITY network_connections SYSTEM "3.1.3_network_connections.xml">
+ <!ENTITY text_editors SYSTEM "3.1.4_text_editors.xml">
+ <!ENTITY accessibility SYSTEM "3.1.4.1_accessibility.xml">
+ <!ENTITY annotations SYSTEM "3.1.4.2_annotations.xml">
+ <!ENTITY linked_mode SYSTEM "3.1.4.3_linked_mode.xml">
+ <!ENTITY quick_diff SYSTEM "3.1.4.4_quick_diff.xml">
+ <!ENTITY spelling SYSTEM "3.1.4.5_spelling.xml">
<!ENTITY whats_new SYSTEM "4_whats_new.xml">
<!ENTITY release_notes SYSTEM "5_release_notes.xml">
diff --git a/rcp-help/src/main/docbook/3.1.2.1_automatic_updates.xml b/rcp-help/src/main/docbook/3.1.2.1_automatic_updates.xml
new file mode 100644
index 0000000..66871fc
--- /dev/null
+++ b/rcp-help/src/main/docbook/3.1.2.1_automatic_updates.xml
@@ -0,0 +1,88 @@
+<!--
+ 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.
+-->
+<section id="automatic_updates">
+ <title>Automatic Updates</title>
+ <para>
+ The following preferences can be changed on the Automatic
+ Updates page:
+ </para>
+ <para>
+ <informaltable>
+ <tgroup cols="3">
+ <colspec colname="Option" colwidth="1* " />
+ <colspec colname="Description" colwidth="2*" />
+ <colspec colname="Default" colwidth="1*" />
+ <thead>
+ <row>
+ <entry>Option</entry>
+ <entry>Description</entry>
+ <entry>Default</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ Automatically find new updates and notify me
+ </entry>
+ <entry>
+ When selected, Update manager will
+ automatically search for update, as defined
+ by the update schedule
+ </entry>
+ <entry>Off</entry>
+ </row>
+ <row>
+ <entry>Update Schedule</entry>
+ <entry>
+ Look for updates on each startup, or once a
+ day or some day a week, at a predefined
+ time.
+ </entry>
+ <entry>on startup</entry>
+ </row>
+ <row>
+ <entry>Download Options</entry>
+ <entry>
+ This option allows you to choose between
+ having Eclipse search for updates and
+ notifying you of them once they are
+ available or having Eclipse automatically
+ download new updates and asking you to
+ install them.
+ </entry>
+ <entry>on startup</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </para>
+ <para>
+ Here is what the Automatic Updates preferences page looks like:
+ </para>
+ <para>
+ <screenshot>
+ <mediaobject>
+ <imageobject>
+ <imagedata scale="50"
+ fileref="images/automatic-updates_screen.png" format="PNG" />
+ </imageobject>
+ </mediaobject>
+ </screenshot>
+ </para>
+</section>
\ No newline at end of file
diff --git a/rcp-help/src/main/docbook/3.1.2_install_update.xml b/rcp-help/src/main/docbook/3.1.2_install_update.xml
index 52df2ec..a58c03a 100644
--- a/rcp-help/src/main/docbook/3.1.2_install_update.xml
+++ b/rcp-help/src/main/docbook/3.1.2_install_update.xml
@@ -115,4 +115,7 @@
</mediaobject>
</screenshot>
</para>
+
+ &automatic_updates;
+
</section>
\ No newline at end of file
diff --git a/rcp-help/src/main/docbook/3.1.3_network_connections.xml b/rcp-help/src/main/docbook/3.1.3_network_connections.xml
new file mode 100644
index 0000000..f51acf0
--- /dev/null
+++ b/rcp-help/src/main/docbook/3.1.3_network_connections.xml
@@ -0,0 +1,135 @@
+<!--
+ 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.
+-->
+<section id="network_connections">
+ <title>Network Connections</title>
+ <para>
+ The following preferences can be changed on the Network
+ Connections page:
+ </para>
+ <para>
+ <informaltable>
+ <tgroup cols="3">
+ <colspec colname="Option" colwidth="1* " />
+ <colspec colname="Description" colwidth="2*" />
+ <colspec colname="Default" colwidth="1*" />
+ <thead>
+ <row>
+ <entry>Option</entry>
+ <entry>Description</entry>
+ <entry>Default</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>Direct connection to the Internet</entry>
+ <entry>
+ Enable this option to have all connections
+ to remote systems happen directly without
+ involving a proxy server.
+ </entry>
+ <entry>Enabled</entry>
+ </row>
+ <row>
+ <entry>Manual proxy configuration</entry>
+ <entry>
+ Use this option if connections to remote
+ systems should happen through a proxy
+ server.
+ </entry>
+ <entry>Disabled</entry>
+ </row>
+ <row>
+ <entry>HTTP Proxy</entry>
+ <entry>
+ Use this option to specify the server and
+ port that is to be used when making HTTP
+ connections. If the port field is empty, the
+ default port of 80 is used. If the "Use this
+ proxy server for SSL" is checked, the HTTP
+ proxy server is used for SSL connections as
+ well.
+ </entry>
+ <entry></entry>
+ </row>
+ <row>
+ <entry>SSL Proxy</entry>
+ <entry>
+ Use this option to specify the server and
+ port that is to be used when making SSL
+ connections. If the port field is empty, the
+ default port of 443 is used.
+ </entry>
+ <entry></entry>
+ </row>
+ <row>
+ <entry>SOCKS Proxy</entry>
+ <entry>
+ Use this option to specify the server and
+ port that is to be used when making SOCKS
+ connections. If the port field is empty, the
+ default port of 1080 is used. [1]
+ </entry>
+ <entry></entry>
+ </row>
+ <row>
+ <entry>Non-proxied Hosts (No Proxy for)</entry>
+ <entry>
+ Use this table to specify, either by name or
+ pattern, which hosts should not use any
+ proxy but instead should always be connected
+ to directly.
+ </entry>
+ <entry></entry>
+ </row>
+ <row>
+ <entry>Proxy Authentication</entry>
+ <entry>
+ Enable this option to specify a user name
+ and password that is to be used when
+ connecting to the proxy server.
+ </entry>
+ <entry>Disabled</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </para>
+ <para>
+ Here is what the Network Connections preferences page looks
+ like:
+ </para>
+ <para>
+ <screenshot>
+ <mediaobject>
+ <imageobject>
+ <imagedata scale="50"
+ fileref="images/network-connections_screen.png" format="PNG" />
+ </imageobject>
+ </mediaobject>
+ </screenshot>
+ </para>
+ <para>
+ 1. The SOCKS proxy support in Java 1.4 had certain limitations.
+ Due to these limitations, the setting of the SOCKS system
+ properties is not performed when a 1.4 VM is used. The SOCKS
+ proxy may still be used by some tooling when running on a 1.4 VM
+ (e.g. CVS). However, users should use a 1.5 (or 5.0) VM if they
+ require full SOCKS proxy support.
+ </para>
+</section>
\ No newline at end of file
diff --git a/rcp-help/src/main/docbook/3.1.3.1_accessibility.xml b/rcp-help/src/main/docbook/3.1.4.1_accessibility.xml
similarity index 100%
rename from rcp-help/src/main/docbook/3.1.3.1_accessibility.xml
rename to rcp-help/src/main/docbook/3.1.4.1_accessibility.xml
diff --git a/rcp-help/src/main/docbook/3.1.3.2_annotations.xml b/rcp-help/src/main/docbook/3.1.4.2_annotations.xml
similarity index 100%
rename from rcp-help/src/main/docbook/3.1.3.2_annotations.xml
rename to rcp-help/src/main/docbook/3.1.4.2_annotations.xml
diff --git a/rcp-help/src/main/docbook/3.1.3.3_linked_mode.xml b/rcp-help/src/main/docbook/3.1.4.3_linked_mode.xml
similarity index 100%
rename from rcp-help/src/main/docbook/3.1.3.3_linked_mode.xml
rename to rcp-help/src/main/docbook/3.1.4.3_linked_mode.xml
diff --git a/rcp-help/src/main/docbook/3.1.3.4_quick_diff.xml b/rcp-help/src/main/docbook/3.1.4.4_quick_diff.xml
similarity index 100%
rename from rcp-help/src/main/docbook/3.1.3.4_quick_diff.xml
rename to rcp-help/src/main/docbook/3.1.4.4_quick_diff.xml
diff --git a/rcp-help/src/main/docbook/3.1.3.5_spelling.xml b/rcp-help/src/main/docbook/3.1.4.5_spelling.xml
similarity index 100%
rename from rcp-help/src/main/docbook/3.1.3.5_spelling.xml
rename to rcp-help/src/main/docbook/3.1.4.5_spelling.xml
diff --git a/rcp-help/src/main/docbook/3.1.3_text_editors.xml b/rcp-help/src/main/docbook/3.1.4_text_editors.xml
similarity index 100%
rename from rcp-help/src/main/docbook/3.1.3_text_editors.xml
rename to rcp-help/src/main/docbook/3.1.4_text_editors.xml
diff --git a/rcp-help/src/main/docbook/3.1_preferences.xml b/rcp-help/src/main/docbook/3.1_preferences.xml
index f7e954c..047bfa6 100644
--- a/rcp-help/src/main/docbook/3.1_preferences.xml
+++ b/rcp-help/src/main/docbook/3.1_preferences.xml
@@ -49,6 +49,7 @@
&help;
&install_update;
+ &network_connections;
&text_editors;
</section>
\ No newline at end of file
diff --git a/rcp-help/src/main/resources/html/images/automatic-updates_screen.png b/rcp-help/src/main/resources/html/images/automatic-updates_screen.png
new file mode 100644
index 0000000..f934419
--- /dev/null
+++ b/rcp-help/src/main/resources/html/images/automatic-updates_screen.png
Binary files differ
diff --git a/rcp-help/src/main/resources/html/images/network-connections_screen.png b/rcp-help/src/main/resources/html/images/network-connections_screen.png
new file mode 100644
index 0000000..d86ef05
--- /dev/null
+++ b/rcp-help/src/main/resources/html/images/network-connections_screen.png
Binary files differ
