Author: kwright
Date: Sat May 21 14:03:04 2016
New Revision: 1744949
URL: http://svn.apache.org/viewvc?rev=1744949&view=rev
Log:
Fix for CONNECTORS-1318. Committed on behalf of KOIZUMI Satoru.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/end-user-documentation.xml
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1744949&r1=1744948&r2=1744949&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Sat May 21 14:03:04 2016
@@ -3,6 +3,9 @@ $Id$
======================= 2.5-dev =====================
+CONNECTORS-1318: Documentation errors.
+(KOIZUMI Satoru)
+
CONNECTORS-1317: Missing JDOM2 dependency for Tika.
(Karl Wright)
Modified:
manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/end-user-documentation.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/end-user-documentation.xml?rev=1744949&r1=1744948&r2=1744949&view=diff
==============================================================================
---
manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/end-user-documentation.xml
(original)
+++
manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/end-user-documentation.xml
Sat May 21 14:03:04 2016
@@ -153,9 +153,9 @@
<p>The summary screen contains a line where the connection's
status is displayed. If you did everything correctly, the message "Connection
working" will be displayed as a status.
If there was a problem, you will see a
connection-type-specific diagnostic message instead. If this happens, you will
need to correct the problem, by either fixing your infrastructure,
or by editing the connection configuration
appropriately, before the transformation connection will work correctly.</p>
- <p>Also note that there are five buttons along the bottom of
the display: "Refresh", "Edit", and "Delete". We'll
+ <p>Also note that there are three buttons along the bottom of
the display: "Refresh", "Edit", and "Delete". We'll
go into the purpose for each of these buttons in
turn.</p>
- <p>The "Refresh" button simply reloads the view page for the
output connection, and updates the connection status. Use this button when you
have made changes to the external system
+ <p>The "Refresh" button simply reloads the view page for the
transformation connection, and updates the connection status. Use this button
when you have made changes to the external system
your transformation connection is connected to that
might affect whether the connection will succeed or not.</p>
<p>The "Edit" button allows you to go back and edit the
connection parameters. Use this button if you want to change the connection's
characteristics or specifications in any way.</p>
<p>The "Delete" button allows you to delete the connection.
Use this button if you no longer want the connection to remain in the available
list of transformation connections. Note that ManifoldCF
