4:19 a.m.
Author: jaredmorgs
Date: 2012-02-23 22:19:39 -0500 (Thu, 23 Feb 2012)
New Revision: 8455
Modified:
epp/docs/branches/5.2/User_Guide/en-US/Book_Info.xml
epp/docs/branches/5.2/User_Guide/en-US/Revision_History.xml
epp/docs/branches/5.2/User_Guide/en-US/User_Guide.ent
epp/docs/branches/5.2/User_Guide/en-US/modules/Account.xml
epp/docs/branches/5.2/User_Guide/en-US/modules/account/Register_New_Accounts.xml
epp/docs/branches/5.2/User_Guide/en-US/modules/portal/Manage_Pages.xml
epp/docs/branches/5.2/User_Guide/en-US/modules/portal/Manage_Portals.xml
Log:
Added a Captcha section to the User management chapter of the guide as part of
https://bugzilla.redhat.com/show_bug.cgi?id=794451
Modified: epp/docs/branches/5.2/User_Guide/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/5.2/User_Guide/en-US/Book_Info.xml 2012-02-23 23:15:23 UTC (rev
8454)
+++ epp/docs/branches/5.2/User_Guide/en-US/Book_Info.xml 2012-02-24 03:19:39 UTC (rev
8455)
@@ -8,7 +8,7 @@
<productname>JBoss Enterprise Portal Platform</productname>
<productnumber>5.2</productnumber>
<edition>5.2.1</edition>
- <pubsnumber>3</pubsnumber>
+ <pubsnumber>5</pubsnumber>
<abstract>
<para>
This document provides an easy to follow guide to the functions and
Modified: epp/docs/branches/5.2/User_Guide/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/5.2/User_Guide/en-US/Revision_History.xml 2012-02-23 23:15:23 UTC
(rev 8454)
+++ epp/docs/branches/5.2/User_Guide/en-US/Revision_History.xml 2012-02-24 03:19:39 UTC
(rev 8455)
@@ -8,6 +8,34 @@
<simpara>
<revhistory>
<revision>
+ <revnumber>5.2.1-5</revnumber>
+ <date>Fri Feb 24 2012</date>
+ <author>
+ <firstname>Jared</firstname>
+ <surname>Morgan</surname>
+ <email/>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Added a Captcha section to the User management chapter of the
guide as part of https://bugzilla.redhat.com/show_bug.cgi?id=794451 .</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
+ <revnumber>5.2.1-4</revnumber>
+ <date>Fri Feb 24 2012</date>
+ <author>
+ <firstname>Jared</firstname>
+ <surname>Morgan</surname>
+ <email/>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Finalized content for
https://bugzilla.redhat.com/show_bug.cgi?id=794408 .</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>5.2.1-3</revnumber>
<date>Wed Feb 22 2012</date>
<author>
Modified: epp/docs/branches/5.2/User_Guide/en-US/User_Guide.ent
===================================================================
--- epp/docs/branches/5.2/User_Guide/en-US/User_Guide.ent 2012-02-23 23:15:23 UTC (rev
8454)
+++ epp/docs/branches/5.2/User_Guide/en-US/User_Guide.ent 2012-02-24 03:19:39 UTC (rev
8455)
@@ -10,10 +10,10 @@
<!ENTITY BZURL "<ulink
url='https://bugzilla.redhat.com/enter_bug.cgi?product=JBoss&perc...
<!-- Corporate Specifics: -->
-<!ENTITY YEAR "2011">
+<!ENTITY YEAR "2012">
<!ENTITY HOLDER "Red Hat, Inc">
<!-- Version Specifcs: -->
<!ENTITY VX "5">
<!ENTITY VY "5.2">
-<!ENTITY VZ "5.2.0">
\ No newline at end of file
+<!ENTITY VZ "5.2.1">
Modified: epp/docs/branches/5.2/User_Guide/en-US/modules/Account.xml
===================================================================
--- epp/docs/branches/5.2/User_Guide/en-US/modules/Account.xml 2012-02-23 23:15:23 UTC
(rev 8454)
+++ epp/docs/branches/5.2/User_Guide/en-US/modules/Account.xml 2012-02-24 03:19:39 UTC
(rev 8455)
@@ -1,10 +1,10 @@
-<?xml version='1.0' encoding='utf-8' ?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "../User_Guide.ent">
%BOOK_ENTITIES;
]>
<chapter id="chap-User_Guide-Account">
- <!--
+<!--
Copyright (C) 2009 eXo Platform SAS.
@@ -23,13 +23,10 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Accounts</title>
- <xi:include href="account/Register_New_Accounts.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="account/Sign_in_and_Sign_out.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="account/Remember_User_Account.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="account/Change_Account_Settings.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
-<!-- <xi:include href="account/Change_User_Password.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" /> - Covered in
Change_Account_Setings.xml -->
- <xi:include href="account/Account_and_Password_Retrieval.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
-
+ --> <title>Accounts</title>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="account/Register_New_Accounts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="account/Sign_in_and_Sign_out.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="account/Remember_User_Account.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="account/Change_Account_Settings.xml"/>
+<!-- <xi:include href="account/Change_User_Password.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" /> - Covered in
Change_Account_Setings.xml --> <xi:include
xmlns:xi="http://www.w3.org/2001/XInclude"
href="account/Account_and_Password_Retrieval.xml"/>
</chapter>
-
Modified:
epp/docs/branches/5.2/User_Guide/en-US/modules/account/Register_New_Accounts.xml
===================================================================
---
epp/docs/branches/5.2/User_Guide/en-US/modules/account/Register_New_Accounts.xml 2012-02-23
23:15:23 UTC (rev 8454)
+++
epp/docs/branches/5.2/User_Guide/en-US/modules/account/Register_New_Accounts.xml 2012-02-24
03:19:39 UTC (rev 8455)
@@ -1,114 +1,116 @@
-<?xml version='1.0' encoding='utf-8' ?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "../../User_Guide.ent">
%BOOK_ENTITIES;
]>
<section id="sect-User_Guide-Register_New_Accounts">
- <title>Register New Accounts</title>
- <para>
+ <title>Register New Accounts</title>
+ <para>
Unregistered users visiting a portal in public mode are limited in the content
they can see.
</para>
- <para>
+ <para>
Users who need access to deeper content or who need to perform actions within the
portal should register themselves and then contact the portal administrator to gain
appropriate access permissions to their account.
</para>
- <para>
+ <para>
Users can quickly and easily register a new account for themselves.
</para>
- <procedure>
- <step>
- <para>
+ <procedure>
+ <step>
+ <para>
Click <emphasis role="bold">Register</emphasis> on
the Navigation bar.
</para>
-
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/Register.png"
format="PNG" align="center" scale="100"/>
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/Register.png"
format="PNG" align="center" scalefit="1"
contentwidth="150mm" />
- </imageobject>
- </mediaobject>
- <para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata align="center" scale="100"
fileref="images/Register.png" format="PNG"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata contentwidth="150mm" align="center"
scalefit="1" fileref="images/Register.png"
format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ <para>
The <emphasis role="bold">Register New
Account</emphasis> page appears:
</para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/AccountSetting.png"
format="PNG" align="center" scale="100"/>
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/AccountSetting.png"
format="PNG" align="center" scalefit="1"
contentwidth="150mm"/>
- </imageobject>
- </mediaobject>
-
- <para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata align="center" scale="100"
fileref="images/AccountSetting.png" format="PNG"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata contentwidth="150mm" align="center"
scalefit="1" fileref="images/AccountSetting.png"
format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ <para>
Complete the form with the required information:
</para>
-
- <variablelist>
- <varlistentry>
- <term><emphasis role="bold">User
Name</emphasis></term>
- <listitem>
- <para>
+ <variablelist>
+ <varlistentry>
+ <term>
+ <emphasis role="bold">User Name</emphasis>
+ </term>
+ <listitem>
+ <para>
The name used to log in. This username must be
between 3 and 30 characters long, start with a character. Only alpha, digit, underscore,
dash and dot characters are allowed for the username. Click the magnifying glass icon
beside the user name to check whether the chosen username is available.
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis
role="bold">Password</emphasis></term>
- <listitem>
- <para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <emphasis role="bold">Password</emphasis>
+ </term>
+ <listitem>
+ <para>
The password must be between 6 and 30 characters and
can contain spaces.
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis role="bold">Confirm
Password</emphasis></term>
- <listitem>
- <para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <emphasis role="bold">Confirm Password</emphasis>
+ </term>
+ <listitem>
+ <para>
Re-type the password above. The
<emphasis>Password</emphasis> and <emphasis>Confirm
Password</emphasis> fields must be the same.
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis role="bold">First
Name</emphasis></term>
- <listitem>
- <para>
- The user's first name. This name must be between
1 and 45 characters long.
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <emphasis role="bold">First Name</emphasis>
+ </term>
+ <listitem>
+ <para>
+ The user's first name. This name must be
between 1 and 45 characters long.
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis role="bold">Last
Name</emphasis></term>
- <listitem>
- <para>
- The user's last name. This name must also be
between 1 and 45 characters long.
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <emphasis role="bold">Last Name</emphasis>
+ </term>
+ <listitem>
+ <para>
+ The user's last name. This name must also be
between 1 and 45 characters long.
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis role="bold">Email
Address</emphasis></term>
- <listitem>
- <para>
- The user's email address. This must be in the
appropriate format. For example: <replaceable>username(a)abc.com</replaceable>.
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <emphasis role="bold">Email Address</emphasis>
+ </term>
+ <listitem>
+ <para>
+ The user's email address. This must be in
the appropriate format. For example:
<replaceable>username(a)abc.com</replaceable>.
</para>
- </listitem>
- </varlistentry>
- </variablelist>
- </step>
- <step>
- <para>
- Enter the text displayed at <literal>Text
Validation</literal> into the empty field below it:
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </step>
+ <step>
+ <para>Enter the text displayed at <literal>Text
Validation</literal> into the empty field below it.
</para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/Verification.png"
format="PNG" align="center" scale="100" />
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/Verification.png"
format="PNG" align="center" contentwidth="90mm" />
- </imageobject>
- </mediaobject>
- </step>
-
+ <note>
+ <para>This field can be disabled by an administrator by following the
instructions in <xref
linkend="task-Set_Register_Account_Capcha_Behavior"/>.</para>
+ </note>
+ </step>
<!-- <step>
<para>
Input values in the <emphasis role="bold">User
Profile</emphasis> tab, include: Profile information, Home information, Business
information. These fields are not required.
@@ -121,58 +123,106 @@
<imagedata fileref="images/UserProfile.png"
format="PNG" align="center" width="444" />
</imageobject>
</mediaobject>
- </step> -->
- <step>
- <para>
+ </step> --> <step>
+ <para>
Click <emphasis role="bold">Subscribe</emphasis> to
register a new account or <emphasis role="bold">Reset</emphasis> to
refresh all entered values. You cannot add a new account if one of the following cases
occurs:
</para>
- <itemizedlist>
- <listitem>
- <para>
+ <itemizedlist>
+ <listitem>
+ <para>
The chosen <emphasis role="bold">User
name</emphasis> already exists or is invalid.
</para>
- </listitem>
- <listitem>
- <para>
+ </listitem>
+ <listitem>
+ <para>
The <emphasis role="bold">User
name</emphasis> has less than 3 characters or more than 30 characters.
</para>
- </listitem>
- <listitem>
- <para>
+ </listitem>
+ <listitem>
+ <para>
The <emphasis
role="bold">Password</emphasis> has less than 6 characters or more than
30 characters.
</para>
- </listitem>
- <listitem>
- <para>
+ </listitem>
+ <listitem>
+ <para>
The <emphasis
role="bold">Password</emphasis> and <emphasis
role="bold">Confirm Password</emphasis> fields are not the same.
</para>
- </listitem>
- <listitem>
- <para>
+ </listitem>
+ <listitem>
+ <para>
The <emphasis role="bold">Email
Address</emphasis> format is not valid.
</para>
- </listitem>
- <listitem>
- <para>
+ </listitem>
+ <listitem>
+ <para>
The <emphasis role="bold">text
verification</emphasis> is not correct.
</para>
- </listitem>
- <listitem>
- <para>
+ </listitem>
+ <listitem>
+ <para>
A required field (or fields) is empty.
</para>
- </listitem>
- </itemizedlist>
- </step>
- </procedure>
- <para>
+ </listitem>
+ </itemizedlist>
+ </step>
+ </procedure>
+ <para>
After adding a new account, you should contact the administrator to set
appropriate permissions on your account.
<note>
- <para>
+ <para>
Be sure you enter your email address carefully. Should you forget your
user name or password, you can recover it from this email address.
</para>
- </note>
+ </note>
</para>
+ <section id="Captcha_Behavior">
+ <title><remark>BZ#794451 </remark>Captcha Behavior</title>
+ <para>You can set whether Captcha is used to verify the an actual person. The
Captcha behavior is enabled by default in the Register Account portlet.</para>
+ <task id="task-Set_Register_Account_Capcha_Behavior_1">
+ <title><remark>BZ#794451 </remark>Task: Disable
"Register New Account" Captcha Behavior</title>
+ <tasksummary>
+ <para>Complete this task to control how Captcha behaves when a user
registers an account.</para>
+ </tasksummary>
+ <taskprerequisites>
+ <title>Prerequisites</title>
+ <itemizedlist>
+ <listitem>
+ <para>You are logged into the portal using an account with
Administrator privileges.</para>
+ </listitem>
+ </itemizedlist>
+ </taskprerequisites>
+ <procedure>
+ <step>
+ <para>Click <menuchoice>
+ <guimenu>Group</guimenu>
+ <guimenu>Administration</guimenu>
+ <guimenu>Page Management</guimenu>
+ </menuchoice>.</para>
+ </step>
+ <step>
+ <para>Click the <guibutton>Edit Page</guibutton> icon in the
Action column for the portal::classic::register Page ID.</para>
+ </step>
+ <step>
+ <para>Click on the Register Account portlet, and then click the Edit
Portal icon (pencil icon) to open portlet properties.</para>
+ <note>
+ <para>Click the <guibutton>Switch View mode</guibutton>
button in the Page Editor control to switch between WYSIWYG and Object mode.</para>
+ </note>
+ </step>
+ <step>
+ <para>Click the Edit Mode tab (if not already selected), and clear the
<guilabel>Use captcha</guilabel> box to disable Captcha verification for new
users.</para>
+ </step>
+ <step>
+ <para>Click <guibutton>Save</guibutton>, and then click
<guibutton>Close</guibutton> to commit the changes.</para>
+ </step>
+ <step>
+ <para>In the Page Editor control, click <guibutton>Switch View
mode</guibutton> to refresh the portlet. </para>
+ </step>
+ <step>
+ <formalpara>
+ <title>Result</title>
+ <para>The Register New Account portlet will no longer display the
Captcha field.</para>
+ </formalpara>
+ </step>
+ </procedure>
+ </task>
+ </section>
</section>
-
-
Modified: epp/docs/branches/5.2/User_Guide/en-US/modules/portal/Manage_Pages.xml
===================================================================
--- epp/docs/branches/5.2/User_Guide/en-US/modules/portal/Manage_Pages.xml 2012-02-23
23:15:23 UTC (rev 8454)
+++ epp/docs/branches/5.2/User_Guide/en-US/modules/portal/Manage_Pages.xml 2012-02-24
03:19:39 UTC (rev 8455)
@@ -1,332 +1,354 @@
-<?xml version='1.0' encoding='utf-8' ?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "../../User_Guide.ent">
%BOOK_ENTITIES;
]>
<section id="sect-User_Guide-Manage_Pages">
- <title>Manage Pages</title>
- <section id="sect-User_Guide-Manage_Pages-Adding_a_new_Page">
- <title>Adding a new Page</title>
-
- <section id="sect-User_Guide-Page_Creation_Wizard">
- <title>Adding a new Page using Page Creation Wizard</title>
- <para>
+ <title>Manage Pages</title>
+ <section id="sect-User_Guide-Manage_Pages-Adding_a_new_Page">
+ <title>Adding a new Page</title>
+ <section id="sect-User_Guide-Page_Creation_Wizard">
+ <title>Adding a new Page using Page Creation Wizard</title>
+ <para>
A page creation wizard is available to administrators in order to create
and publish portal pages quickly and easily.
</para>
- <procedure>
- <step>
- <para>
+ <procedure>
+ <step>
+ <para>
Mouse over <emphasis role="bold">Site
Editor</emphasis> then select <emphasis role="bold">Add New
Page</emphasis>.
</para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/Wizard1.png"
format="PNG" align="center" scale="100" />
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/Wizard1.png"
format="PNG" align="center" contentwidth="150mm" />
- </imageobject>
- </mediaobject>
- </step>
- <step>
- <para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata align="center" scale="100"
fileref="images/Wizard1.png" format="PNG"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata contentwidth="150mm" align="center"
fileref="images/Wizard1.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ </step>
+ <step>
+ <para>
The wizard window is divided into two sections: the left pane
contains the existing page/node hierarchy and the right pane displays the <emphasis
role="bold">Page Editor</emphasis>.
</para>
-
- </step>
- <step>
- <para>
+ </step>
+ <step>
+ <para>
In the left pane, you can navigate up and down the node/page
structure:
</para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/Pagewizard1.png"
format="PNG" align="center" scale="100" />
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/Pagewizard1.png"
format="PNG" align="center" contentwidth="150mm" />
- </imageobject>
- </mediaobject>
- </step>
- <step>
- <para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata align="center" scale="100"
fileref="images/Pagewizard1.png" format="PNG"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata contentwidth="150mm" align="center"
fileref="images/Pagewizard1.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ </step>
+ <step>
+ <para>
In the right pane are the required parameters for a new page:
</para>
- <variablelist>
- <varlistentry>
- <term><emphasis role="bold">Current
Selected Page Node</emphasis></term>
- <listitem>
- <para>
+ <variablelist>
+ <varlistentry>
+ <term>
+ <emphasis role="bold">Current Selected Page
Node</emphasis>
+ </term>
+ <listitem>
+ <para>
The path of the selected node to add a new sub page
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis role="bold">Node
Name</emphasis></term>
- <listitem>
- <para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <emphasis role="bold">Node Name</emphasis>
+ </term>
+ <listitem>
+ <para>
The node name of the added page. It is required field.
This field must start with a character and must have a length between 3 and 30
characters.
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>Extended label mode</term>
- <listitem>
- <para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Extended label mode</term>
+ <listitem>
+ <para>
This is a new feature which allows Administrators to
add labels to pages in multiple supported languages. When the language of the site is
changed, the pages will display the appropriate localized label.
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>Language</term>
- <listitem>
- <para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Language</term>
+ <listitem>
+ <para>
Set the language for the page.
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis role="bold">Display
Name</emphasis></term>
- <listitem>
- <para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <emphasis role="bold">Display Name</emphasis>
+ </term>
+ <listitem>
+ <para>
The display name of the node which contains the added
page and must have a length between 3 and 30 characters.
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis
role="bold">Visible</emphasis></term>
- <listitem>
- <para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <emphasis role="bold">Visible</emphasis>
+ </term>
+ <listitem>
+ <para>
This checkbox toggles the global visibility of this page.
</para>
- <para>
- If checked the page or the page node appears on the
navigation bar, the page navigation and the site map. If "visible" is checked
the visibility depends on the "publication date & time" attribute.
+ <para>
+ If checked the page or the page node appears on the
navigation bar, the page navigation and the site map. If "visible" is
checked the visibility depends on the "publication date & time"
attribute.
</para>
- <para>
+ <para>
If unchecked, the page is not shown in the site map or
navigation bar.
</para>
- <important>
- <title>Non-visible Pages and
Security</title>
- <para>
- The <guilabel>Visible</guilabel>
checkbox should <emphasis role="bold">not</emphasis> be used as a
security measure, as <emphasis role="bold">non-visible pages will still be
accessible using a direct URL</emphasis>, such as <ulink type="http"
url="http://localhost:8080/portal/private/classic/pagename"></ulink>.
+ <important>
+ <title>Non-visible Pages and Security</title>
+ <para>
+ The <guilabel>Visible</guilabel>
checkbox should <emphasis role="bold">not</emphasis> be used as a
security measure, as <emphasis role="bold">non-visible pages will still be
accessible using a direct URL</emphasis>, such as <ulink
url="http://localhost:8080/portal/private/classic/pagename"
type="http"/>.
</para>
- </important>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis role="bold">Publication
date & time</emphasis></term>
- <listitem>
- <para>
+ </important>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <emphasis role="bold">Publication date &
time</emphasis>
+ </term>
+ <listitem>
+ <para>
This option allows publishing the page for a period of
time. If this option is checked the visibility of the page depends on the publication
period start and end date.
</para>
- <important>
- <title>Publication Dates and
Security</title>
- <para>
+ <important>
+ <title>Publication Dates and Security</title>
+ <para>
The <guilabel>Publication Date &
Time</guilabel> functionality should <emphasis
role="bold">not</emphasis> be used as a security measure, as pages
configured for time-specific publication <emphasis role="bold">will always
be accessible using a direct URL</emphasis> regardless of publication dates.
</para>
- </important>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis role="bold">Start
Publication Date</emphasis></term>
- <listitem>
- <para>
+ </important>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <emphasis role="bold">Start Publication
Date</emphasis>
+ </term>
+ <listitem>
+ <para>
The start date and time to publish the page. <emphasis
role="bold">This field is only visible if the <emphasis>Publication
date & time</emphasis> box is checked</emphasis>.
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis role="bold">End Publication
Date</emphasis></term>
- <listitem>
- <para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <emphasis role="bold">End Publication
Date</emphasis>
+ </term>
+ <listitem>
+ <para>
The end date and time to publish the page. <emphasis
role="bold">This field is only visible if the <emphasis>Publication
date & time</emphasis> box is checked</emphasis>.
</para>
- </listitem>
- </varlistentry>
- </variablelist>
- <note>
- <title><emphasis role="bold">Setting Time and
Date</emphasis></title>
- <para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ <note>
+ <title>
+ <emphasis role="bold">Setting Time and
Date</emphasis>
+ </title>
+ <para>
You can set date and time by clicking the <emphasis
role="bold">Start Publication Date</emphasis> field and <emphasis
role="bold">End Publication Date</emphasis> field and select a date in
the calendar pop up.
</para>
- </note>
+ </note>
<!--
<mediaobject>
<imageobject>
<imagedata fileref="images/Calendar.png"
format="PNG" />
</imageobject>
</mediaobject>
--->
-
- </step>
- <step>
- <para>
- Click <emphasis role="bold">Next</emphasis>
or number '2' of the wizard steps to go to step 2.
+--> </step>
+ <step>
+ <para>
+ Click <emphasis role="bold">Next</emphasis>
or number '2' of the wizard steps to go to step 2.
</para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/PageWizard2.png"
format="PNG" align="center" scale="100" />
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/PageWizard2.png"
format="PNG" align="center" contentwidth="150mm" />
- </imageobject>
- </mediaobject>
- </step>
- <step>
- <para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata align="center" scale="100"
fileref="images/PageWizard2.png" format="PNG"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata contentwidth="150mm" align="center"
fileref="images/PageWizard2.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ </step>
+ <step>
+ <para>
Select <emphasis role="bold">Empty
Layout</emphasis> or click the drop-down arrow at the top of the right pane to see
more templates to select.
</para>
- </step>
- <step>
- <para>
- Click the <emphasis
role="bold">Next</emphasis> button or number '3' of the wizard
step to go to step 3. You can drag portlets from the pop-up panel into the main pane to
create the content of this page.
+ </step>
+ <step>
+ <para>
+ Click the <emphasis
role="bold">Next</emphasis> button or number '3' of
the wizard step to go to step 3. You can drag portlets from the pop-up panel into the main
pane to create the content of this page.
</para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/PageWizard3.png"
format="PNG" align="center" scale="100" />
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/PageWizard3.png"
format="PNG" align="center" contentwidth="150mm" />
- </imageobject>
- </mediaobject>
- <variablelist>
- <varlistentry>
- <term>Applications</term>
- <listitem>
- <para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata align="center" scale="100"
fileref="images/PageWizard3.png" format="PNG"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata contentwidth="150mm" align="center"
fileref="images/PageWizard3.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ <variablelist>
+ <varlistentry>
+ <term>Applications</term>
+ <listitem>
+ <para>
Allows listing all existing portlets
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>Containers</term>
- <listitem>
- <para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Containers</term>
+ <listitem>
+ <para>
Allows listing all existing containers
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>View Page properties</term>
- <listitem>
- <para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>View Page properties</term>
+ <listitem>
+ <para>
Allows reviewing or changing various page
settings (<guilabel>title</guilabel>, <guilabel>Page ID</guilabel>
and more) and/or page permissions.
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>Switch View mode</term>
- <listitem>
- <para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Switch View mode</term>
+ <listitem>
+ <para>
Allows viewing a page in preview mode
</para>
- </listitem>
- </varlistentry>
- </variablelist>
- </step>
- <step>
- <para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </step>
+ <step>
+ <para>
You can click on the <emphasis role="bold">Switch
View mode</emphasis> button to view the content of this page. You can switch between
viewing the page by layout (showing containers and portlets) or to preview how the page
will look when live. The contents of the page can be edited in either mode.
</para>
- </step>
- <step>
- <para>
+ </step>
+ <step>
+ <para>
Once you have configured the new page, use the icons located in
the top right corner of the <emphasis role="bold">Page
Editor</emphasis> window to navigate as required:
</para>
- <para>
+ <para>
Click <emphasis role="bold">Back</emphasis>
(the small left-facing arrow) to return the previous step, <emphasis
role="bold">Save</emphasis> (the small disk icon) to create the new
page or <emphasis role="bold">Abort</emphasis> (the small cross) to
quit without creating a new page.
</para>
- </step>
- </procedure>
- </section>
-
-
- <section
id="sect-User_Guide-Manage_Pages-Add_a_new_Page_in_the_Page_List">
- <title>Adding a new Page using Page Management</title>
- <procedure>
- <step>
- <para>
+ </step>
+ </procedure>
+ </section>
+ <section
id="sect-User_Guide-Manage_Pages-Add_a_new_Page_in_the_Page_List">
+ <title>Adding a new Page using Page Management</title>
+ <procedure>
+ <step>
+ <para>
Mouse over <emphasis
role="bold">Group</emphasis> in the Toolbar, highlight <emphasis
role="bold">Administration</emphasis> then select <emphasis
role="bold">Page Management</emphasis>.
</para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/ManagePage.png"
format="PNG" align="center" scale="100"/>
- </imageobject>
- </mediaobject>
- </step>
- <step>
- <para>
+ <mediaobject>
+ <imageobject>
+ <imagedata align="center" scale="100"
fileref="images/ManagePage.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ </step>
+ <step>
+ <para>
Click on <emphasis role="bold">Add New
Page</emphasis>.
</para>
- </step>
- <step>
- <para>
+ </step>
+ <step>
+ <para>
The fields in this window are:
</para>
- <variablelist>
- <varlistentry>
- <term><emphasis role="bold">Page
Id</emphasis></term>
- <listitem>
- <para>
+ <variablelist>
+ <varlistentry>
+ <term>
+ <emphasis role="bold">Page Id</emphasis>
+ </term>
+ <listitem>
+ <para>
A string that identifies the page. It is
automatically generated when you finish creating the page.
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis role="bold">Owner
type</emphasis></term>
- <listitem>
- <para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <emphasis role="bold">Owner type</emphasis>
+ </term>
+ <listitem>
+ <para>
If the page <emphasis
role="bold">Owner type</emphasis> is set to
<emphasis>portal</emphasis> the page is created with shared ownership portal.
Therefore users who have <emphasis>edit</emphasis> permissions on the
<emphasis>portal</emphasis> level can edit this page type.
</para>
- <para>
+ <para>
If the page <emphasis
role="bold">Owner type</emphasis> is
<emphasis>group</emphasis> the page is created for a group. Therefore users
who have <emphasis>manager</emphasis> permissions for that
<emphasis>group</emphasis> can edit this page type.
</para>
- <mediaobject>
- <imageobject role="html">
- <imagedata
fileref="images/PageSetting1.png" format="PNG"
align="center" scale="100" />
- </imageobject>
- <imageobject role="fo">
- <imagedata
fileref="images/PageSetting1.png" format="PNG"
align="center" contentwidth="150mm" />
- </imageobject>
- </mediaobject>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis role="bold">Owner
Id</emphasis></term>
- <listitem>
- <para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata align="center" scale="100"
fileref="images/PageSetting1.png" format="PNG"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata contentwidth="150mm" align="center"
fileref="images/PageSetting1.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <emphasis role="bold">Owner Id</emphasis>
+ </term>
+ <listitem>
+ <para>
The name of the current portal is automatically
selected for <emphasis role="bold">Owner id</emphasis> ensuring the
edit permissions are assigned to users who can edit the current portal.
</para>
- <para>
- When the owner type is set to
<emphasis>group</emphasis>, a list of groups will allow you to select one user
as the 'owner'.
+ <para>
+ When the owner type is set to
<emphasis>group</emphasis>, a list of groups will allow you to select one user
as the 'owner'.
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis role="bold">Page
Name</emphasis></term>
- <listitem>
- <para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <emphasis role="bold">Page Name</emphasis>
+ </term>
+ <listitem>
+ <para>
The name of the page. This is a required field
and must be unique. Only alphabetical, numerical, dash and underscore characters are
allowed to be used for this field and the name must be at least 3 and no more than 30
characters in length.
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis role="bold">Page
title</emphasis></term>
- <listitem>
- <para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <emphasis role="bold">Page title</emphasis>
+ </term>
+ <listitem>
+ <para>
The title of the page. This is an optional field.
If you choose to add a title to the page it must be at least 3 and no more than 120
characters in length.
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis role="bold">Show Max
Window</emphasis></term>
- <listitem>
- <para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <emphasis role="bold">Show Max Window</emphasis>
+ </term>
+ <listitem>
+ <para>
The option allows users to choose whether the
page is shown at maximum size or not.
</para>
- </listitem>
- </varlistentry>
- </variablelist>
- </step>
- <!-- <step>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </step>
+<!-- <step>
<para>
Enter values for fields in the <emphasis
role="bold">Permission Setting</emphasis> tab
</para>
@@ -375,73 +397,71 @@
</listitem>
</varlistentry>
</variablelist>
- </step> -->
- <step>
- <para>
+ </step> --> <step>
+ <para>
Click <emphasis
role="bold">Save</emphasis>.
</para>
- </step>
- </procedure>
- </section>
+ </step>
+ </procedure>
</section>
-
- <section id="sect-User_Guide-Manage_Pages-Edit_a_Page">
- <title>Edit a Page</title>
- <procedure>
- <step>
- <para>
+ </section>
+ <section id="sect-User_Guide-Manage_Pages-Edit_a_Page">
+ <title>Edit a Page</title>
+ <procedure>
+ <step>
+ <para>
Mouse over <emphasis
role="bold">Group</emphasis> in the Toolbar. Highlight <emphasis
role="bold">Administration</emphasis> and then click on <emphasis
role="bold">Page Management</emphasis>.
</para>
- </step>
- <step>
- <para>
+ </step>
+ <step>
+ <para>
Click the edit icon on the row of page you want to edit in
the existing page list.
</para>
- <para>
+ <para>
Click View Page properties icon to show a form to edit page
properties.
</para>
- </step>
- <step>
- <para>
+ </step>
+ <step>
+ <para>
The properties presented in the <emphasis
role="bold">Page Properties</emphasis> window are the same as those
outlined in <xref
linkend="sect-User_Guide-Manage_Pages-Add_a_new_Page_in_the_Page_List"/>.
</para>
- <variablelist>
- <varlistentry>
- <term>Permission Setting</term>
- <listitem>
- <para>
+ <variablelist>
+ <varlistentry>
+ <term>Permission Setting</term>
+ <listitem>
+ <para>
Permission on each page is set in two levels:
<emphasis role="bold">Access right</emphasis> and <emphasis
role="bold">Edit right</emphasis>.
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>Access right</term>
- <listitem>
- <para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Access right</term>
+ <listitem>
+ <para>
<emphasis role="bold">Access
right</emphasis> can be set to specific user groups or set to everyone (this
includes unregistered users).
</para>
- <para>
+ <para>
Current access permissions on page are listed in
<guilabel>Access Permission Setting</guilabel> tab and you can remove
permissions (by clicking the <guilabel>delete</guilabel> icon) or add further
permission (by clicking the <guilabel>Add Permission</guilabel> button).
</para>
- <para>
+ <para>
Populating the <emphasis
role="bold">Make it public</emphasis> check box will allow all users
(registered or unregistered) to access the page.
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>Edit right</term>
- <listitem>
- <para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Edit right</term>
+ <listitem>
+ <para>
The <emphasis role="bold">Edit
right</emphasis> allows users to change information on a page. <emphasis
role="bold">Edit right</emphasis> only is set for a group of users.
</para>
- <para>
+ <para>
<emphasis role="bold">Edit
right</emphasis> can be set for one specific membership type within a particular
group (<emphasis role="bold">*</emphasis> allows every membership
type in a group). If you want to re-assign this right to another group, click
<guilabel>Select Permission</guilabel> in <guilabel>Edit Permission
Setting</guilabel> tab to choose another one.
</para>
- </listitem>
- </varlistentry>
- </variablelist>
- </step>
- <!--<step>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </step>
+<!--<step>
<variablelist>
<varlistentry>
<term>Editing page container layout</term>
@@ -478,79 +498,121 @@
</listitem>
</varlistentry>
</variablelist>
- </step> -->
- </procedure>
- </section>
-
+ </step> --> </procedure>
+ </section>
<!-- <section id="sect-User_Guide-Manage_Pages-View_a_Page">
<title>View a Page</title>
<para>
View any page in the existing pages list by clicking on the <emphasis
role="bold">View</emphasis> icon corresponding to the page you want to
view.
</para>
- </section> -->
-
- <section id="sect-User_Guide-Manage_Pages-Delete_a_Page">
- <title>Delete a Page</title>
- <procedure>
- <step>
- <para>
+ </section> --> <section
id="sect-User_Guide-Manage_Pages-Delete_a_Page">
+ <title>Delete a Page</title>
+ <procedure>
+ <step>
+ <para>
Mouse over <emphasis
role="bold">Group</emphasis> in the Toolbar. Highlight <emphasis
role="bold">Administration</emphasis> and then click on <emphasis
role="bold">Page Management</emphasis>. You will be presented with a
list of all existing pages.
</para>
- </step>
- <step>
- <para>
+ </step>
+ <step>
+ <para>
Click the trash can icon in the row of the page you want to
delete. It will display the confirmation message.
</para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/httpPage.png"
format="PNG" align="center" />
- </imageobject>
- </mediaobject>
- </step>
- <step>
- <para>
+ <mediaobject>
+ <imageobject>
+ <imagedata align="center"
fileref="images/httpPage.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ </step>
+ <step>
+ <para>
Click the <emphasis
role="bold">OK</emphasis> button to complete the deletion or
<emphasis role="bold">Cancel</emphasis> button to quit without
deleting the page.
</para>
- </step>
- </procedure>
- </section>
-
- <section id="sect-User_Guide-Drag_and_Drop_the_Page_Body">
- <title>Drag and Drop the Page Body</title>
- <para>
+ </step>
+ </procedure>
+ </section>
+ <section id="sect-User_Guide-Drag_and_Drop_the_Page_Body">
+ <title>Drag and Drop the Page Body</title>
+ <para>
To assist administrators to modify or personalize their portal JBoss
Enterprise Portal Platform allows you to easily drag and drop page content within the
page.
</para>
- <procedure>
- <step>
- <para>
+ <procedure>
+ <step>
+ <para>
Mouse over <emphasis role="bold">Site
Editor</emphasis> in the toolbar and click on <emphasis
role="bold">Edit Layout</emphasis> It will display :
</para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/DragPage1.png"
format="PNG" align="center" scale="100" />
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/DragPage1.png"
format="PNG" align="center" contentwidth="150mm" />
- </imageobject>
- </mediaobject>
- </step>
- <step>
- <para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata align="center" scale="100"
fileref="images/DragPage1.png" format="PNG"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata contentwidth="150mm" align="center"
fileref="images/DragPage1.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ </step>
+ <step>
+ <para>
Click on the <emphasis role="bold">Portal
Page</emphasis>, drag and drop within the portal page.
</para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/DragPage3.png"
format="PNG" align="center" scale="100" />
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/DragPage3.png"
format="PNG" align="center" contentwidth="150mm" />
- </imageobject>
- </mediaobject>
- </step>
- </procedure>
- </section>
-
-
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata align="center" scale="100"
fileref="images/DragPage3.png" format="PNG"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata contentwidth="150mm" align="center"
fileref="images/DragPage3.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ </step>
+ </procedure>
+ </section>
+ <section>
+ <title>Captcha</title>
+ <para>You can set whether Captcha is used to verify a user is an actual person.
The Captcha behavior is set in the Register Account portlet by default.</para>
+ <task id="task-Set_Register_Account_Capcha_Behavior">
+ <title>Task: Disable "Register New Account" Captcha
Behavior</title>
+ <tasksummary>
+ <para>Complete this task to control how Captcha behaves when a user
registers an account.</para>
+ </tasksummary>
+ <taskprerequisites>
+ <title>Prerequisites</title>
+ <itemizedlist>
+ <listitem>
+ <para>You are logged into the portal using an account with
Administrator privileges.</para>
+ </listitem>
+ </itemizedlist>
+ </taskprerequisites>
+ <procedure>
+ <step>
+ <para>Click <menuchoice>
+ <guimenu>Group</guimenu>
+ <guimenu>Administration</guimenu>
+ <guimenu>Page Management</guimenu>
+ </menuchoice> to display a page containing the .</para>
+ </step>
+ <step>
+ <para>Click the <guibutton>Edit Page</guibutton> icon in the
Action column for the portal::classic::register Page ID.</para>
+ </step>
+ <step>
+ <para>Click on the Register Account portlet, and then click the Edit
Portal icon (pencil icon) to open portlet properties.</para>
+ <note>
+ <para>Click the <guibutton>Switch View mode</guibutton>
button in the Page Editor control to switch between WYSIWYG and Object mode.</para>
+ </note>
+ </step>
+ <step>
+ <para>Click the Edit Mode tab (if not already selected), and clear the
<guilabel>Use captcha</guilabel> box to disable Captcha verification for new
users.</para>
+ </step>
+ <step>
+ <para>Click Save, and then click Close to commit the
changes.</para>
+ </step>
+ <step>
+ <para>In the Page Editor control, click Switch View mode to refresh the
portlet. </para>
+ </step>
+ <step>
+ <formalpara>
+ <title>Result</title>
+ <para>The Register New Account portlet will no longer display the
Captcha field.</para>
+ </formalpara>
+ </step>
+ </procedure>
+ </task>
+ </section>
</section>
-
-
Modified: epp/docs/branches/5.2/User_Guide/en-US/modules/portal/Manage_Portals.xml
===================================================================
--- epp/docs/branches/5.2/User_Guide/en-US/modules/portal/Manage_Portals.xml 2012-02-23
23:15:23 UTC (rev 8454)
+++ epp/docs/branches/5.2/User_Guide/en-US/modules/portal/Manage_Portals.xml 2012-02-24
03:19:39 UTC (rev 8455)
@@ -246,7 +246,7 @@
More information about actions possible in this window can be found in
<xref linkend="sect-User_Guide-Manage_Navigation_Nodes"/>
</para>
</section>
- <section>
+ <section id="Export_and_Import">
<title><remark>BZ#794408 NEEDINFO </remark>Export and
Import</title>
<para>You can export and import portals and groups using the controls provided
in the <menuchoice>
<guimenu>Group</guimenu>
@@ -363,25 +363,25 @@
<varlistentry>
<term>Conserve</term>
<listitem>
- <para><remark>NEEDINFO</remark></para>
+ <para>Import data only if no artifacts exist. For example, if one
page exists for the site 'classic', and you attempt to import a
'classic' site archive, the import will fail.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>Insert</term>
<listitem>
- <para><remark>NEEDINFO</remark></para>
+ <para>Import data when no data exists. If data already exists, the
import will fail.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>Merge</term>
<listitem>
- <para><remark>Guessing what this option means because I have
no links to source information.</remark>Merges the differences between the existing
portal or group.</para>
+ <para>Import data when no data exists for the site. If data already
exists, the site is updated with the differences from the imported archive.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>Overwrite</term>
<listitem>
- <para><remark>Guessing what this option means because I have
no links to source information.</remark>Overwrites the portal if a portal of the
same name exists.</para>
+ <para>Delete all existing site data for the artifact, and import
all data from the archive.</para>
</listitem>
</varlistentry>
</variablelist>
@@ -390,7 +390,7 @@
<para>Click <guibutton>Import</guibutton></para>
<formalpara>
<title>Result</title>
- <para>The selected archive is imported, with the import mode applied to
the files contained within the Zip.</para>
+ <para>The selected archive is imported, with the import mode behavior
applied to the files contained within the Zip.</para>
</formalpara>
</step>
</procedure>