Browse Source

[doc] Update help documentation with images

Romain Rigaux 13 years ago
parent
commit
2515a08d26

+ 183 - 107
apps/beeswax/static/help/index.html

@@ -6,11 +6,11 @@
 <h2><a name="Beeswax-Contents"></a>Contents</h2>
 
 <style type='text/css'>/*<![CDATA[*/
-div.rbtoc1343860614247 {margin-left: 1.5em;padding: 0px;}
-div.rbtoc1343860614247 ul {margin-left: 0px;padding-left: 20px;}
-div.rbtoc1343860614247 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1348176344574 {margin-left: 1.5em;padding: 0px;}
+div.rbtoc1348176344574 ul {margin-left: 0px;padding-left: 20px;}
+div.rbtoc1348176344574 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class='rbtoc1343860614247'>
+/*]]>*/</style><div class='rbtoc1348176344574'>
 <ul>
     <li><a href='#Beeswax-IntroducingBeeswax'>Introducing Beeswax</a></li>
     <li><a href='#Beeswax-BeeswaxandHiveInstallationandConfiguration'>Beeswax and Hive Installation and Configuration</a></li>
@@ -47,28 +47,29 @@ div.rbtoc1343860614247 li {margin-left: 0px;padding-left: 0px;}
 
 <p>Beeswax is installed and configured as part of Hue. For more information about installing Hue, see <a href="https://ccp.cloudera.com/display/CDH4DOC/Hue+Installation">Hue Installation</a>.</p>
 
-<p>Beeswax assumes an existing Hive installation.  The Hue installation instructions include the configuration necessary for Beeswax to access Hive.   You can view the current Hive configuration from from the <b>Settings</b> tab in the Beeswax application. </p>
+<p>Beeswax assumes an existing Hive installation.  The Hue installation instructions include the configuration necessary for Beeswax to access Hive.   You can view the current Hive configuration from from the <b>Settings</b> tab in the Beeswax application.</p>
 
-<p>By default, a Beeswax user can see the saved queries for all users &#8211; both his/her own queries and those of other Beeswax users.  If this behavior is not desirable, there is a configuration option you can change in the <tt>/etc/hue/hue.ini</tt> file under the <tt>[beeswax]</tt> section to restrict viewing saved queries to only the query owner and Hue administrators.  To change this setting, find and uncomment the <tt>share_saved_queries</tt> property and set it to <tt>false</tt>. </p>
+<p>By default, a Beeswax user can see the saved queries for all users &#8211; both his/her own queries and those of other Beeswax users.  If this behavior is not desirable, there is a configuration option you can change in the <tt>/etc/hue/hue.ini</tt> file under the <tt>[beeswax]</tt> section to restrict viewing saved queries to only the query owner and Hue administrators.  To change this setting, find and uncomment the <tt>share_saved_queries</tt> property and set it to <tt>false</tt>.</p>
 
 
 <h1><a name="Beeswax-StartingBeeswax"></a>Starting Beeswax</h1>
 
-<p>To start the Beeswax application, click the <b>Beeswax</b> icon (<span class="image-wrap" style=""><img src="/beeswax/static/help/images/21103320.png" width="30" style="border: 0px solid black"/></span>) in the navigation bar at the top of the Hue browser page.  </p>
+<p>To start the Beeswax application, click the <b>Beeswax</b> icon ( <span class="image-wrap" style=""><img src="/beeswax/static/art/beeswax-logo.png" width="30" style="border: 0px solid black"/></span>) in the navigation bar at the top of the Hue browser page.</p>
 
-<p>The first time you run Beeswax, the "Welcome to Beeswax for Hive" page appears, and prompts you to install the sample tables or import your own tables. </p>
+<p>The first time you run Beeswax, the "Welcome to Beeswax for Hive" page appears, and prompts you to install the sample tables or import your own tables.</p>
 
-<p>Once some tables have been created &#8212; either from installing the samples or importing your own data &#8212; clicking the Beeswax tab will bring you directly into the Query Editor. </p>
+<p>Once some tables have been created &#8212; either from installing the samples or importing your own data &#8212; clicking the Beeswax tab will bring you directly into the Query Editor.</p>
 
-<p>The tabs in the Beeswax navigation bar allow you to navigate to the main functional areas of Beeswax. </p>
+<p>The tabs in the Beeswax navigation bar allow you to navigate to the main functional areas of Beeswax.</p>
 
-<h3><a name="Beeswax-InstallingtheBeeswaxSamples"></a>Installing the Beeswax Samples </h3>
+<h3><a name="Beeswax-InstallingtheBeeswaxSamples"></a>Installing the Beeswax Samples</h3>
 
 <p>You can install two sample Beeswax tables to use as examples.</p>
 
 <ol>
 	<li>In the <b>Welcome to Beeswax</b> window, click <b>Install Samples</b>
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>Confirm that you want to install these samples.
 <br class="atl-forced-newline" /></li>
 </ol>
@@ -82,10 +83,11 @@ div.rbtoc1343860614247 li {margin-left: 0px;padding-left: 0px;}
 
 <ol>
 	<li>In the <b>Welcome to Beeswax</b> window, click the <b>Import Data</b> button.<br/>
-This takes you to the <b>Create a new table manually</b> page. 
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+This takes you to the <b>Create a new table manually</b> page.
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>Follow the prompts in this wizard to specify your table.  For more details see <a href="#Beeswax-CreatingTables">Creating Tables</a>.
-<br class="atl-forced-newline" />  </li>
+<br class="atl-forced-newline" /></li>
 </ol>
 
 
@@ -106,38 +108,53 @@ This takes you to the <b>Create a new table manually</b> page.
 
 <ol>
 	<li>In the Beeswax <b>Hive Query</b> window, type the query.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
 For example, to select all data from the <em>sample_08</em> table, you would type:
 <br class="atl-forced-newline" />
 <tt>SELECT * FROM sample_08 WHERE salary &gt; 100000</tt>
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>In the box to the left of the Query field, you can override the default Hive and Hadoop settings, specify file resources and user-defined functions, and enable users to enter parameters at run-time, and request email notification when the job is complete.  See <a href="#Beeswax-AdvancedSettings">Advanced Query Settings</a> below for details on using these settings.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>To save your query and advanced settings to use again later, click <b>Save As,</b> enter a name and description, and then click <b>OK</b>. To save changes to an existing query, click <b>Save.</b>
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>If you want to view the execution plan for the query, click <b>Explain</b>. For more information, see <a href="http://wiki.apache.org/hadoop/Hive/LanguageManual/Explain">http://wiki.apache.org/hadoop/Hive/LanguageManual/Explain</a>.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>To run the query, click <b>Execute</b>.
 <br class="atl-forced-newline" />
 <a name="Beeswax-QueryResults"></a><br/>
 The Beeswax <b>Query Results</b> window appears with the results of your query.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>Do any of the following to download or save the query results:
 <br class="atl-forced-newline" />
 	<ul>
 		<li>Click <b>Download as CSV</b> to download the results in a comma-separated values file suitable for use in other applications.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
-		<li>Click <b>Download as XLS</b> to download the results in a Microsoft Office Excel worksheet file.<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
-		<li>Click <b>Save</b> to save the results in a table or HDFS file. <br class="atl-forced-newline" />
-To save the results in a new table, select <b>to a new table</b>, enter a name, and then click <b>Save</b>. <br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
+		<li>Click <b>Download as XLS</b> to download the results in a Microsoft Office Excel worksheet file.
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
+		<li>Click <b>Save</b> to save the results in a table or HDFS file.
+<br class="atl-forced-newline" />
+To save the results in a new table, select <b>to a new table</b>, enter a name, and then click <b>Save</b>.
+<br class="atl-forced-newline" />
 To save the results in an HDFS file, select <b>to HDFS directory</b>, enter a path in <b>Results Location</b> and then click <b>Save</b>.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 		<li>Under <b>MR Jobs</b>, you can view any Map/Reduce jobs that the query started.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 		<li>To view a log of the query execution, click <b>Log</b> at the top of the results display. You can use the information in this tab to debug your query.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 		<li>To view the query that generated these results, click <b>Query</b> at the top of the results display.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 		<li>To return to the query in the <b>Query Editor,</b> click <b>Unsaved Query</b>.</li>
 	</ul>
 	</li>
@@ -146,21 +163,23 @@ To save the results in an HDFS file, select <b>to HDFS directory</b>, enter a pa
 
 
 <p><a name="Beeswax-AdvancedSettings"></a></p>
+
 <h3><a name="Beeswax-AdvancedQuerySettings"></a>Advanced Query Settings</h3>
 
 <p>The section to the left of the Query field lets you specify the following options:
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></p>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></p>
 
 <style type="text/css">
-td {
+td.confluenceTd {
 border: #dddddd solid 1px;
-height: 45px;
+height: 36px;
 padding: 5px 10px;
 vertical-align: top;
 }
-th {
+th.confluenceTh {
 border: #dddddd solid 1px;
-height: 50px;
+height: 40px;
 padding: 5px 10px;
 vertical-align: center;
 }
@@ -175,20 +194,18 @@ vertical-align: center;
 </tr>
 <tr>
 <td class='confluenceTd'> <b>Hive Settings</b> </td>
-<td class='confluenceTd'> Use <b>Hive Settings</b> to override the Hive and Hadoop default settings. Click <b>Add</b> to configure a new setting. <br/>
-&raquo;&nbsp;&nbsp; For <b>Key</b>, enter a Hive or Hadoop configuration variable name. <br/>
-&raquo;&nbsp;&nbsp; For <b>Value</b>, enter the value you want to use for the variable. 
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
-For example, to override the directory where structured hive query logs are created, you would enter <tt>hive.querylog.location</tt> for <b>Key</b>, and a path for <b>Value.</b> <br class="atl-forced-newline" /> <br class="atl-forced-newline" />
-Click <b>Add</b> again to add another new setting. <br class="atl-forced-newline" /> <br class="atl-forced-newline" /> 
-To view the default settings, click the <b>Settings</b> tab at the top of the page. <br class="atl-forced-newline" /> <br class="atl-forced-newline" />
+<td class='confluenceTd'> Use <b>Hive Settings</b> to override the Hive and Hadoop default settings. Click <b>Add</b> to configure a new setting. <br class="atl-forced-newline" />
+»&nbsp;&nbsp; For <b>Key</b>, enter a Hive or Hadoop configuration variable name. <br class="atl-forced-newline" />
+»&nbsp;&nbsp; For <b>Value</b>, enter the value you want to use for the variable. <br class="atl-forced-newline" />  <br class="atl-forced-newline" />
+For example, to override the directory where structured hive query logs are created, you would enter <tt>hive.querylog.location</tt> for <b>Key</b>, and a path for <b>Value.</b> <br class="atl-forced-newline" />  <br class="atl-forced-newline" />
+Click <b>Add</b> again to add another new setting. <br class="atl-forced-newline" />  <br class="atl-forced-newline" />
+To view the default settings, click the <b>Settings</b> tab at the top of the page. <br class="atl-forced-newline" />  <br class="atl-forced-newline" />
 For information about Hive configuration variables, see: <a href="http://wiki.apache.org/hadoop/Hive/AdminManual/Configuration">http://wiki.apache.org/hadoop/Hive/AdminManual/Configuration</a>. For information about Hadoop configuration variables, see: <a href="http://hadoop.apache.org/common/docs/current/mapred-default.html">http://hadoop.apache.org/common/docs/current/mapred-default.html</a> </td>
 </tr>
 <tr>
 <td class='confluenceTd'> <b>File Resources</b> </td>
-<td class='confluenceTd'> Use <b>File Resources</b> to make locally accessible files available at query execution time on the entire Hadoop cluster. Hive uses Hadoop's Distributed Cache to distribute the added files to all machines in the cluster at query execution time. <br class="atl-forced-newline" /> <br class="atl-forced-newline" />
-Click <b>Add</b> to configure a new setting.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
+<td class='confluenceTd'> Use <b>File Resources</b> to make locally accessible files available at query execution time on the entire Hadoop cluster. Hive uses Hadoop's Distributed Cache to distribute the added files to all machines in the cluster at query execution time. <br class="atl-forced-newline" />  <br class="atl-forced-newline" />
+Click <b>Add</b> to configure a new setting. <br class="atl-forced-newline" />  <br class="atl-forced-newline" />
 From the <b>Type</b> drop-down menu, choose one of the following: <br class="atl-forced-newline" />
 <br class="atl-forced-newline" />
 <b>jar</b> &#8212; Adds the resources to the Java classpath. This is required in order to reference objects such as user defined functions. <br class="atl-forced-newline" />
@@ -203,8 +220,8 @@ For <b>Path</b>, enter the path to the file. You can also click <b>Choose a File
 </tr>
 <tr>
 <td class='confluenceTd'> <b>User-defined Functions</b> </td>
-<td class='confluenceTd'> You can use user-defined functions in a query. Specify the function name for <b>Name</b>, and specify the class name for <b>Class</b> <b>name</b>. <br/>
-Click <b>Add</b> to configure a new setting.<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
+<td class='confluenceTd'> You can use user-defined functions in a query. Specify the function name for <b>Name</b>, and specify the class name for <b>Class</b> <b>name</b>. <br class="atl-forced-newline" />
+Click <b>Add</b> to configure a new setting. <br class="atl-forced-newline" />  <br class="atl-forced-newline" />
 You must specify a JAR file for the user-defined functions in <b>File Resources</b>. To include a user-defined function in a query, add a $ (dollar sign) before the function name in the query. For example, if <em>MyTable</em> is a user-defined function name in the query, you would type: <tt>SELECT * $MyTable</tt> </td>
 </tr>
 <tr>
@@ -223,17 +240,21 @@ You must specify a JAR file for the user-defined functions in <b>File Resources<
 <h3><a name="Beeswax-ViewingQueryHistory"></a>Viewing Query History</h3>
 
 <p>Beeswax enables you to view the history of queries that you have previously run. Results for these queries are available for one week or until Hue is restarted.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></p>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></p>
 
 <p><b>To view query history:</b></p>
 
 <ol>
 	<li>In the <b>Beeswax</b> window, click <b>History</b>.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
 Beeswax displays a list of your saved and unsaved queries in the Beeswax <b>Query History</b> window.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>To display the queries for all users, click <b>Show everyone's queries</b>. To display your queries only, click <b>Show my queries</b>.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>To display the automatically generated actions that Beeswax performed on a user's behalf, click <b>Show auto actions</b>. To display user queries again, click <b>Show user queries</b>.</li>
 </ol>
 
@@ -241,21 +262,27 @@ Beeswax displays a list of your saved and unsaved queries in the Beeswax <b>Quer
 <h3><a name="Beeswax-Viewing%2CEditing%2CorDeletingSavedQueries"></a>Viewing, Editing, or Deleting Saved Queries</h3>
 
 <p>You can view a list of saved queries of all users by clicking <b>Saved Queries</b> in the <b>Beeswax</b> window. You can copy any user's query, but you can only edit, delete, and view the history of your own queries.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></p>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></p>
 
 <p><b>To edit a saved query:</b></p>
 
 <ol>
 	<li>In the <b>Beeswax</b> window, click <b>Saved Queries</b>.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
 Beeswax displays the Beeswax <b>Queries</b> window.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>Click the <b>Options</b> button next to the query and choose <b>Edit</b> from the context menu.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
 Beeswax displays the query in the Beeswax <b>Query Editor</b> window.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>Change the query and then click <b>Save.</b> You can also click <b>Save As</b>, enter a new name, and click <b>OK</b> to save a copy of the query.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 </ol>
 
 
@@ -263,13 +290,17 @@ Beeswax displays the query in the Beeswax <b>Query Editor</b> window.
 
 <ol>
 	<li>In the <b>Beeswax</b> window, click <b>Saved Queries</b>.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
 Beeswax displays the Beeswax <b>Queries</b> window.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>Click the <b>Options</b> button next to the query and choose <b>Delete</b> from the context menu.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>Click <b>Yes</b> to confirm the deletion.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 </ol>
 
 
@@ -277,15 +308,20 @@ Beeswax displays the Beeswax <b>Queries</b> window.
 
 <ol>
 	<li>In the <b>Beeswax</b> window, click <b>Saved Queries</b>.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
 Beeswax displays the Beeswax <b>Queries</b> window.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>Click the <b>Options</b> button next to the query and choose <b>Clone</b> from the context menu.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
 Beeswax displays the query in the Beeswax <b>Query Editor</b> window.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>Change the query as necessary and then click <b>Save.</b> You can also click <b>Save As</b>, enter a new name, and click <b>Ok</b> to save a copy of the query.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 </ol>
 
 
@@ -293,19 +329,26 @@ Beeswax displays the query in the Beeswax <b>Query Editor</b> window.
 
 <ol>
 	<li>In the <b>Beeswax</b> window, click <b>History</b>.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
 Beeswax displays the Beeswax <b>Query History</b> window.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>To display the queries for all users, click <b>everyone's</b>.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
 Beeswax displays the queries for all users in the Beeswax <b>Query History</b> window.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>Click the <b>Clone</b> link next to the query you want to copy.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
 Beeswax displays a copy of the query in the Beeswax <b>Query Editor</b> window.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>Change the query, if necessary, and then click <b>Save As</b>, enter a new name, and click <b>OK</b> to save the query.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 </ol>
 
 
@@ -323,6 +366,7 @@ Beeswax displays a copy of the query in the Beeswax <b>Query Editor</b> window.
 
 
 <p><a name="Beeswax-CreatingTables"></a></p>
+
 <h3><a name="Beeswax-CreatingTables"></a>Creating Tables</h3>
 
 <p>Although you can create tables by executing the appropriate HQL DDL query commands, it is easier to create a table using the Beeswax table creation wizard.</p>
@@ -331,34 +375,41 @@ Beeswax displays a copy of the query in the Beeswax <b>Query Editor</b> window.
 
 <p>If you create a table from a file, the format of the data in the file will determine some of the properties of the table, such as the record and file formats. The data from the file you specify is imported automatically upon table creation.</p>
 
-<p>When you create a file manually, you specify all the properties of the table, and then execute the resulting query to actually create the table.  You then import data into the table as an additional step. 
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></p>
+<p>When you create a file manually, you specify all the properties of the table, and then execute the resulting query to actually create the table.  You then import data into the table as an additional step.
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></p>
 
-<p><b>To create a table from a file&#58;</b></p>
+<p>&#42;To create a table from a <a href="file:*">file:&#42;</a></p>
 
 <ol>
 	<li>In the <b>Beeswax</b> window, click <b>Tables</b>.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>In the Beeswax <b>Action</b> pane, click <b>Create a new table from file</b>.<br/>
 The table creation wizard starts.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>Follow the instructions in the wizard to create the table.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
 The basic steps are:
 	<ul>
 		<li>Choose your input file.  The input file you specify must exist.<br/>
-Note that you can choose to have Beeswax create the table definition only based on the import file you select, without actually importing data from that file. </li>
+Note that you can choose to have Beeswax create the table definition only based on the import file you select, without actually importing data from that file.</li>
 		<li>Specify the column delimiter.</li>
 		<li>Define your columns, providing a name and selecting the type.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	</ul>
 	</li>
 	<li>Click <b>Create Table</b> to create the table.<br/>
 Beeswax displays the new table's metadata on the right side of the Beeswax <b>Table Metadata</b> window.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
-At this point, you can view the metadata or a Sample of the data in the table.  <br/>
-From the Actions pane you can import new data into the table, browse the table, drop it, or go to the FileBrowser to see the location of the data. 
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
+At this point, you can view the metadata or a Sample of the data in the table.<br/>
+From the Actions pane you can import new data into the table, browse the table, drop it, or go to the FileBrowser to see the location of the data.
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 </ol>
 
 
@@ -366,13 +417,17 @@ From the Actions pane you can import new data into the table, browse the table,
 
 <ol>
 	<li>In the <b>Beeswax</b> window, click <b>Tables</b>.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>In the Beeswax <b>Action</b> pane, click <b>Create a new table manually</b>.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
 The table creation wizard starts.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>Follow the instructions in the wizard to create the table.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
 The basic steps are:
 	<ul>
 		<li>Name your table.</li>
@@ -382,26 +437,31 @@ The basic steps are:
 		<li>Specify the location for your table's data.</li>
 		<li>Define your columns, providing a name and selecting the type.</li>
 		<li>Add partitions, if appropriate.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	</ul>
 	</li>
 	<li>Click <b>Create Table</b> to construct a query to create the table.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
 The new query is displayed in the Hive Query window.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>Click <b>Execute</b> to run the query and create the table.
 <br class="atl-forced-newline" /></li>
 </ol>
 
 
 <p><a name="Beeswax-BrowsingTables"></a></p>
+
 <h3><a name="Beeswax-BrowsingTables"></a>Browsing Tables</h3>
 
 <p><b>To browse the data in a table:</b></p>
 
 <ol>
 	<li>In the Beeswax <b>Table List</b> window, click the <b>Browse Data</b> button next to the table you want to browse.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
 Beeswax displays the table's data in the <b>Query Results</b> window.</li>
 </ol>
 
@@ -410,14 +470,17 @@ Beeswax displays the table's data in the <b>Query Results</b> window.</li>
 
 <ol>
 	<li>In the Beeswax <b>Table List</b> window, click the table name.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
 Beeswax displays the table's metadata under a <b>Columns</b> tab.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
-You can view the actual data in the table by selecting the <b>Sample</b> tab. </li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
+You can view the actual data in the table by selecting the <b>Sample</b> tab.</li>
 </ol>
 
 
 <p><a name="Beeswax-ImportingDataintoTables"></a></p>
+
 <h3><a name="Beeswax-ImportingDataintoTables"></a>Importing Data into Tables</h3>
 
 <p>When importing data, you can choose to append or overwrite the table's data with data from a file.</p>
@@ -426,47 +489,60 @@ You can view the actual data in the table by selecting the <b>Sample</b> tab. </
 
 <ol>
 	<li>In the Beeswax <b>Table List</b> window, double-click the table name.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
-Beeswax displays the  <b>Beeswax Table Metadata</b> window.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
+Beeswax displays the <b>Beeswax Table Metadata</b> window.
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>From the Actions panel, click <b>Import Data</b>.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>For <b>Path</b>, enter the path to the file that contains the data you want to import.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>Check <b>Overwrite existing data</b> to replace the data in the selected table with the imported data.  Leave this unchecked to append to the table.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>Click <b>Submit</b> to start importing the data.</li>
 </ol>
 
 
 <p><a name="Beeswax-DroppingTables"></a></p>
+
 <h3><a name="Beeswax-DroppingTables"></a>Dropping Tables</h3>
 
 <p><b>To drop a table:</b></p>
 
 <ol>
 	<li>In the Beeswax <b>Table List</b> window, double-click the table name.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
 Beeswax displays the Beeswax <b>Table Metadata</b> window.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>From the Actions panel, click <b>Drop Table</b>.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>Click <b>Yes</b> to confirm the deletion.</li>
 </ol>
 
 
 <p><a name="Beeswax-ViewingaTable%27sLocation"></a></p>
+
 <h3><a name="Beeswax-ViewingaTable%27sLocation"></a>Viewing a Table's Location</h3>
 
 <p><b>To view a table's location:</b></p>
 
 <ol>
 	<li>In the Beeswax <b>Table List</b> window, double-click the table name.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
 Beeswax displays the Beeswax <b>Table Metadata</b> window.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>Click <b>View File Location</b>.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
 Beeswax lists the selected table in its directory in the <b>File Browser</b> window. </li>
 </ol>
 

+ 1 - 1
apps/filebrowser/src/filebrowser/static/help/index.html

@@ -51,7 +51,7 @@ div.rbtoc1347644752425 li {margin-left: 0px;padding-left: 0px;}
 
 <h1><a name="FileBrowser-StartingFileBrowser"></a>Starting File Browser</h1>
 
-<p>To start the File Browser application, click the <b>File Browser</b> icon ( <span class="image-wrap" style=""><img src="/filebrowser/static/help/images/21103319.png" height="30" style="border: 0px solid black"/></span>) in the navigation bar at the top of the Hue browser page.
+<p>To start the File Browser application, click the <b>File Browser</b> icon ( <span class="image-wrap" style=""><img src="/filebrowser/static/art/icon.png" height="30" style="border: 0px solid black"/></span>) in the navigation bar at the top of the Hue browser page.
 <br class="atl-forced-newline" />
 <br class="atl-forced-newline" />
 <a name="FileBrowser-WorkingwithFilesandDirectories"></a></p>

+ 1 - 1
apps/jobbrowser/static/help/index.html

@@ -35,7 +35,7 @@ div.rbtoc1347648975019 li {margin-left: 0px;padding-left: 0px;}
 
 <h1><a name="JobBrowser-StartingJobBrowser"></a>Starting Job Browser</h1>
 
-<p>To start Job Browser, click the <b>Job Browser</b> icon ( <span class="image-wrap" style=""><img src="/jobbrowser/static/help/images/21103323.png" height="26" style="border: 0px solid black"/></span> ) in the navigation bar at the top of the Hue web page.</p>
+<p>To start Job Browser, click the <b>Job Browser</b> icon ( <span class="image-wrap" style=""><img src="/jobbrowser/static/art/icon_large.png" height="26" style="border: 0px solid black"/></span> ) in the navigation bar at the top of the Hue web page.</p>
 
 <p>If there are no jobs that have been run, the <b>Welcome to the Job Browser</b> page opens, with links to the Job Designer and Beeswax.</p>
 

BIN
apps/jobsub/static/help/cog.png


+ 23 - 8
apps/jobsub/static/help/index.html

@@ -16,11 +16,11 @@
 <h2><a name="JobDesigner-Contents"></a>Contents</h2>
 
 <style type='text/css'>/*<![CDATA[*/
-div.rbtoc1347644622311 {margin-left: 1.5em;padding: 0px;}
-div.rbtoc1347644622311 ul {margin-left: 0px;padding-left: 20px;}
-div.rbtoc1347644622311 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1348176417024 {margin-left: 1.5em;padding: 0px;}
+div.rbtoc1348176417024 ul {margin-left: 0px;padding-left: 20px;}
+div.rbtoc1348176417024 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class='rbtoc1347644622311'>
+/*]]>*/</style><div class='rbtoc1348176417024'>
 <ul>
     <li><a href='#JobDesigner-IntroducingJobDesigner'>Introducing Job Designer</a></li>
     <li><a href='#JobDesigner-JobDesignerInstallationandConfiguration'>Job Designer Installation and Configuration</a></li>
@@ -53,7 +53,7 @@ div.rbtoc1347644622311 li {margin-left: 0px;padding-left: 0px;}
 
 <h1><a name="JobDesigner-StartingJobDesigner"></a>Starting Job Designer</h1>
 
-<p>To start Job Designer, click the <b>Job Designer</b> icon ( <span class="image-wrap" style=""><img src="/jobsub/static/help/images/21103324.png" height="30" style="border: 0px solid black"/></span>) in the navigation bar at the top of the Hue web page. The <b>Job Designs</b> page opens in the browser.
+<p>To start Job Designer, click the <b>Job Designer</b> icon ( <span class="image-wrap" style=""><img src="/jobsub/static/art/icon.png" height="30" style="border: 0px solid black"/></span>) in the navigation bar at the top of the Hue web page. The <b>Job Designs</b> page opens in the browser.
 <br class="atl-forced-newline" /></p>
 
 <p><a name="JobDesigner-InstallingtheJobDesignerSamples"></a></p>
@@ -88,6 +88,22 @@ div.rbtoc1347644622311 li {margin-left: 0px;padding-left: 0px;}
 
 <p>All job design types support the settings listed in the following table.&nbsp;</p>
 
+
+<style type="text/css">
+td.confluenceTd {
+border: #dddddd solid 1px;
+height: 36px;
+padding: 5px 10px;
+vertical-align: top;
+}
+th.confluenceTh {
+border: #dddddd solid 1px;
+height: 40px;
+padding: 5px 10px;
+vertical-align: center;
+}
+</style>
+
 
 <div class='table-wrap'>
 <table class='confluenceTable'><tbody>
@@ -298,11 +314,10 @@ Your jobs and other users' jobs are displayed in the <b>Job Designs</b> window.<
 <ul>
 	<li>Actions - a list of actions in the job.
 	<ul>
-		<li>Click the <b>External Id</b> link to display the <a href="Job Browser.html" title="Job Browser">Job Browser</a> application opened to that job.</li>
-		<li>Click <span class="image-wrap" style=""><img src="/jobsub/static/help/images/21627568.png" style="border: 0px solid black"/></span>&nbsp;to display the action configuration. In the action configuration for a MapReduce action, click the value of the mapred.output.dir property to display the job output.</li>
+		<li>Click <span class="image-wrap" style=""><img src="/jobsub/static/help/cog.png" style="border: 0px solid black"/></span>&nbsp;to display the action configuration. In the action configuration for a MapReduce action, click the value of the mapred.output.dir property to display the job output.</li>
 	</ul>
 	</li>
-	<li>Details - the job details. Click <span class="image-wrap" style=""><img src="/jobsub/static/help/images/21627568.png" style="border: 0px solid black"/></span> to display the Oozie application configuration.</li>
+	<li>Details - the job details. Click <span class="image-wrap" style=""><img src="/jobsub/static/help/cog.png" style="border: 0px solid black"/></span> to display the Oozie application configuration.</li>
 	<li>Definition - the Oozie application definition.</li>
 	<li>Log - the output log.</li>
 </ul>

+ 39 - 18
apps/oozie/static/help/index.html

@@ -11,11 +11,11 @@
 <h2><a name="OozieEditorandDashboard-Contents"></a>Contents</h2>
 
 <style type='text/css'>/*<![CDATA[*/
-div.rbtoc1347586569160 {margin-left: 1.5em;padding: 0px;}
-div.rbtoc1347586569160 ul {margin-left: 0px;padding-left: 20px;}
-div.rbtoc1347586569160 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1348177494142 {margin-left: 1.5em;padding: 0px;}
+div.rbtoc1348177494142 ul {margin-left: 0px;padding-left: 20px;}
+div.rbtoc1348177494142 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class='rbtoc1347586569160'>
+/*]]>*/</style><div class='rbtoc1348177494142'>
 <ul>
     <li><a href='#OozieEditorandDashboard-IntroducingOozie%26nbsp%3BEditor%2FDashboard'>Introducing Oozie&nbsp;Editor/Dashboard</a></li>
     <li><a href='#OozieEditorandDashboard-Oozie%26nbsp%3BEditor%2FDashboard%26nbsp%3BInstallationandConfiguration'>Oozie&nbsp;Editor/Dashboard&nbsp;Installation and Configuration</a></li>
@@ -49,13 +49,13 @@ div.rbtoc1347586569160 li {margin-left: 0px;padding-left: 0px;}
 
 <h1><a name="OozieEditorandDashboard-Oozie%26nbsp%3BEditor%2FDashboard%26nbsp%3BInstallationandConfiguration"></a>Oozie&nbsp;Editor/Dashboard&nbsp;Installation and Configuration</h1>
 
-<p>Oozie&nbsp;Editor/Dashboard&nbsp;is one of the applications that is installed as part of Hue. For more information about installing Hue, see&nbsp;<a href="https://ccp.cloudera.com/display/CDH4DOC/Hue+Installation">Hue Installation</a>. For information about Oozie, see&nbsp;<a href="http://archive.cloudera.com/cdh4/cdh/4/oozie/">http://archive.cloudera.com/cdh4/cdh/4/oozie/</a>.</p>
+<p>Oozie&nbsp;Editor/Dashboard&nbsp;is one of the applications that is installed as part of Hue. For more information about installing Hue, see&nbsp;<a href="https://ccp.cloudera.com/display/CDH4DOC/Hue+Installation">Hue Installation</a>. For information about Oozie, see&nbsp;<a href="http://archive.cloudera.com/cdh4/cdh/4/oozie/">Oozie Documentation</a>.</p>
 
 <div class='panelMacro'><table class='noteMacro'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="/static/art/help/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td><b>Note:</b> In order to run streaming or Pig jobs as part of a workflow, Oozie must be configured to use the Oozie ShareLib.  If this is not the case, Pig and streaming actions will not run.  See <a href="https://ccp.cloudera.com/display/CDH4DOC/Hue+Installation">Hue Installation</a> for more information.</td></tr></table></div>
 
 <h1><a name="OozieEditorandDashboard-StartingOozie%26nbsp%3BEditor%2FDashboard"></a>Starting Oozie&nbsp;Editor/Dashboard</h1>
 
-<p>To start Oozie Editor/Dashboard, click the <b>Oozie Editor/Dashboard</b> icon ( <span class="image-wrap" style=""><img src="/jobsub/static/help/images/21627376.png" width="24" style="border: 0px solid black"/></span>) in the navigation bar at the top of the Hue browser page. <b>Oozie Editor/Dashboard</b> opens with the following screens:</p>
+<p>To start Oozie Editor/Dashboard, click the <b>Oozie Editor/Dashboard</b> icon ( <span class="image-wrap" style=""><img src="/oozie/static/art/icon.png" width="24" style="border: 0px solid black"/></span>) in the navigation bar at the top of the Hue browser page. <b>Oozie Editor/Dashboard</b> opens with the following screens:</p>
 
 <ul>
 	<li>Dashboad &#45;&nbsp;shows the running and completed workflow and coordinator jobs. The screen is selected and opened to the Workflows page.</li>
@@ -74,22 +74,38 @@ div.rbtoc1347586569160 li {margin-left: 0px;padding-left: 0px;}
 <p>In the Dashboard workflows and coordinators can only be viewed, submitted, and modified by its owner or a superuser.</p>
 
 <p>Editor permissions for performing actions on workflows and coordinators are summarized in the following table:</p>
+
+<style type="text/css">
+td.confluenceTd {
+border: #dddddd solid 1px;
+height: 36px;
+padding: 5px 10px;
+vertical-align: top;
+}
+th.confluenceTh {
+border: #dddddd solid 1px;
+height: 40px;
+padding: 5px 10px;
+vertical-align: center;
+}
+</style>
+
 <div class='table-wrap'>
 <table class='confluenceTable'><tbody>
 <tr>
 <th class='confluenceTh'> Action </th>
-<th class='confluenceTh'> Superuser or Owner<br class="atl-forced-newline" /> </th>
+<th class='confluenceTh'> Superuser or Owner <br class="atl-forced-newline" /> </th>
 <th class='confluenceTh'> All </th>
 </tr>
 <tr>
 <td class='confluenceTd'> View </td>
 <td class='confluenceTd'> Y </td>
-<td class='confluenceTd'> Only if "Is shared" is set<br class="atl-forced-newline" /> </td>
+<td class='confluenceTd'> Only if "Is shared" is set <br class="atl-forced-newline" /> </td>
 </tr>
 <tr>
 <td class='confluenceTd'> Submit </td>
 <td class='confluenceTd'> Y </td>
-<td class='confluenceTd'> Only if "Is shared" is set<br class="atl-forced-newline" /> </td>
+<td class='confluenceTd'> Only if "Is shared" is set <br class="atl-forced-newline" /> </td>
 </tr>
 <tr>
 <td class='confluenceTd'> Modify </td>
@@ -117,7 +133,7 @@ div.rbtoc1347586569160 li {margin-left: 0px;padding-left: 0px;}
 <p>For the selected workflow, the following tabs and information is available.</p>
 
 <ul>
-	<li>The <b>Graph</b>&nbsp;tab shows the DAG of the workflow.</li>
+	<li>The <b>Graph</b>&nbsp;tab shows the workflow DAG.</li>
 	<li>The <b>Actions</b> tab shows you details about the actions that make up this workflow.
 	<ul>
 		<li>Click the <b>Id</b>&nbsp;link to see additional details about this action.</li>
@@ -138,7 +154,7 @@ div.rbtoc1347586569160 li {margin-left: 0px;padding-left: 0px;}
 
 <p>For the selected coordinator, the following tabs and information is available.</p>
 <ul>
-	<li>The <b>Calendar</b> tab shows the timestamp of the job. Click the timestamp opens the graph of the workflow.&nbsp;</li>
+	<li>The <b>Calendar</b> tab shows the timestamp of the job. Click the timestamp to open the workflow DAG.&nbsp;</li>
 	<li>The&nbsp;<b>Actions</b>&nbsp;tab shows you details about the actions that make up this coordinator.
 	<ul>
 		<li>Click the&nbsp;<b>Id</b>&nbsp;link to see additional details about this action.</li>
@@ -206,13 +222,17 @@ div.rbtoc1347586569160 li {margin-left: 0px;padding-left: 0px;}
 
 
 <ul>
-	<li>Clone actions by clicking the&nbsp; <span class="image-wrap" style=""><img src="/jobsub/static/help/images/21627426.png" style="border: 0px solid black"/></span>&nbsp;button.</li>
-	<li>Create or remove a fork and join by moving an action up or down with the&nbsp; <span class="image-wrap" style=""><img src="/jobsub/static/help/images/21627427.png" style="border: 0px solid black"/></span>&nbsp;buttons.</li>
-	<li>Change the position of an action by clicking the&nbsp; <span class="image-wrap" style=""><img src="/jobsub/static/help/images/21627427.png" style="border: 0px solid black"/></span>&nbsp;buttons in the same direction twice.</li>
+	<li>Clone actions by clicking the&nbsp; <span class="image-wrap" style=""><img src="/oozie/static/help/retweet.png" style="border: 0px solid black"/></span>&nbsp;button.</li>
+	<li>Create or remove a fork and join by moving an action up or down with the&nbsp; <span class="image-wrap" style=""><img src="/oozie/static/help/updown.png" style="border: 0px solid black"/></span>&nbsp;buttons.</li>
+	<li>Change the position of an action by clicking the&nbsp; <span class="image-wrap" style=""><img src="/oozie/static/help/updown.png" style="border: 0px solid black"/></span>&nbsp;buttons in the same direction twice.</li>
 </ul>
 
 
 
+<div class='panelMacro'><table class='noteMacro'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="/static/art/help/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td><font color="#222222">Each action must have a unique name.</font></td></tr></table></div>
+
+
+
 <h2><a name="OozieEditorandDashboard-EditingWorkflowProperties"></a>Editing Workflow Properties</h2>
 
 <ol>
@@ -225,17 +245,17 @@ div.rbtoc1347586569160 li {margin-left: 0px;padding-left: 0px;}
 
 <h2><a name="OozieEditorandDashboard-SubmittingaWorkflow"></a>Submitting a Workflow</h2>
 
-<p>To submit a workflow for execution, click the radio button next to the workflow and click the&nbsp;<b>Submit</b>&nbsp;button in the center of the Action Chooser.</p>
+<p>To submit a workflow for execution, click the radio button next to the workflow and click the&nbsp;<b>Submit</b>&nbsp;button.</p>
 
 
 <h2><a name="OozieEditorandDashboard-SchedulingaWorkflow"></a>Scheduling a Workflow</h2>
 
-<p>To schedule a workflow for recurring execution, click the radio button next to the workflow and click the&nbsp;<b>Schedule</b>&nbsp;button in the center of the Action Chooser. A coordinator is created and opened in the coordinator editor.</p>
+<p>To schedule a workflow for recurring execution, click the radio button next to the workflow and click the&nbsp;<b>Schedule</b>&nbsp;button. A coordinator is created and opened in the coordinator editor.</p>
 
 
 <h1><a name="OozieEditorandDashboard-CoordinatorEditor"></a>Coordinator Editor</h1>
 
-<p>The Coordinator Editor is where you create or edit Oozie coordinator applications and submit them for execution.&nbsp;The&nbsp;Workflow Editor&nbsp;contains one preinstalled sample coordinator.</p>
+<p>The Coordinator Editor is where you create or edit Oozie coordinator applications and submit them for execution.&nbsp;The&nbsp;Workflow Editor&nbsp;contains one pre-installed sample coordinator.</p>
 
 <h2><a name="OozieEditorandDashboard-Openinga%26nbsp%3BCoordinator"></a>Opening a&nbsp;Coordinator</h2>
 
@@ -266,7 +286,8 @@ div.rbtoc1347586569160 li {margin-left: 0px;padding-left: 0px;}
 	<li>To share the coordinator&nbsp;with all users, check the&nbsp;<b>Is shared</b>&nbsp;checkbox.</li>
 	<li>To set advanced execution options, click <b>advanced</b>&nbsp;and fill in properties that determine how long a coordinator will wait before timing out, how many coordinators can wait and run concurrently, the coordinator scheduling policy, and the coordinator schema version.</li>
 	<li>In the Frequency area, set how many time thes communicator will run for each specified unit, the start and end time of the coordinator, and the timezone of the start and end times.</li>
-	<li>In the Data area, click <b>Add</b> to add input and output datasets. If no datasets exist, follow the procedure in <a href="#OozieEditorandDashboard-CreatingaDataset">Creating a Dataset</a>.</li>
+	<li><font color="#222222">The inputs and outputs of the workflow must be mapped to some data. Click</font> <font color="#222222"><b>Add</b></font> <font color="#222222">and select a dataset from the Dataset drop-down menu and map it to one variable of your workflow.</font><br/>
+<font color="#222222">If no datasets exist, follow the procedure in</font>&nbsp;<a href="#OozieEditorandDashboard-CreatingaDataset">Creating a Dataset</a>.</li>
 	<li>Select a dataset from the <b>Dataset</b> drop-down menu.</li>
 	<li>Click <b>Save</b>.</li>
 </ol>

BIN
apps/oozie/static/help/retweet.png


BIN
apps/oozie/static/help/updown.png


+ 25 - 21
apps/shell/src/shell/static/help/index.html

@@ -3,14 +3,15 @@
 <p>The Hue Shell application provides access to the Pig and HBase command-line shells. The Shell application is designed to have the same look and feel as a Unix terminal. In addition to the shells configured by default, it is possible to include almost any process that exposes a command-line interface as an option in this Hue application.</p>
 
 
+
 <h2><a name="HueShell-Contents"></a>Contents</h2>
 
 <style type='text/css'>/*<![CDATA[*/
-div.rbtoc1347316595868 {margin-left: 1.5em;padding: 0px;}
-div.rbtoc1347316595868 ul {margin-left: 0px;padding-left: 20px;}
-div.rbtoc1347316595868 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1348176505138 {margin-left: 1.5em;padding: 0px;}
+div.rbtoc1348176505138 ul {margin-left: 0px;padding-left: 20px;}
+div.rbtoc1348176505138 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class='rbtoc1347316595868'>
+/*]]>*/</style><div class='rbtoc1348176505138'>
 <ul>
     <li><a href='#HueShell-IntroducingHueShell'>Introducing Hue Shell</a></li>
     <li><a href='#HueShell-HueShellInstallationandConfiguration'>Hue Shell Installation and Configuration</a></li>
@@ -32,24 +33,29 @@ div.rbtoc1347316595868 li {margin-left: 0px;padding-left: 0px;}
 <h3><a name="HueShell-UnixUserAccounts"></a>Unix User Accounts</h3>
 
 <p>To properly isolate subprocesses so as to guarantee security, each Hue user who is using the Shell subprocess must have a Unix user account. The link between Hue users and Unix user accounts is the username, and so every Hue user who wants to use the Shell application must have a Unix user account with the same name on the sytem that runs the Hue Server.  See the section on Unix user accounts in the Hue Shell configuration section of the <a href="https://ccp.cloudera.com/display/CDH4DOC/Hue+Installation#HueInstallation-UnixUserAccounts">Hue Installation Guide</a> for instructions.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></p>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></p>
 
 <h1><a name="HueShell-StartingHueShell"></a>Starting Hue Shell</h1>
 
 <ol>
-	<li>To start the Hue Shell application, click the <b>Shell</b> icon (<span class="image-wrap" style=""><img src="/shell/static/help/images/21103325.png" width="30" style="border: 0px solid black"/></span>) in the navigation bar at the top of the Hue web page. (To start a second instance of the Shell application, right-click the link and select "Open link in new tab".)
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
+	<li>To start the Hue Shell application, click the <b>Shell</b> icon ( <span class="image-wrap" style=""><img src="/shell/static/art/shell.png" width="30" style="border: 0px solid black"/></span>) in the navigation bar at the top of the Hue web page. (To start a second instance of the Shell application, right-click the link and select "Open link in new tab".)
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
 The <b>Shell</b> window opens in the Hue web page.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>Click any of the tabs at the top of the Shell window to open a subprocess shell of that type.
 <br class="atl-forced-newline" />
 <div class='panelMacro'><table class='noteMacro'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="/static/art/help/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td><b>Note:</b> If a button is disabled, the program is not on the system path. Ask your Hue administrator to fix this problem.</td></tr></table></div></li>
 	<li>After opening a subprocess, click anywhere in the body of the Shell application window to focus the command line. (Tab-completion is not supported.)
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>To end a process, type <tt>exit</tt> or <tt>quit</tt> depending on the type of subprocess you have opened.
 <br class="atl-forced-newline" />
 <div class='panelMacro'><table class='noteMacro'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="/static/art/help/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td><b>Note:</b> If you close your browser, the underlying shell process remains running for the amount of time specified by your Hue administrator. After this time the process is killed.</td></tr></table></div>
-<p><br class="atl-forced-newline" /> <br class="atl-forced-newline" /></p></li>
+<p><br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></p></li>
 </ol>
 
 
@@ -58,19 +64,17 @@ The <b>Shell</b> window opens in the Hue web page.
 <p>For information about using each of the default shells, see the documentation on the following sites:</p>
 
 <style type="text/css">
-td {
+td.confluenceTd {
 border: #dddddd solid 1px;
 height: 36px;
 padding: 5px 10px;
-vertical-align: center;
+vertical-align: top;
 }
-th {
+th.confluenceTh {
 border: #dddddd solid 1px;
-align: center;
 height: 40px;
 padding: 5px 10px;
 vertical-align: center;
-background-color: #c0c0c0;
 }
 </style>
 
@@ -78,16 +82,16 @@ background-color: #c0c0c0;
 <div class='table-wrap'>
 <table class='confluenceTable'><tbody>
 <tr>
-<th class='confluenceTh'>Shell</th>
-<th class='confluenceTh'>Site</th>
+<th class='confluenceTh'> Shell </th>
+<th class='confluenceTh'> Site </th>
 </tr>
 <tr>
-<td class='confluenceTd'>Pig</td>
-<td class='confluenceTd'><a href="http://hadoop.apache.org/pig/">Pig home page</a></td>
+<td class='confluenceTd'> Pig </td>
+<td class='confluenceTd'> <a href="http://hadoop.apache.org/pig/">Pig home page</a> </td>
 </tr>
 <tr>
-<td class='confluenceTd'>HBase</td>
-<td class='confluenceTd'><a href="http://wiki.apache.org/hadoop/Hbase/Shell">HBase shell page</a></td>
+<td class='confluenceTd'> HBase </td>
+<td class='confluenceTd'> <a href="http://wiki.apache.org/hadoop/Hbase/Shell">HBase shell page</a> </td>
 </tr>
 </tbody></table>
 </div>

+ 81 - 42
apps/useradmin/static/help/index.html

@@ -1,17 +1,17 @@
 <h1><a name="UserAdmin-IntroducingUserAdmin"></a>Introducing User Admin</h1>
 
-<p>The User Admin application lets an administrator add, delete, and manage Hue user accounts and groups, and configure group permissions. The permissions allow users, based on their group membership, to launch Hue applications and use application features.  You can add users and groups individually, or import them from an LDAP directory. </p>
+<p>The User Admin application lets an administrator add, delete, and manage Hue user accounts and groups, and configure group permissions. The permissions allow users, based on their group membership, to launch Hue applications and use application features.  You can add users and groups individually, or import them from an LDAP directory.</p>
 
 
 
 <h2><a name="UserAdmin-Contents"></a>Contents</h2>
 
 <style type='text/css'>/*<![CDATA[*/
-div.rbtoc1343090950698 {margin-left: 1.5em;padding: 0px;}
-div.rbtoc1343090950698 ul {margin-left: 0px;padding-left: 20px;}
-div.rbtoc1343090950698 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1348177692294 {margin-left: 1.5em;padding: 0px;}
+div.rbtoc1348177692294 ul {margin-left: 0px;padding-left: 20px;}
+div.rbtoc1348177692294 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class='rbtoc1343090950698'>
+/*]]>*/</style><div class='rbtoc1348177692294'>
 <ul>
     <li><a href='#UserAdmin-IntroducingUserAdmin'>Introducing User Admin</a></li>
     <li><a href='#UserAdmin-StartingUserAdmin'>Starting User Admin</a></li>
@@ -33,15 +33,16 @@ div.rbtoc1343090950698 li {margin-left: 0px;padding-left: 0px;}
 </ul>
     <li><a href='#UserAdmin-ManagingApplicationPermissions'>Managing Application Permissions</a></li>
 </ul></div>
-<p><br class="atl-forced-newline" /> </p>
+<p><br class="atl-forced-newline" /></p>
 
 <h1><a name="UserAdmin-StartingUserAdmin"></a>Starting User Admin</h1>
 
 <p><b>To start User Admin:</b></p>
 
 <ul>
-	<li>Click the <b>User Admin</b> icon ( <span class="image-wrap" style=""><img src="/useradmin/static/help/images/21103326.png" width="30" style="border: 0px solid black"/></span> ) in the navigation bar at the top of the Hue browser page.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+	<li>Click the <b>User Admin</b> icon ( <span class="image-wrap" style=""><img src="/useradmin/static/art/useradmin-logo.png" width="30" style="border: 0px solid black"/></span> ) in the navigation bar at the top of the Hue browser page.
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 </ul>
 
 
@@ -50,7 +51,8 @@ div.rbtoc1343090950698 li {margin-left: 0px;padding-left: 0px;}
 <p>The Hue User Admin application provides two levels of user privileges:</p>
 <ul>
 	<li>Superusers &#8212; have permissions to perform administrative functions &#8211; add and delete users, add and delete groups, assign permissions to groups. The first user who logs into Hue after its initial installation becomes the first superuser. That superuser can then create more superusers and user accounts. Later, the superuser can also change any existing user account into a superuser. A superuser can also import users and groups from an LDAP server.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>Users &#8212; can log in to Hue and run Hue applications, subject to the permissions provided by the Hue groups to which they belong.</li>
 </ul>
 
@@ -69,19 +71,35 @@ div.rbtoc1343090950698 li {margin-left: 0px;padding-left: 0px;}
 <br class="atl-forced-newline" />
 <br class="atl-forced-newline" />
 The following table describes the options in the <b>Add User</b> dialog box.
+
+<style type="text/css">
+td.confluenceTd {
+border: #dddddd solid 1px;
+height: 36px;
+padding: 5px 10px;
+vertical-align: top;
+}
+th.confluenceTh {
+border: #dddddd solid 1px;
+height: 40px;
+padding: 5px 10px;
+vertical-align: center;
+}
+</style>
+
 <div class='table-wrap'>
 <table class='confluenceTable'><tbody>
 <tr>
 <th class='confluenceTh'> <b>User Account Option</b> </th>
-<th class='confluenceTh'>  <b>Description</b>  </th>
+<th class='confluenceTh'> <b>Description</b> </th>
 </tr>
 <tr>
 <td class='confluenceTd'> <b>Username</b> </td>
 <td class='confluenceTd'> Specify a user name that contains only letters, numbers, and underscores; blank spaces are not allowed and the name cannot begin with a number. The user name is used to log into Hue and in file permissions and job submissions. This is a required field. </td>
 </tr>
 <tr>
-<td class='confluenceTd'> <b>First name</b> and<br/>
- <b>Last name</b> </td>
+<td class='confluenceTd'> <b>First name</b> and <br class="atl-forced-newline" />
+<b>Last name</b> </td>
 <td class='confluenceTd'> Specify the user's first and last name. </td>
 </tr>
 <tr>
@@ -132,7 +150,8 @@ The following table describes the options in the <b>Add User</b> dialog box.
 <br class="atl-forced-newline" />
 <br class="atl-forced-newline" /></li>
 	<li>Make the changes to the user account and then click <b>Save</b>.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 </ol>
 
 
@@ -146,16 +165,21 @@ The following table describes the options in the <b>Add User</b> dialog box.
 
 <ol>
 	<li>Click <b>Add/sync LDAP user</b>.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>In the <b>Add or Sync a LDAP user</b> dialog, type the user name in the <b>Username</b> field.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
 	<ul>
 		<li>Check the <b>Distinguished Name</b> checkbox to use a full distinguished name for the user.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
-This imports the user's first and last name, username, and email, but does not store the user password. 
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
+This imports the user's first and last name, username, and email, but does not store the user password.
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 		<li>If the user already exists in the User Admin, this will sync the user information in User Admin with what is currently in the LDAP directory.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	</ul>
 	</li>
 </ol>
@@ -163,35 +187,40 @@ This imports the user's first and last name, username, and email, but does not s
 
 <h2><a name="UserAdmin-SyncingUsersandGroupswithanLDAPdirectory"></a>Syncing Users and Groups with an LDAP directory</h2>
 
-<p>You can sync the Hue user database with the current state of the LDAP directory using the <b>Sync LDAP users/groups</b> function.  This will update the user/group information for the already imported users and groups. It does not import any new users or groups. </p>
+<p>You can sync the Hue user database with the current state of the LDAP directory using the <b>Sync LDAP users/groups</b> function.  This will update the user/group information for the already imported users and groups. It does not import any new users or groups.</p>
 <ol>
 	<li>Click <b>Sync LDAP users/groups</b>.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>In the <b>Sync LDAP users and groups</b> dialog, click <b>Sync</b> to perform the sync.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 </ol>
 
 
 
 <h1><a name="UserAdmin-WorkingwithGroups"></a>Working with Groups</h1>
 
-<p>Superusers can add groups, delete the groups they have created, configure group permissions, and assign users to group memberships. </p>
+<p>Superusers can add groups, delete the groups they have created, configure group permissions, and assign users to group memberships.</p>
 
 
 
 <h2><a name="UserAdmin-AddingaGroup"></a>Adding a Group</h2>
 
-<p>You can add groups, and delete the groups you've added. You can also import groups from an LDAP directory.  </p>
+<p>You can add groups, and delete the groups you've added. You can also import groups from an LDAP directory.</p>
 
 <p><b>To add a group:</b>
 <br class="atl-forced-newline" /></p>
 <ol>
 	<li>In the <b>User Admin</b> window, click <b>Groups</b> and then click <b>Add Group</b>.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>In the <b>Add Group</b> dialog box, specify a name for the group. Group names can only be letters, numbers, and underscores; blank spaces are not allowed.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>To add users to the group, check the names in the list provided or check <b>Select All</b>.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>Click <b>Save</b> to save the information you specified and close the <b>Add Group</b> dialog box.</li>
 </ol>
 
@@ -222,9 +251,11 @@ This imports the user's first and last name, username, and email, but does not s
 <br class="atl-forced-newline" /></p>
 <ol>
 	<li>Click <b>Groups</b> to view the <b>Groups</b> list.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>Click the <b>Delete</b> button to the right of the group you want to delete.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>Click <b>Yes</b> to confirm.
 <br class="atl-forced-newline" /></li>
 </ol>
@@ -232,16 +263,18 @@ This imports the user's first and last name, username, and email, but does not s
 
 <h2><a name="UserAdmin-EditingaGroup"></a>Editing a Group</h2>
 
-<p>You can add and remove users, and create subgroups for groups created manually in Authorization Manager.  </p>
+<p>You can add and remove users, and create subgroups for groups created manually in Authorization Manager.</p>
 
 
 <p><b>To edit a group:</b>
 <br class="atl-forced-newline" /></p>
 <ol>
 	<li>Click <b>Groups</b> to view the <b>Groups</b> list.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>Click the <b>Edit</b> button to the right of the group you want to modify.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>Make the changes for the group and then click <b>Save</b>.
 <br class="atl-forced-newline" /></li>
 </ol>
@@ -253,14 +286,17 @@ This imports the user's first and last name, username, and email, but does not s
 
 <ol>
 	<li>From the <b>Groups</b> tab, Click <b>Add/sync LDAP user</b>.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>In the <b>Add or Sync a LDAP group</b> dialog, type the group name in the <b>Name</b> field.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" />
 	<ul>
-		<li>Check the <b>Distinguished Name</b> checkbox to use a full distinguished name.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+		<li>Check the <b>Distinguished Name</b> checkbox to use a full distinguished name. <br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 		<li>Check <b>Import new members</b> to also import the members of the group. or the group.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	</ul>
 	</li>
 </ol>
@@ -270,7 +306,7 @@ This imports the user's first and last name, username, and email, but does not s
 
 <h1><a name="UserAdmin-ManagingApplicationPermissions"></a>Managing Application Permissions</h1>
 
-<p>Permissions for Hue applications are granted to groups, with users gaining permissions based on their group membership. Superusers can assign or remove permissions from groups, including groups imported from LDAP.  </p>
+<p>Permissions for Hue applications are granted to groups, with users gaining permissions based on their group membership. Superusers can assign or remove permissions from groups, including groups imported from LDAP.</p>
 
 <p><a name="UserAdmin-AssigningPermissions"></a></p>
 
@@ -280,13 +316,16 @@ This imports the user's first and last name, username, and email, but does not s
 
 <ol>
 	<li>Click <b>Permissions</b>.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>Click the <b>Edit</b> button next to the application for which you want to assign permissions.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>Select the Groups you want to have permission for the application.  You can check <b>Select All</b> to select all groups.
-<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /></li>
 	<li>Click <b>Save</b>.<br/>
-The new groups will appear in the Groups column in the <b>Hue Permissions</b> list. </li>
+The new groups will appear in the Groups column in the <b>Hue Permissions</b> list.</li>
 </ol>
 
 

+ 1 - 1
desktop/core/static/help/index.html

@@ -16,7 +16,7 @@
 
 <h3><a name="WelcometoHue-NoticeofMisconfiguration"></a>Notice of Misconfiguration</h3>
 
-<p>If Hue detects a misconfiguration, an indicator <span class="image-wrap" style=""><img src="/desktop/static/help/images/21103312.png" height="18" style="border: 0px solid black"/></span> appears in the navigation bar at the top of the page.  Clicking this takes you to the <b>Check for misconfiguration</b> page which will indicate the potential misconfiguration(s) with hints about fixing them. </p>
+<p>If Hue detects a misconfiguration, an indicator <span class="image-wrap" style=""><img src="/static/art/error.png" height="18" style="border: 0px solid black"/></span> appears in the navigation bar at the top of the page.  Clicking this takes you to the <b>Check for misconfiguration</b> page which will indicate the potential misconfiguration(s) with hints about fixing them. </p>
 
 <h3><a name="WelcometoHue-ChangingyourPassword"></a>Changing your Password</h3>