Przeglądaj źródła

HUE-680. [doc] Update all the Help doc of each app

Delete out of date pages and pictures too.
Romain Rigaux 13 lat temu
rodzic
commit
b910d9c398
86 zmienionych plików z 746 dodań i 749 usunięć
  1. BIN
      apps/about/static/help/images/about-hue-icon.jpg
  2. BIN
      apps/about/static/help/images/feather.gif
  3. 30 0
      apps/about/static/help/index.html
  4. 0 8
      apps/about/static/help/index.md
  5. BIN
      apps/beeswax/static/help/images/6259202.jpg
  6. BIN
      apps/beeswax/static/help/images/6259203.jpg
  7. BIN
      apps/beeswax/static/help/images/6259204.jpg
  8. BIN
      apps/beeswax/static/help/images/6259205.jpg
  9. BIN
      apps/beeswax/static/help/images/6259206.jpg
  10. BIN
      apps/beeswax/static/help/images/6259207.jpg
  11. BIN
      apps/beeswax/static/help/images/6259208.jpg
  12. BIN
      apps/beeswax/static/help/images/6259209.jpg
  13. BIN
      apps/beeswax/static/help/images/6259210.jpg
  14. BIN
      apps/beeswax/static/help/images/6259211.jpg
  15. BIN
      apps/beeswax/static/help/images/6259212.jpg
  16. BIN
      apps/beeswax/static/help/images/6259213.jpg
  17. BIN
      apps/beeswax/static/help/images/6259214.jpg
  18. BIN
      apps/beeswax/static/help/images/6259215.jpg
  19. BIN
      apps/beeswax/static/help/images/6259216.jpg
  20. BIN
      apps/beeswax/static/help/images/6259217.jpg
  21. BIN
      apps/beeswax/static/help/images/6259218.jpg
  22. BIN
      apps/beeswax/static/help/images/6259219.jpg
  23. BIN
      apps/beeswax/static/help/images/new_query.gif
  24. BIN
      apps/beeswax/static/help/images/query_history.gif
  25. BIN
      apps/beeswax/static/help/images/query_results.gif
  26. BIN
      apps/beeswax/static/help/images/saved_queries.gif
  27. BIN
      apps/beeswax/static/help/images/table_info.gif
  28. 289 283
      apps/beeswax/static/help/index.html
  29. BIN
      apps/filebrowser/src/filebrowser/static/help/images/6259464.jpg
  30. BIN
      apps/filebrowser/src/filebrowser/static/help/images/6259465.jpg
  31. BIN
      apps/filebrowser/src/filebrowser/static/help/images/6259466.jpg
  32. BIN
      apps/filebrowser/src/filebrowser/static/help/images/6259467.jpg
  33. BIN
      apps/filebrowser/src/filebrowser/static/help/images/6259468.jpg
  34. BIN
      apps/filebrowser/src/filebrowser/static/help/images/6259469.jpg
  35. BIN
      apps/filebrowser/src/filebrowser/static/help/images/6259470.jpg
  36. BIN
      apps/filebrowser/src/filebrowser/static/help/images/6259471.jpg
  37. BIN
      apps/filebrowser/src/filebrowser/static/help/images/6259472.jpg
  38. BIN
      apps/filebrowser/src/filebrowser/static/help/images/6259473.jpg
  39. BIN
      apps/filebrowser/src/filebrowser/static/help/images/6259474.jpg
  40. BIN
      apps/filebrowser/src/filebrowser/static/help/images/6259475.jpg
  41. BIN
      apps/filebrowser/src/filebrowser/static/help/images/6259559.jpg
  42. BIN
      apps/filebrowser/src/filebrowser/static/help/images/6259560.jpg
  43. 57 103
      apps/filebrowser/src/filebrowser/static/help/index.html
  44. 1 1
      apps/help/src/help/urls.py
  45. BIN
      apps/jobbrowser/static/help/images/6259455.jpg
  46. BIN
      apps/jobbrowser/static/help/images/6259456.jpg
  47. BIN
      apps/jobbrowser/static/help/images/6259457.jpg
  48. BIN
      apps/jobbrowser/static/help/images/6259458.jpg
  49. BIN
      apps/jobbrowser/static/help/images/6259459.jpg
  50. BIN
      apps/jobbrowser/static/help/images/6259460.jpg
  51. BIN
      apps/jobbrowser/static/help/images/6259461.jpg
  52. BIN
      apps/jobbrowser/static/help/images/6259462.jpg
  53. BIN
      apps/jobbrowser/static/help/images/6259463.jpg
  54. BIN
      apps/jobbrowser/static/help/images/6259568.jpg
  55. BIN
      apps/jobbrowser/static/help/images/6259569.jpg
  56. BIN
      apps/jobbrowser/static/help/images/6259570.jpg
  57. 55 80
      apps/jobbrowser/static/help/index.html
  58. BIN
      apps/jobsub/static/help/images/6259476.jpg
  59. BIN
      apps/jobsub/static/help/images/6259477.jpg
  60. BIN
      apps/jobsub/static/help/images/6259478.jpg
  61. BIN
      apps/jobsub/static/help/images/6259479.jpg
  62. BIN
      apps/jobsub/static/help/images/6259480.jpg
  63. BIN
      apps/jobsub/static/help/images/6259481.jpg
  64. BIN
      apps/jobsub/static/help/images/6259482.jpg
  65. BIN
      apps/jobsub/static/help/images/6259483.jpg
  66. BIN
      apps/jobsub/static/help/images/6259484.jpg
  67. BIN
      apps/jobsub/static/help/images/6259485.jpg
  68. BIN
      apps/jobsub/static/help/images/6259486.jpg
  69. BIN
      apps/jobsub/static/help/images/6259487.jpg
  70. BIN
      apps/jobsub/static/help/images/6259488.jpg
  71. BIN
      apps/jobsub/static/help/images/6259489.jpg
  72. BIN
      apps/jobsub/static/help/images/6259561.jpg
  73. BIN
      apps/jobsub/static/help/images/6259562.jpg
  74. BIN
      apps/jobsub/static/help/images/6259563.jpg
  75. BIN
      apps/jobsub/static/help/images/6259564.jpg
  76. BIN
      apps/jobsub/static/help/images/6259565.jpg
  77. BIN
      apps/jobsub/static/help/images/6259566.jpg
  78. BIN
      apps/jobsub/static/help/images/6259567.jpg
  79. 227 170
      apps/jobsub/static/help/index.html
  80. BIN
      apps/shell/src/shell/static/help/images/12517859.jpg
  81. BIN
      apps/shell/src/shell/static/help/images/12517860.jpg
  82. 44 28
      apps/shell/src/shell/static/help/index.html
  83. BIN
      apps/useradmin/static/help/images/user_admin.gif
  84. 0 27
      apps/useradmin/static/help/index.md
  85. 43 0
      desktop/core/static/help/index.html
  86. 0 49
      desktop/core/static/help/index.md

BIN
apps/about/static/help/images/about-hue-icon.jpg


BIN
apps/about/static/help/images/feather.gif


+ 30 - 0
apps/about/static/help/index.html

@@ -0,0 +1,30 @@
+<h1>About</h1>
+
+				    <p>Click the "About" tab tab in the navigation bar at the top of the Hue web browser window to open the "About - Hue" page. This displays the version of Hue you are running. </p>
+
+<p>Within the About page you can:</p>
+
+<ul>
+	<li>Click the "Configuration" tab to view the current Hue configuration.  <font color="red"><em>More needed here?</em> </font></li>
+</ul>
+
+
+<ul>
+	<li>Click the "Check for misconfiguration" tab to have Hue validate your Hue configuration.  It will note any potential misconfigurations and provide hints as to how to fix them.  You can edit the configuration file or use Cloudera Manager, if installed, to manage your changes.
+<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>Note: The location of the Hue configuration files is shown on the Check for Misconfiguration" page.</td></tr></table></div> </li>
+</ul>
+
+
+<ul>
+	<li>Click the "Server Logs" tab to view the Hue server logs.  You can also download the logs to your local system  as a zip file from this page.</li>
+</ul>
+
+
+				    
+                    			    </td>
+		    </tr>
+	    </table>
+	    
+    </body>
+</html>
+

+ 0 - 8
apps/about/static/help/index.md

@@ -1,8 +0,0 @@
-About Hue
-=========
-Click the "About Hue" icon in the upper-left corner of the Hue window to open the "About - Hue" window and  view the Hue version you're running.
-
-<img src ="/about/static/help/images/about-hue-icon.jpg" width="200">
-
-In the "About - Hue" window, click the "Configuration" link to view the current Hue configuration, or click the "Server Logs" link to view the Hue server logs.
-

BIN
apps/beeswax/static/help/images/6259202.jpg


BIN
apps/beeswax/static/help/images/6259203.jpg


BIN
apps/beeswax/static/help/images/6259204.jpg


BIN
apps/beeswax/static/help/images/6259205.jpg


BIN
apps/beeswax/static/help/images/6259206.jpg


BIN
apps/beeswax/static/help/images/6259207.jpg


BIN
apps/beeswax/static/help/images/6259208.jpg


BIN
apps/beeswax/static/help/images/6259209.jpg


BIN
apps/beeswax/static/help/images/6259210.jpg


BIN
apps/beeswax/static/help/images/6259211.jpg


BIN
apps/beeswax/static/help/images/6259212.jpg


BIN
apps/beeswax/static/help/images/6259213.jpg


BIN
apps/beeswax/static/help/images/6259214.jpg


BIN
apps/beeswax/static/help/images/6259215.jpg


BIN
apps/beeswax/static/help/images/6259216.jpg


BIN
apps/beeswax/static/help/images/6259217.jpg


BIN
apps/beeswax/static/help/images/6259218.jpg


BIN
apps/beeswax/static/help/images/6259219.jpg


BIN
apps/beeswax/static/help/images/new_query.gif


BIN
apps/beeswax/static/help/images/query_history.gif


BIN
apps/beeswax/static/help/images/query_results.gif


BIN
apps/beeswax/static/help/images/saved_queries.gif


BIN
apps/beeswax/static/help/images/table_info.gif


+ 289 - 283
apps/beeswax/static/help/index.html

@@ -1,292 +1,293 @@
 <h1><a name="Beeswax-IntroducingBeeswax"></a>Introducing Beeswax</h1>
 
-<p>Beeswax enables you to perform queries on Apache Hive, a data warehousing system designed to work with Hadoop. </p>
+<p>The Beeswax application enables you to perform queries on Apache Hive, a data warehousing system designed to work with Hadoop. You can create Hive tables, load data, run and manage Hive queries, and download the results in a Microsoft Office Excel worksheet file or a comma-separated values file.</p>
 
-<h2><a name="Beeswax-BeeswaxandHiveInstallationandConfiguration"></a>Beeswax and Hive Installation and Configuration</h2>
 
-<p>Beeswax is installed as part of Hue. For more information about installing Hue, see <a href="https://ccp.cloudera.com/display/CDHDOC/Hue+Installation">https://ccp.cloudera.com/display/CDHDOC/Hue+Installation</a>. </p>
+<h2><a name="Beeswax-Contents"></a>Contents</h2>
 
-<h2><a name="Beeswax-HiveConfiguration"></a>Hive Configuration</h2>
+<style type='text/css'>/*<![CDATA[*/
+div.rbtoc1334186923081 {margin-left: 1.5em;padding: 0px;}
+div.rbtoc1334186923081 ul {margin-left: 0px;padding-left: 20px;}
+div.rbtoc1334186923081 li {margin-left: 0px;padding-left: 0px;}
 
-<p>Beeswax, the Hive user interface in Hue, includes Hive 0.5. You do not need an existing Hive installation.</p>
+/*]]>*/</style><div class='rbtoc1334186923081'>
+<ul>
+    <li><a href='#Beeswax-IntroducingBeeswax'>Introducing Beeswax</a></li>
+    <li><a href='#Beeswax-BeeswaxandHiveInstallationandConfiguration'>Beeswax and Hive Installation and Configuration</a></li>
+    <li><a href='#Beeswax-StartingBeeswax'>Starting Beeswax</a></li>
+<ul>
+<ul>
+    <li><a href='#Beeswax-InstallingtheBeeswaxSamples'>Installing the Beeswax Samples</a></li>
+    <li><a href='#Beeswax-ImportingyourownData'>Importing your own Data</a></li>
+</ul>
+</ul>
+    <li><a href='#Beeswax-WorkingwithQueries'>Working with Queries</a></li>
+<ul>
+<ul>
+    <li><a href='#Beeswax-CreatingandRunningQueries'>Creating and Running Queries</a></li>
+    <li><a href='#Beeswax-TheAdvancedSettingsmenu'>The Advanced Settings menu</a></li>
+    <li><a href='#Beeswax-ViewingQueryHistory'>Viewing Query History</a></li>
+    <li><a href='#Beeswax-Viewing%2CEditing%2CorDeletingSavedQueries'>Viewing, Editing, or Deleting Saved Queries</a></li>
+</ul>
+</ul>
+    <li><a href='#Beeswax-WorkingwithTables'>Working with Tables</a></li>
+<ul>
+<ul>
+    <li><a href='#Beeswax-CreatingTables'>Creating Tables</a></li>
+    <li><a href='#Beeswax-BrowsingTables'>Browsing Tables</a></li>
+    <li><a href='#Beeswax-ImportingDataintoTables'>Importing Data into Tables</a></li>
+    <li><a href='#Beeswax-DroppingTables'>Dropping Tables</a></li>
+    <li><a href='#Beeswax-ViewingaTable%27sLocation'>Viewing a Table's Location</a></li>
+</ul>
+</ul>
+</ul></div>
+<p><br class="atl-forced-newline" /></p>
 
-<p>Your Hive data is stored in the Hadoop Distributed File System (HDFS), typically in the <tt>/user/hive/warehouse</tt> directory (or the directory you specify as <tt>hive.metastore.warehouse.dir</tt> in the <tt>hive-site.xml</tt> file). Make sure this directory exists and is writable by the users whom you expect to be creating tables. The directory <tt>/tmp</tt> (on the local file system) must also be world-writable because Hive uses it extensively.</p>
+<h1><a name="Beeswax-BeeswaxandHiveInstallationandConfiguration"></a>Beeswax and Hive Installation and Configuration</h1>
 
-<h2><a name="Beeswax-BeeswaxConfiguration"></a>Beeswax Configuration </h2>
+<p>Beeswax is installed and configured as part of Hue. For more information about installing Hue, see <a href="https://ccp.cloudera.com/display/CDH4B2/Hue+Installation">Hue Installation</a>.</p>
 
-<p><b>If there is an existing Hive installation:</b></p>
+<p>Beeswax assumes an existing Hive installation.  The Hue installation instructions include the configuration necessary for Beeswax to access Hive. </p>
 
-<p>In <tt>/etc/hue/conf/hue-beeswax.ini</tt>, modify <tt>hive_conf_dir</tt> to refer to the directory containing <tt>hive-site.xml</tt>.</p>
+<p>You can view the current Hive configuration from from the <b>Settings</b> tab in the Beeswax application. </p>
 
-<p><b>If there is no existing Hive installation:</b></p>
 
-<p>For information about the configuration options in <tt>hive-site.xml</tt>, see <a href="http://wiki.apache.org/hadoop/Hive/AdminManual/Configuration">http://wiki.apache.org/hadoop/Hive/AdminManual/Configuration</a>. The <tt>hive-site.xml</tt> file is optional but it is often useful, particularly if you want to set up a metastore. You may store the <tt>hive-site.xml</tt> file in <tt>/etc/hue/conf</tt>, or instruct Beeswax to locate it using the <tt>hive_conf_dir</tt> configuration variable (see <tt>/etc/hue/conf/hue-beeswax.ini</tt>).</p>
 
-<h1><a name="Beeswax-UsingBeeswax"></a>Using Beeswax</h1>
 
-<h2><a name="Beeswax-StartingBeeswax"></a>Starting Beeswax </h2>
+<h1><a name="Beeswax-StartingBeeswax"></a>Starting Beeswax</h1>
 
-<p>To start the Beeswax application, click this icon <span class="image-wrap" style=""><img src="/beeswax/static/help/images/6259203.jpg" height="29" width="30" style="border: 0px solid black"/></span> in the application bar at the bottom of the Hue web browser page. The <b>Beeswax: Hive Query</b> window opens in the Hue web page. </p> <h2><a name="Beeswax-InstallingtheBeeswaxSamples"></a>Installing the Beeswax Samples</h2>
+<p>To start the Beeswax application, click the <b>Beeswax</b> tab in the navigation bar at the top of the Hue browser page.  </p>
 
-<p>You can install two sample Beeswax tables to use as examples. </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><b>To install Beeswax samples:</b> </p>
+<p>Once some tables have been created, clicking the Beeswax tab will bring you directly into the Query Editor. </p>
+
+<p>The tabs at the top of the page allow you to navigate to the main functional areas of Beeswax. </p>
+
+<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>Beeswax</b> window, click <b>Tables</b>.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>In the <b>Table List</b> window, click <b>install samples</b>.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-<span class="image-wrap" style=""><img src="/beeswax/static/help/images/6259202.jpg" height="416" width="710" style="border: 0px solid black"/></span>
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-After you click <b>install samples</b>, the samples are displayed in the <b>Hive Table List</b> window. Beeswax removes the <b>install samples</b> button after the samples are installed. </li>
+	<li>In the <b>Beeswax</b> window, click <b>Install Samples</b>
+<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" /> <br class="atl-forced-newline" />
+Once you have installed the sample data, this option will no longer appear.</li>
+</ol>
+
+
+<h3><a name="Beeswax-ImportingyourownData"></a>Importing your own Data</h3>
+
+<p>You can import data or your own:</p>
+<ol>
+	<li>In the "Beeswax" 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>
+	<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" />  <br class="atl-forced-newline" /></li>
 </ol>
 
 
-<h2><a name="Beeswax-WorkingwithQueries"></a>Working with Queries</h2>
+<h1><a name="Beeswax-WorkingwithQueries"></a>Working with Queries</h1>
 
-<p>The <b>Hive Query</b> view enables you to enter queries in Hive's Query Language (HQL), which is similar to Structured Query Language (SQL). You can name and save your queries to use later. When you submit a query, the Beeswax Server uses Hive to run the queries. You can either wait for the query to complete, or return later to find the queries in the <b>Beeswax History</b> view. You can also receive an email message after the query is completed. </p>
+<p>The <b>Query Editor</b> view enables you to enter queries in Hive's Query Language (HQL), which is similar to Structured Query Language (SQL). You can name and save your queries to use later. When you submit a query, the Beeswax Server uses Hive to run the queries. You can either wait for the query to complete, or return later to find the queries in the <b>Beeswax History</b> view. You can also receive an email message after the query is completed.</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>For More Information</b><br />For information about HQL syntax, see <a href="http://wiki.apache.org/hadoop/Hive/LanguageManual.">http://wiki.apache.org/hadoop/Hive/LanguageManual.</a></td></tr></table></div> 
+<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>For More Information</b><br />For information about HQL syntax, see <a href="http://wiki.apache.org/hadoop/Hive/LanguageManual.">http://wiki.apache.org/hadoop/Hive/LanguageManual.</a></td></tr></table></div>
 
 <h3><a name="Beeswax-CreatingandRunningQueries"></a>Creating and Running Queries</h3>
 
-<p><b>To create and run a query</b>: </p>
+<p><b>To create and run a query</b>:</p>
 
 <ol>
-	<li>In the <b>Beeswax: Hive Query</b> window, type the query.
-<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: 
+	<li>In the Beeswax <b>Hive Query</b> window, type the query.
+<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</tt>
+<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+	<li>The Advanced Settings section lets you 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 Settings</a> below for details on using these settings.
+<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>
+	<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>
+	<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>
+	<li>Do any of the following to download or save the query results:
 <br class="atl-forced-newline" />
-<span class="image-wrap" style=""><img src="/beeswax/static/help/images/6259206.jpg" height="411" width="713" style="border: 0px solid black"/></span>
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>To override the default Hive and Hadoop settings for the current query, click <b>Advanced</b>. (To view the Hive default settings, click <b>Settings</b>.)
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-A panel opens on the left side of the window where you can specify the advanced settings.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-<span class="image-wrap" style=""><img src="/beeswax/static/help/images/6259207.jpg" height="411" width="713" style="border: 0px solid black"/></span>
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>Click the plus sign icon <span class="image-wrap" style=""><img src="/beeswax/static/help/images/6259208.jpg" height="18" width="18" style="border: 0px solid black"/></span> to add a setting for the following options. Click the plus sign icon again to specify multiple settings for a group, such as <b>Hive Settings</b>.
-<br class="atl-forced-newline" />
-<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" />
+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>
+		<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>
+		<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>
+		<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>
+		<li>To return to the query in the <b>Query Editor,</b> click <b>Unsaved Query</b>.</li>
+	</ul>
+	</li>
+</ol>
+
+
+
+<p><a name="Beeswax-AdvancedSettings"></a></p>
+<h3><a name="Beeswax-TheAdvancedSettingsmenu"></a>The Advanced Settings menu</h3>
+
+<p>The Advanced settings section lets you specify the following options:
+<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></p>
 <div class='table-wrap'>
 <table class='confluenceTable'><tbody>
 <tr>
-<th class='confluenceTh'> <b>Option</b> </th>
-<th class='confluenceTh'> <b>Description</b> </th>
+<th class='confluenceTh'> Option </th>
+<th class='confluenceTh'> Description </th>
 </tr>
 <tr>
 <td class='confluenceTd'> <b>Hive Settings</b> </td>
-<td class='confluenceTd'> Use <b>Hive Settings</b> to override Hive and Hadoop default settings. For <b>Key</b>, enter a Hive or Hadoop configuration variable name. For <b>Value</b>, enter the value you want to use for the variable. 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> 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>
+<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" />
+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" />
+<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" />
-From the <b>Type</b> drop-down menu, choose one of the following: 
+<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" />
 <br class="atl-forced-newline" />
+<b>archive</b> &#8212; Automatically unarchives resources when distributing them. <br class="atl-forced-newline" />
 <br class="atl-forced-newline" />
-<b>JAR</b> — 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" />
-<br class="atl-forced-newline" />
-<b>ARCHIVE</b> — Automatically unarchives resources when distributing them.  
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-<b>FILE</b> — Adds resources to the distributed cache. Typically, this might be a transform script (or similar) to be executed.  
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-For <b>Path</b>, enter the path to the file. You can also click <b>Choose File</b> to browse and select the file.  
+<b>file</b> &#8212; Adds resources to the distributed cache. Typically, this might be a transform script (or similar) to be executed. <br class="atl-forced-newline" />
 <br class="atl-forced-newline" />
+For <b>Path</b>, enter the path to the file. You can also click <b>Choose a File</b> to browse and select the file. <br class="atl-forced-newline" />
 <br class="atl-forced-newline" />
 <b>Note</b>: It is not necessary to specify files used in a transform script if the files are available in the same path on all machines in the Hadoop cluster. </td>
 </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>. 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>
+<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" />
+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>
 <td class='confluenceTd'> <b>Parameterization</b> </td>
-<td class='confluenceTd'> If you want to display a dialog box for you or other users to enter parameter values when a query is executed, select <b>Parameterization</b>. </td>
+<td class='confluenceTd'> To display a dialog box for you or other users to enter parameter values when a query is executed, check <b>Parameterization</b>. This is enabled by default. </td>
 </tr>
 <tr>
 <td class='confluenceTd'> <b>Email Notification</b> </td>
-<td class='confluenceTd'> If you want to receive an email message after a query completes, select <b>Email Notification</b>. </td>
+<td class='confluenceTd'> To receive an email message after a query completes, check <b>Email Notification</b>. </td>
 </tr>
 </tbody></table>
 </div>
 
-<p><br class="atl-forced-newline" /></p></li>
-	<li>Click the red Close icon <span class="image-wrap" style=""><img src="/beeswax/static/help/images/6259205.jpg" height="16" width="16" style="border: 0px solid black"/></span> to close a group, and click all of the Close icons to close the <b>Advanced</b> panel.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>If you want to save your query and advanced settings to use them 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>
-	<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>
-	<li>To run the query, click <b>Execute</b>.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-The <b>Beeswax: Hive Query</b> window appears with the results of your query. 
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-<span class="image-wrap" style=""><img src="/beeswax/static/help/images/6259204.jpg" height="411" width="712" style="border: 0px solid black"/></span>
-<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 XLS</b> to download the results in a Microsoft Office Excel worksheet file.</li>
-		<li>Click <b>Download CSV</b> to download the results in a comma-separated values file suitable for use in other applications.</li>
-		<li>Click <b>Save.</b> To save the results in a new table, select <b>In a new table</b>, enter a name, and then click <b>Save</b>. To save the results in an HDFS file, select <b>In an HDFS directory</b>, enter a path or <b>Choose File</b> and browse to the directory, and then click <b>Save</b>.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	</ul>
-	</li>
-	<li>To view a log of the query execution, click <b>Log</b>. You can use the information in this tab to debug your query.
-<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>
-	<li>To return to the query in the <b>Query Editor,</b> click <b>Unsaved Query</b> or the name of your saved query in the blue box at the top of the panel on the left side of the Beeswax window.</li>
-</ol>
-
+<p><br class="atl-forced-newline" /></p>
 
 <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. </p>
+<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>
 
 <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" />
-Beeswax displays a list of your unsaved and saved queries in the <b>Beeswax:Query History</b> window. 
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-<span class="image-wrap" style=""><img src="/beeswax/static/help/images/6259210.jpg" height="385" width="711" style="border: 0px solid black"/></span>
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>To display the queries for all users, click <b>everyone's</b>. To display your queries only, click <b>mine</b>.
-<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>auto actions</b>. To display user queries again, click <b>user queries</b>.</li>
+<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>
+	<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>
+	<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>
 
 
-
 <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" />
-<span class="image-wrap" style=""><img src="/beeswax/static/help/images/6259211.jpg" height="385" width="711" style="border: 0px solid black"/></span>
+<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" /></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" />
-Beeswax displays the <b>Beeswax:Queries</b> window. 
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>Right-click one of your queries and choose <b>Edit</b> from the context menu.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-<span class="image-wrap" style=""><img src="/beeswax/static/help/images/6259212.jpg" height="385" width="711" style="border: 0px solid black"/></span>
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-Beeswax displays the query in the <b>Beeswax:Query Editor</b> window. 
-<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>
+	<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" />
+Beeswax displays the query in the Beeswax <b>Query Editor</b> window.
+<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" /></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.</li>
 </ol>
 
 
-
 <p><b>To delete 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" />
-Beeswax displays the <b>Beeswax:Queries</b> window. 
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>Right-click any of the queries and choose <b>Delete</b> from the context menu.
-<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>
+	<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>
+	<li>Click <b>Yes</b> to confirm the deletion.
 <br class="atl-forced-newline" /></li>
-	<li>Click <b>OK</b> to confirm the deletion.</li>
 </ol>
 
 
-
 <p><b>To copy 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" />
-Beeswax displays the <b>Beeswax:Queries</b> window. 
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>Right-click on any of the queries and choose <b>Clone</b> from the context menu.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-Beeswax displays the query in the <b>Beeswax:Query Editor</b> window. 
-<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>
+	<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" />
+Beeswax displays the query in the Beeswax <b>Query Editor</b> window.
+<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" /></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.</li>
 </ol>
 
 
-
-<p><b>To copy a query in the Beeswax: Query History window:</b></p>
+<p><b>To copy a query in the Beeswax Query History window:</b></p>
 
 <ol>
 	<li>In the <b>Beeswax</b> window, click <b>History</b>.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-Beeswax displays the <b>Beeswax: 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" />
+Beeswax displays the Beeswax <b>Query History</b> window.
+<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" />
-Beeswax displays the queries for all users in the <b>Beeswax:Query History</b> window. 
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-<span class="image-wrap" style=""><img src="/beeswax/static/help/images/6259209.jpg" height="385" width="711" style="border: 0px solid black"/></span>
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
+<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>
 	<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" />
-Beeswax displays a copy of the query in the <b>Beeswax:Query Editor</b> window.
-<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.</li>
+<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>
+	<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>
 </ol>
 
 
-<h2><a name="Beeswax-WorkingwithTables"></a>Working with Tables</h2>
+<h1><a name="Beeswax-WorkingwithTables"></a>Working with Tables</h1>
 
 <p>When working with Hive tables, you can use Beeswax to:</p>
 <ul>
@@ -294,155 +295,160 @@ Beeswax displays a copy of the query in the <b>Beeswax:Query Editor</b> window.
 	<li>Browse tables (see <a href="#Beeswax-BrowsingTables">Browsing Tables</a>)</li>
 	<li>Import data into tables (see <a href="#Beeswax-ImportingDataintoTables">Importing Data into Tables</a>)</li>
 	<li>Drop tables (see <a href="#Beeswax-DroppingTables">Dropping Tables</a>)</li>
-	<li>View the location of a table (see <a href="#Beeswax-ViewingaTable%27sLocation">Viewing a Table's Location</a>)</li>
+	<li>View the location of a table (see <a href="#Beeswax-ViewingaTable%27sLocation">Viewing a Table's Location</a>)
+<br class="atl-forced-newline" /></li>
 </ul>
 
 
-<h3><a name="Beeswax-CreatingTables"></a><a name="Beeswax-CreatingTables"></a>Creating Tables</h3>
+<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>
+
+<p>There are two ways to create a table: from a file, or manually.</p>
 
-<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>
+<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><b>To create a table:</b></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. </p>
+
+<p><b>To create a table from a file&#58;</b></p>
 
 <ol>
 	<li>In the <b>Beeswax</b> window, click <b>Tables</b>.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-<span class="image-wrap" style=""><img src="/beeswax/static/help/images/6259215.jpg" height="411" width="713" style="border: 0px solid black"/></span>
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>In the <b>Beeswax: Table List</b> window, click <b>new table</b>.
-<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" />
-<span class="image-wrap" style=""><img src="/beeswax/static/help/images/6259216.jpg" height="411" width="713" style="border: 0px solid black"/></span>
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>Follow the instructions in the wizard to create the table. For information about an option in the wizard, place your mouse cursor on the help icon <span class="image-wrap" style=""><img src="/beeswax/static/help/images/6259217.jpg" height="16" width="16" style="border: 0px solid black"/></span> next to the option.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-After you click <b>Submit Query</b> at the end of the table creation wizard, a new query to create the table is displayed in the Query Editor window. 
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-<span class="image-wrap" style=""><img src="/beeswax/static/help/images/6259214.jpg" height="416" width="710" style="border: 0px solid black"/></span>
-<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>
+	<li>Follow the instructions in the wizard to create the table.
+<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.</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>
+	</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. </li>
+</ol>
+
+
+<p><b>To create a table manually:</b></p>
+
+<ol>
+	<li>In the <b>Beeswax</b> window, click <b>Tables</b>.
+<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" />
+The table creation wizard starts.
+<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" />
+The basic steps are:
+	<ul>
+		<li>Name your table.</li>
+		<li>Choose the record format.</li>
+		<li>Configure record serialization by specifying delimiters for columns, collections, and map keys.</li>
+		<li>Choose the file format.</li>
+		<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>
+	</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" />
+The new query is displayed in the Hive Query window.
+<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" />
-<br class="atl-forced-newline" />
-Beeswax displays the new table's metadata on the right side of the <b>Beeswax:Table Metadata</b> window. 
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-<span class="image-wrap" style=""><img src="/beeswax/static/help/images/6259213.jpg" height="416" width="709" style="border: 0px solid black"/></span></li>
+<br class="atl-forced-newline" /></li>
 </ol>
 
 
-<h3><a name="Beeswax-BrowsingTables"></a><a name="Beeswax-BrowsingTables"></a>Browsing Tables</h3>
+<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 <b>Beeswax:Table List</b> window, click <b>Tables</b>.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>Click the <b>Browse Data</b> link next to the table you want to browse.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-<span class="image-wrap" style=""><img src="/beeswax/static/help/images/6259218.jpg" height="416" width="710" style="border: 0px solid black"/></span>
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-Beeswax displays the table's data in the <b>Query Results</b> window. 
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-<span class="image-wrap" style=""><img src="/beeswax/static/help/images/6259219.jpg" width="710" style="border: 0px solid black"/></span></li>
+	<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" />
+Beeswax displays the table's data in the <b>Query Results</b> window.</li>
 </ol>
 
 
 <p><b>To browse the metadata in a table:</b></p>
 
 <ol>
-	<li>In the <b>Beeswax:Table List</b> window, click <b>Tables</b>.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>Double-click the table.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-Beeswax displays the table's metadata on the right side of the <b>Beeswax:Table Metadata</b> window. </li>
+	<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 table's metadata on the right side of the Beeswax <b>Table Metadata</b> window.</li>
 </ol>
 
 
-<h3><a name="Beeswax-ImportingDataintoTables"></a><a name="Beeswax-ImportingDataintoTables"></a>Importing Data into Tables</h3>
+<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>
+<p>When importing data, you can choose to append or overwrite the table's data with data from a file.</p>
 
 <p><b>To import data into a table:</b></p>
 
 <ol>
-	<li>In the <b>Beeswax:Table List</b> window, click <b>Tables</b>.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>Double-click the table.
-<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>Click <b>Import Data</b>.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>Select <b>Overwrite existing data</b> to replace the data in the selected table with the imported data.
-<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, or click <b>Choose File</b> to browse to the file.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
+	<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>
+	<li>From the Actions panel, click <b>Import Data</b>.
+<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>
+	<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>
 	<li>Click <b>Submit</b> to start importing the data.</li>
 </ol>
 
 
-<h3><a name="Beeswax-DroppingTables"></a><a name="Beeswax-DroppingTables"></a>Dropping Tables</h3>
+<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 <b>Beeswax:Table List</b> window, click <b>Tables</b>.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>Double-click the table.
-<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>Click <b>Drop Table</b>.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>Click <b>Ok</b> to confirm the deletion.</li>
+	<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 Beeswax <b>Table Metadata</b> window.
+<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>
+	<li>Click <b>Yes</b> to confirm the deletion.</li>
 </ol>
 
 
-<h3><a name="Beeswax-ViewingaTable%27sLocation"></a><a name="Beeswax-ViewingaTable%27sLocation"></a>Viewing a Table's Location</h3>
+<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 <b>Beeswax:Table List</b> window, click <b>Tables</b>.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>Double-click the table.
-<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>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 Beeswax <b>Table Metadata</b> window.
+<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>
 
 
-				    					    <br/>
-                        
+				    
+                    			    </td>
+		    </tr>
+	    </table>
+	    
+    </body>
+</html>
+

BIN
apps/filebrowser/src/filebrowser/static/help/images/6259464.jpg


BIN
apps/filebrowser/src/filebrowser/static/help/images/6259465.jpg


BIN
apps/filebrowser/src/filebrowser/static/help/images/6259466.jpg


BIN
apps/filebrowser/src/filebrowser/static/help/images/6259467.jpg


BIN
apps/filebrowser/src/filebrowser/static/help/images/6259468.jpg


BIN
apps/filebrowser/src/filebrowser/static/help/images/6259469.jpg


BIN
apps/filebrowser/src/filebrowser/static/help/images/6259470.jpg


BIN
apps/filebrowser/src/filebrowser/static/help/images/6259471.jpg


BIN
apps/filebrowser/src/filebrowser/static/help/images/6259472.jpg


BIN
apps/filebrowser/src/filebrowser/static/help/images/6259473.jpg


BIN
apps/filebrowser/src/filebrowser/static/help/images/6259474.jpg


BIN
apps/filebrowser/src/filebrowser/static/help/images/6259475.jpg


BIN
apps/filebrowser/src/filebrowser/static/help/images/6259559.jpg


BIN
apps/filebrowser/src/filebrowser/static/help/images/6259560.jpg


+ 57 - 103
apps/filebrowser/src/filebrowser/static/help/index.html

@@ -4,26 +4,26 @@
 
 <ul>
 	<li>Create directories, upload files, or rename, move, and delete files and directories. You can also change a file's or directory's owner, group, and permissions. See <a href="#FileBrowser-WorkingwithFilesandDirectories">Working with Files and Directories</a>.</li>
-	<li>Search for files, directories, owners, and groups (Cloudera Enterprise version only). See <a href="#FileBrowser-SearchingforFilesandDirectories">Searching for Files and Directories</a>.</li>
+	<li>Search for files, directories, owners, and groups. See <a href="#FileBrowser-SearchingforFilesandDirectories">Searching for Files and Directories</a>.</li>
 	<li>View and edit files as text or binary. You can also download the files you are viewing and editing to your local system. See <a href="#FileBrowser-Viewing%2CEditing%2CandDownloadingFiles">Viewing, Editing, and Downloading Files</a>.</li>
 </ul>
 
 
-<h2><a name="FileBrowser-Contents"></a>Contents</h2>
+
+
+<h3><a name="FileBrowser-Contents"></a>Contents</h3>
 
 <style type='text/css'>/*<![CDATA[*/
-div.rbtoc1286391724285 {margin-left: 1.5em;padding: 0px;}
-div.rbtoc1286391724285 ul {margin-left: 0px;padding-left: 20px;}
-div.rbtoc1286391724285 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1334104553982 {margin-left: 1.5em;padding: 0px;}
+div.rbtoc1334104553982 ul {margin-left: 0px;padding-left: 20px;}
+div.rbtoc1334104553982 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class='rbtoc1286391724285'>
+/*]]>*/</style><div class='rbtoc1334104553982'>
 <ul>
     <li><a href='#FileBrowser-IntroducingHueFileBrowser'>Introducing Hue File Browser</a></li>
     <li><a href='#FileBrowser-FileBrowserInstallationandConfiguration'> File Browser Installation and Configuration</a></li>
-    <li><a href='#FileBrowser-UsingFileBrowser'>Using File Browser</a></li>
-<ul>
-    <li><a href='#FileBrowser-StartingFileBrowser'> Starting File Browser</a></li>
-    <li><a href='#FileBrowser-WorkingwithFilesandDirectories'> Working with Files and Directories</a></li>
+    <li><a href='#FileBrowser-StartingFileBrowser'>Starting File Browser</a></li>
+    <li><a href='#FileBrowser-WorkingwithFilesandDirectories'>Working with Files and Directories</a></li>
 <ul>
     <li><a href='#FileBrowser-ChangingDirectories'>Changing Directories</a></li>
     <li><a href='#FileBrowser-CreatingDirectories'>Creating Directories</a></li>
@@ -32,42 +32,38 @@ div.rbtoc1286391724285 li {margin-left: 0px;padding-left: 0px;}
     <li><a href='#FileBrowser-Renaming%2CMoving%2CandDeletingFilesandDirectories'>Renaming, Moving, and Deleting Files and Directories</a></li>
     <li><a href='#FileBrowser-ChangingaFile%27sorDirectory%27sOwner%2CGroup%2CorPermissions'>Changing a File's or Directory's Owner, Group, or Permissions</a></li>
 </ul>
-    <li><a href='#FileBrowser-SearchingforFilesandDirectories%28ClouderaEnterpriseversiononly%29'> Searching for Files and Directories (Cloudera Enterprise version only)</a></li>
-    <li><a href='#FileBrowser-Viewing%2CEditing%2CandDownloadingFiles'> Viewing, Editing, and Downloading Files</a></li>
+    <li><a href='#FileBrowser-SearchingforFilesandDirectories'>Searching for Files and Directories</a></li>
+    <li><a href='#FileBrowser-Viewing%2CEditing%2CandDownloadingFiles'>Viewing, Editing, and Downloading Files</a></li>
 <ul>
     <li><a href='#FileBrowser-ViewingandEditingFiles'>Viewing and Editing Files</a></li>
     <li><a href='#FileBrowser-DownloadingFilesusingtheFileViewer'>Downloading Files using the File Viewer</a></li>
 </ul>
-</ul>
 </ul></div>
+<p><br class="atl-forced-newline" /></p>
 
 <h1><a name="FileBrowser-FileBrowserInstallationandConfiguration"></a><a name="FileBrowser-FileBrowserInstallationandConfiguration"></a>File Browser Installation and Configuration</h1>
 
-<p>File Browser is one of the applications that can be installed as part of Hue. For more information about installing Hue, see <a href="https://ccp.cloudera.com/display/CDHDOC/Hue+Installation">https://ccp.cloudera.com/display/CDHDOC/Hue+Installation</a>.</p>
-
-<h1><a name="FileBrowser-UsingFileBrowser"></a>Using File Browser</h1>
+<p>File Browser is one of the applications that can be installed as part of Hue. For more information about installing Hue, see <a href="https://ccp.cloudera.com/display/CDHDOC/Hue+Installation">Hue Installation</a>.</p>
 
-<p>This section describes how to start File Browser and use it to work with files and directories. </p>
+<p><a name="FileBrowser-StartingFileBrowser"></a></p>
+<h1><a name="FileBrowser-StartingFileBrowser"></a>Starting File Browser</h1>
 
-<h2><a name="FileBrowser-StartingFileBrowser"></a><a name="FileBrowser-StartingFileBrowser"></a>Starting File Browser</h2>
-
-<p>To start the File Browser application, click this icon <span class="image-wrap" style=""><img src="/filebrowser/static/help/images/6259473.jpg" height="27" width="27" style="border: 0px solid black"/></span> in the application bar at the bottom of the Hue web page. The <b>File Browser</b> window opens in the Hue web page.
+<p>To start the File Browser application, click the <b>File Browser</b> tab in the navigation bar at the top of the Hue browser page.  
 <br class="atl-forced-newline" />
-<br class="atl-forced-newline" /> <span class="image-wrap" style=""><img src="/filebrowser/static/help/images/6259472.jpg" height="372" width="714" style="border: 0px solid black"/></span></p>
-
-<h2><a name="FileBrowser-WorkingwithFilesandDirectories"></a><a name="FileBrowser-WorkingwithFilesandDirectories"></a>Working with Files and Directories</h2>
+<br class="atl-forced-newline" />
+<a name="FileBrowser-WorkingwithFilesandDirectories"></a></p>
+<h1><a name="FileBrowser-WorkingwithFilesandDirectories"></a>Working with Files and Directories</h1>
 
-<p>You can use File Browser to view the input and output files of your Map/Reduce jobs. Typically, you can save your output files in <tt>/tmp</tt> or in your home directory if your system administrator set one up for you. You must have the proper permissions to manipulate other user's files.</p>
+<p>You can use File Browser to view the input and output files of your MapReduce jobs. Typically, you can save your output files in <tt>/tmp</tt> or in your home directory if your system administrator set one up for you. You must have the proper permissions to manipulate other user's files.</p>
 
 <h3><a name="FileBrowser-ChangingDirectories"></a>Changing Directories</h3>
 
-<p>To change to the root directory, click this icon <span class="image-wrap" style=""><img src="/filebrowser/static/help/images/6259467.jpg" height="28" width="24" style="border: 0px solid black"/></span> in the upper left corner of the <b>File Browser</b> window.</p>
 
-<p>To change to a different directory, double-click the directory name or parent directory dots, or this icon <span class="image-wrap" style=""><img src="/filebrowser/static/help/images/6259466.jpg" height="17" width="19" style="border: 0px solid black"/></span> next to the directory name in the <b>File Browser</b> window.</p>
+<p>To change to a different directory, double-click the directory name or parent directory dots in the <b>File Browser</b> window.</p>
 
-<p>To change to your home directory, click <b>My Home</b> in the <b>File Browser</b> window.</p>
+<p>To change to your home directory, click <b>My Home</b> in the path field at the top of the <b>File Browser</b> window.</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><br />The <b>My Home</b> button is disabled if you do not have a home directory. Ask your system administrator to create a home directory for you.</td></tr></table></div>
+<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>Note: The <b>My Home</b> button is disabled if you do not have a home directory. Ask your system administrator to create a home directory for you.</td></tr></table></div>
 
 <h3><a name="FileBrowser-CreatingDirectories"></a>Creating Directories</h3>
 
@@ -76,10 +72,8 @@ div.rbtoc1286391724285 li {margin-left: 0px;padding-left: 0px;}
 <ol>
 	<li>In the File Browser window, click <b>New Directory</b>.
 <br class="atl-forced-newline" />
-<br class="atl-forced-newline" /> <span class="image-wrap" style=""><img src="/filebrowser/static/help/images/6259472.jpg" height="372" width="714" style="border: 0px solid black"/></span>
-<br class="atl-forced-newline" />
 <br class="atl-forced-newline" /></li>
-	<li>In the <b>Create Directory</b> dialog box, enter a directory name and then click <b>Ok</b>.
+	<li>In the <b>Create Directory</b> dialog box, enter a directory name and then click <b>Submit</b>.
 <br class="atl-forced-newline" /></li>
 </ol>
 
@@ -97,16 +91,15 @@ div.rbtoc1286391724285 li {margin-left: 0px;padding-left: 0px;}
 	<li>Click <b>Upload Files</b>.
 <br class="atl-forced-newline" />
 <br class="atl-forced-newline" /></li>
-	<li>Browse to and select the file(s) you want to upload, and then click <b>Open</b>.
+	<li>In the box that opens, click <b>Upload a File</b> to browse to and select the file(s) you want to upload, and then click <b>Open</b>.
 <br class="atl-forced-newline" />
 <br class="atl-forced-newline" />
 The file(s) are uploaded to the directory you selected.</li>
 </ol>
 
 
-<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>Important</b><br />To upload files, your browser must have Flash enabled. If your installation of HUE is using HTTPS, self-signed certificates often confuse Flash. You can avoid using Flash by clicking the <b>upload without flash</b> link in the <b>Uploading files</b> message box, or by adding <tt>/filebrowser/upload</tt> to the end of the URL for HUE in your browser to display the following page.
-
-<p><span class="image-wrap" style=""><img src="/filebrowser/static/help/images/6259464.jpg" height="307" width="503" style="border: 0px solid black"/></span></p></td></tr></table></div>
+<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>Important</b><br />To upload files, your browser must have Flash enabled. If your installation of Hue is using HTTPS, self-signed certificates often confuse Flash. You can avoid using Flash by clicking the <b>upload without flash</b> link in the <b>Uploading files</b> message box, or by adding <tt>/filebrowser/upload</tt> to the end of the URL for Hue in your browser to display the following page.<br/>
+<font color="red"><em>Is this still true?</em></font></td></tr></table></div>
 
 <h3><a name="FileBrowser-DownloadingFilesusingtheFileBrowser"></a>Downloading Files using the File Browser</h3>
 
@@ -116,7 +109,7 @@ The file(s) are uploaded to the directory you selected.</li>
 	<li>In the <b>File Browser</b> window, select the file you want to download.
 <br class="atl-forced-newline" />
 <br class="atl-forced-newline" /></li>
-	<li>Right-click and choose <b>Download File</b> from context menu.
+	<li>Choose <b>Download File</b> from From the Options menu.
 <br class="atl-forced-newline" />
 <br class="atl-forced-newline" /></li>
 	<li>Save or open the file on your local system.</li>
@@ -131,12 +124,10 @@ The file(s) are uploaded to the directory you selected.</li>
 	<li>In the <b>File Browser</b> window, select the file or directory you want to rename.
 <br class="atl-forced-newline" />
 <br class="atl-forced-newline" /></li>
-	<li>Right-click and choose <b>Rename</b> from context menu.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /> <span class="image-wrap" style=""><img src="/filebrowser/static/help/images/6259471.jpg" height="307" width="718" style="border: 0px solid black"/></span>
+	<li>Choose <b>Rename</b> from the Options menu.
 <br class="atl-forced-newline" />
 <br class="atl-forced-newline" /></li>
-	<li>Enter the new name and then click <b>Ok</b>.</li>
+	<li>Enter the new name and then click <b>Submit</b>.</li>
 </ol>
 
 
@@ -146,10 +137,10 @@ The file(s) are uploaded to the directory you selected.</li>
 	<li>In the <b>File Browser</b> window, select the file or directory you want to move.
 <br class="atl-forced-newline" />
 <br class="atl-forced-newline" /></li>
-	<li>Right-click and choose <b>Move</b> from context menu.
+	<li>Choose <b>Move</b> from the Options menu.
 <br class="atl-forced-newline" />
 <br class="atl-forced-newline" /></li>
-	<li>In the <b>Move</b> dialog box, browse to the directory where you want to move the file or directory, and then click <b>Ok</b>.</li>
+	<li>In the <b>Move</b> dialog box, enter the new path and file or directory name, and then click <b>Submit</b>. <font color="red"><em>is this really how it will work? old text: (browse to the directory where you want to move the file or directory)</em></font></li>
 </ol>
 
 
@@ -162,7 +153,8 @@ The file(s) are uploaded to the directory you selected.</li>
 	<li>In the <b>File Browser</b> window, select the file or directory you want to delete. If you select a directory, all of the files and subdirectories contained within that directory are also deleted.
 <br class="atl-forced-newline" />
 <br class="atl-forced-newline" /></li>
-	<li>Right-click and choose <b>Delete</b> from context menu.
+	<li>Choose <b>Delete</b> from the Options menu.<br/>
+You can delete recursively by choosing <b>Delete Recursively</b> from the Options menu.
 <br class="atl-forced-newline" />
 <br class="atl-forced-newline" /></li>
 	<li>Click <b>Ok</b> to confirm the deletion.</li>
@@ -171,7 +163,7 @@ The file(s) are uploaded to the directory you selected.</li>
 
 <h3><a name="FileBrowser-ChangingaFile%27sorDirectory%27sOwner%2CGroup%2CorPermissions"></a>Changing a File's or Directory's Owner, Group, or Permissions</h3>
 
-<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><br />Only the Hadoop superuser can change a file's or directory's owner, group, or permissions. The user who starts Hadoop is the Hadoop superuser. The Hadoop superuser account is not necessarily the same as a Hue superuser account. If you use User Manager to create a Hue user with the same user name and password as the Hadoop superuser, then that Hue user can change a file's or directory's owner, group, or permissions.</td></tr></table></div>
+<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><br />Only the Hadoop superuser can change a file's or directory's owner, group, or permissions. The user who starts Hadoop is the Hadoop superuser. The Hadoop superuser account is not necessarily the same as a Hue superuser account. If you create a Hue user (in User Admin) with the same user name and password as the Hadoop superuser, then that Hue user can change a file's or directory's owner, group, or permissions.</td></tr></table></div>
 
 <p><b>To change a file's or directory's owner or group:</b></p>
 
@@ -179,18 +171,16 @@ The file(s) are uploaded to the directory you selected.</li>
 	<li>In the <b>File Browser</b> window, select the file or directory whose owner or group you want to change.
 <br class="atl-forced-newline" />
 <br class="atl-forced-newline" /></li>
-	<li>Right-click and choose <b>Change Owner/Group</b> from context menu.
+	<li>Choose <b>Change Owner/Group</b> from the Options menu.
 <br class="atl-forced-newline" />
 <br class="atl-forced-newline" /></li>
 	<li>In the <b>Change Owner/Group</b> dialog box, choose the new user from the <b>User</b> drop-down menu.
 <br class="atl-forced-newline" />
-<br class="atl-forced-newline" /> <span class="image-wrap" style=""><img src="/filebrowser/static/help/images/6259474.jpg" height="176" width="510" style="border: 0px solid black"/></span>
-<br class="atl-forced-newline" />
 <br class="atl-forced-newline" /></li>
 	<li>Choose the new group from the <b>Group</b> drop-down menu.
 <br class="atl-forced-newline" />
 <br class="atl-forced-newline" /></li>
-	<li>Click <b>Ok</b> to make the changes.</li>
+	<li>Click <b>Submit</b> to make the changes.</li>
 </ol>
 
 
@@ -200,69 +190,33 @@ The file(s) are uploaded to the directory you selected.</li>
 	<li>In the <b>File Browser</b> window, select the file or directory whose permissions you want to change.
 <br class="atl-forced-newline" />
 <br class="atl-forced-newline" /></li>
-	<li>Right-click and choose <b>Change Permissions</b> from context menu.
+	<li>Choose <b>Change Permissions</b> from the Options menu.
 <br class="atl-forced-newline" />
 <br class="atl-forced-newline" /></li>
-	<li>In the <b>Change Permissions</b> dialog box, select the permissions you want to assign and then click <b>Ok</b>.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /> <span class="image-wrap" style=""><img src="/filebrowser/static/help/images/6259475.jpg" height="169" width="270" style="border: 0px solid black"/></span>
+	<li>In the <b>Change Permissions</b> dialog box, select the permissions you want to assign and then click <b>Submit</b>.
 <br class="atl-forced-newline" /></li>
 </ol>
 
 
-<h2><a name="FileBrowser-SearchingforFilesandDirectories%28ClouderaEnterpriseversiononly%29"></a><a name="FileBrowser-SearchingforFilesandDirectories"></a>Searching for Files and Directories (Cloudera Enterprise version only)</h2>
-
-<p>If you are using the Cloudera Enterprise version of File Browser, you can use it to perform searches for:</p>
-
-<ul>
-	<li>Files and directories by name</li>
-	<li>Groups by name</li>
-	<li>Files and directories owned by a user</li>
-</ul>
+<p><a name="FileBrowser-SearchingforFilesandDirectories"></a></p>
+<h1><a name="FileBrowser-SearchingforFilesandDirectories"></a>Searching for Files and Directories</h1>
 
+<p>You can search for files or directories by name using the <b>Filter</b> query search box:</p>
 
 <p><b>To search for files and directories by name:</b></p>
 
 <ol>
-	<li>Choose <b>filename</b> from the drop-down menu at the top of the <b>File Browser</b> window.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
 	<li>Enter the name of the file or directory in the query search box.
 <br class="atl-forced-newline" />
 <br class="atl-forced-newline" />
 File Browser lists the files or directories matching the search criteria.
 <br class="atl-forced-newline" />
-<br class="atl-forced-newline" /> <span class="image-wrap" style=""><img src="/filebrowser/static/help/images/6259468.jpg" height="120" width="718" style="border: 0px solid black"/></span></li>
-</ol>
-
-
-<p><b>To search for groups by name:</b></p>
-
-<ol>
-	<li>Choose <b>group</b> from the drop-down menu at the top of the <b>File Browser</b> window.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>Enter the name of the group in the query search box.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-File Browser lists the groups matching the search criteria.</li>
-</ol>
-
-
-<p><b>To search for files and directories owned by a user:</b></p>
-
-<ol>
-	<li>Choose <b>owner</b> from the drop-down menu at the top of the <b>File Browser</b> window.
-<br class="atl-forced-newline" />
 <br class="atl-forced-newline" /></li>
-	<li>Enter the user's name in the query search box.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-File Browser lists the files and directories owned by the specified user.</li>
 </ol>
 
 
-<h2><a name="FileBrowser-Viewing%2CEditing%2CandDownloadingFiles"></a><a name="FileBrowser-Viewing%2CEditing%2CandDownloadingFiles"></a>Viewing, Editing, and Downloading Files</h2>
+<p><a name="FileBrowser-Viewing%2CEditing%2CandDownloadingFiles"></a></p>
+<h1><a name="FileBrowser-Viewing%2CEditing%2CandDownloadingFiles"></a>Viewing, Editing, and Downloading Files</h1>
 
 <p>You can view and edit files as text or binary. You can also download files from the HDFS.</p>
 
@@ -271,14 +225,12 @@ File Browser lists the files and directories owned by the specified user.</li>
 <p><b>To view and edit files:</b></p>
 
 <ol>
-	<li>In the <b>File Browser</b> window, double-click the file you want to view, or right-click and choose <b>View File</b> from context menu.
+	<li>In the <b>File Browser</b> window, double-click the file you want to view, or choose <b>View File</b> from the Options menu.
 <br class="atl-forced-newline" />
 File Browser displays the first 4,096 bytes of the file in the <b>File Viewer</b> window.
 <br class="atl-forced-newline" />
-<br class="atl-forced-newline" /> <span class="image-wrap" style=""><img src="/filebrowser/static/help/images/6259469.jpg" height="274" width="584" style="border: 0px solid black"/></span>
-<br class="atl-forced-newline" />
 <br class="atl-forced-newline" /></li>
-	<li>If the file is larger than 4,096 bytes, click these icons <span class="image-wrap" style=""><img src="/filebrowser/static/help/images/6259465.jpg" height="19" width="35" style="border: 0px solid black"/></span> in the upper right corner of the <b>File Viewer</b> window to scroll through the file.
+	<li>If the file is larger than 4,096 bytes, you can use the Block navigation buttons (First Block, Previous Block, Next Block, Last Block) to scroll through the file block by block.  The <b>Viewing Bytes:</b> fields show the range of bytes you are currently viewing.
 <br class="atl-forced-newline" />
 <br class="atl-forced-newline" /></li>
 	<li>To switch the view from text to binary, click <b>View as Binary</b> to view a hexdump. To switch the view from binary to text, click <b>View as Text</b>.
@@ -287,13 +239,11 @@ File Browser displays the first 4,096 bytes of the file in the <b>File Viewer</b
 	<li>To view the file's location in the HDFS, click <b>View File Location</b>. File Browser displays the file's location in the <b>File Browser</b> window.
 <br class="atl-forced-newline" />
 <br class="atl-forced-newline" /></li>
-	<li>If you are viewing a text file, you can edit the contents by clicking <b>Edit File</b>.
+	<li>If you are viewing a text file, you can edit the contents by clicking <b>Edit File</b> in the left navigation panel.
 <br class="atl-forced-newline" />
 <br class="atl-forced-newline" />
 File Browser displays the contents of the file in the <b>File Editor</b> window.
 <br class="atl-forced-newline" />
-<br class="atl-forced-newline" /> <span class="image-wrap" style=""><img src="/filebrowser/static/help/images/6259470.jpg" height="308" width="577" style="border: 0px solid black"/></span>
-<br class="atl-forced-newline" />
 <br class="atl-forced-newline" /></li>
 	<li>Edit the file and then click <b>Save</b> or <b>Save As</b> to save the file.</li>
 </ol>
@@ -301,7 +251,7 @@ File Browser displays the contents of the file in the <b>File Editor</b> window.
 
 <h3><a name="FileBrowser-DownloadingFilesusingtheFileViewer"></a>Downloading Files using the File Viewer</h3>
 
-<p><b>To download files from using the File Viewer:</b></p>
+<p><b>To download files using the File Viewer:</b></p>
 
 <ol>
 	<li>In the <b>File Browser</b> window, double-click the file you want to download, or right-click and choose <b>View File</b> from context menu.
@@ -309,8 +259,6 @@ File Browser displays the contents of the file in the <b>File Editor</b> window.
 <br class="atl-forced-newline" /></li>
 	<li>Click <b>Download</b>.
 <br class="atl-forced-newline" />
-<br class="atl-forced-newline" /> <span class="image-wrap" style=""><img src="/filebrowser/static/help/images/6259469.jpg" height="252" width="537" style="border: 0px solid black"/></span>
-<br class="atl-forced-newline" />
 <br class="atl-forced-newline" /></li>
 	<li>Save or open the file on your local system.</li>
 </ol>
@@ -318,5 +266,11 @@ File Browser displays the contents of the file in the <b>File Editor</b> window.
 
 <p><br class="atl-forced-newline" /></p>
 
-				    					    <br/>
-                        
+				    
+                    			    </td>
+		    </tr>
+	    </table>
+	    
+    </body>
+</html>
+

+ 1 - 1
apps/help/src/help/urls.py

@@ -18,6 +18,6 @@
 from django.conf.urls.defaults import url, patterns
 
 urlpatterns = patterns('',
-  url(r'^$', 'help.views.view', { "app": "desktop", "path": "/index.md" }),
+  url(r'^$', 'help.views.view', { "app": "desktop", "path": "/index.html" }),
   url(r'^(?P<app>\w*)(?P<path>/.*)$', 'help.views.view', name='help.view'),
 )

BIN
apps/jobbrowser/static/help/images/6259455.jpg


BIN
apps/jobbrowser/static/help/images/6259456.jpg


BIN
apps/jobbrowser/static/help/images/6259457.jpg


BIN
apps/jobbrowser/static/help/images/6259458.jpg


BIN
apps/jobbrowser/static/help/images/6259459.jpg


BIN
apps/jobbrowser/static/help/images/6259460.jpg


BIN
apps/jobbrowser/static/help/images/6259461.jpg


BIN
apps/jobbrowser/static/help/images/6259462.jpg


BIN
apps/jobbrowser/static/help/images/6259463.jpg


BIN
apps/jobbrowser/static/help/images/6259568.jpg


BIN
apps/jobbrowser/static/help/images/6259569.jpg


BIN
apps/jobbrowser/static/help/images/6259570.jpg


+ 55 - 80
apps/jobbrowser/static/help/index.html

@@ -1,131 +1,106 @@
 <h1><a name="JobBrowser-IntroducingHueJobBrowser"></a>Introducing Hue Job Browser</h1>
 
-<p>The Hue Job Browser application enables you to examine the Hadoop Map/Reduce jobs running on your Hadoop cluster. Job Browser presents the job and tasks in layers. The top layer is a list of jobs, and you can double-click a job to view a list of that job's tasks. You can then view a task's attempts and the properties of each attempt, such as state, start and end time, and output size. To troubleshoot failed jobs, you can also view the logs of each attempt. For more information about Hadoop Map/Reduce, see the <a href="http://archive.cloudera.com/cdh/3/hadoop-0.20.2+320/mapred_tutorial.html">Hadoop Map/Reduce Tutorial</a>.</p>
+<p>The Hue Job Browser application enables you to examine the Hadoop MapReduce jobs running on your Hadoop cluster. Job Browser presents the job and tasks in layers. The top layer is a list of jobs, and you can double-click a job to view a list of that job's tasks. You can then view a task's attempts and the properties of each attempt, such as state, start and end time, and output size. To troubleshoot failed jobs, you can also view the logs of each attempt. For more information about Hadoop MapReduce, see the <a href="http://archive.cloudera.com/cdh/3/hadoop-0.20.2+320/mapred_tutorial.html">Hadoop MapReduce Tutorial (update this link)</a>.</p>
+
 
 <h2><a name="JobBrowser-Contents"></a>Contents</h2>
 
 <style type='text/css'>/*<![CDATA[*/
-div.rbtoc1286402793260 {margin-left: 1.5em;padding: 0px;}
-div.rbtoc1286402793260 ul {margin-left: 0px;padding-left: 20px;}
-div.rbtoc1286402793260 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1334188812026 {margin-left: 1.5em;padding: 0px;}
+div.rbtoc1334188812026 ul {margin-left: 0px;padding-left: 20px;}
+div.rbtoc1334188812026 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class='rbtoc1286402793260'>
+/*]]>*/</style><div class='rbtoc1334188812026'>
 <ul>
     <li><a href='#JobBrowser-IntroducingHueJobBrowser'>Introducing Hue Job Browser</a></li>
-    <li><a href='#JobBrowser-JobBrowserInstallationandConfiguration'> Job Browser Installation and Configuration</a></li>
-    <li><a href='#JobBrowser-UsingJobBrowser'>Using Job Browser</a></li>
-<ul>
-    <li><a href='#JobBrowser-StartingJobBrowser'> Starting Job Browser</a></li>
-    <li><a href='#JobBrowser-FilteringtheJobBrowserList'> Filtering the Job Browser List</a></li>
-    <li><a href='#JobBrowser-ViewingJobInformationandLogs'> Viewing Job Information and Logs</a></li>
-    <li><a href='#JobBrowser-ViewingJobOutput'> Viewing Job Output</a></li>
-</ul>
+    <li><a href='#JobBrowser-JobBrowserInstallationandConfiguration'>Job Browser Installation and Configuration</a></li>
+    <li><a href='#JobBrowser-StartingJobBrowser'>Starting Job Browser</a></li>
+    <li><a href='#JobBrowser-FilteringtheJobBrowserList'>Filtering the Job Browser List</a></li>
+    <li><a href='#JobBrowser-ViewingJobInformationandLogs'>Viewing Job Information and Logs</a></li>
+    <li><a href='#JobBrowser-ViewingJobOutput'>Viewing Job Output</a></li>
 </ul></div>
+<p><br class="atl-forced-newline" /></p>
 
-<h1><a name="JobBrowser-JobBrowserInstallationandConfiguration"></a><a name="JobBrowser-JobBrowserInstallationandConfiguration"></a>Job Browser Installation and Configuration</h1>
+<p><a name="JobBrowser-JobBrowserInstallationandConfiguration"></a></p>
+<h1><a name="JobBrowser-JobBrowserInstallationandConfiguration"></a>Job Browser Installation and Configuration</h1>
 
-<p>Job Browser is one of the applications that can be installed as part of Hue. For more information about installing Hue, see <a href="https://ccp.cloudera.com/display/CDHDOC/Hue+Installation">https://ccp.cloudera.com/display/CDHDOC/Hue+Installation</a>.</p>
+<p>Job Browser is one of the applications that is installed as part of Hue. For more information about installing Hue, see <a href="https://ccp.cloudera.com/display/CDHDOC/Hue+Installation">Hue Installation</a>.</p>
 
-<h1><a name="JobBrowser-UsingJobBrowser"></a>Using Job Browser</h1>
+<p><a name="JobBrowser-StartingJobBrowser"></a></p>
+<h1><a name="JobBrowser-StartingJobBrowser"></a>Starting Job Browser</h1>
 
-<p>The following sections describe how to start and use Job Browser. </p>
+<p>To start Job Browser, click the <b>Job Browser</b> tab in the navigation bar at the top of the Hue web page. </p>
 
-<h2><a name="JobBrowser-StartingJobBrowser"></a><a name="JobBrowser-StartingJobBrowser"></a>Starting Job Browser</h2>
+<p>If there are no jobs running, the <b>Welcome to the Job Browser</b> page opens, with links to the Job Designer and Beeswax. </p>
 
-<p>To start Job Browser, click this icon <span class="image-wrap" style=""><img src="/jobbrowser/static/help/images/6259463.jpg" height="27" width="34" style="border: 0px solid black"/></span> in the application bar at the bottom of the Hue web page. The <b>Job Browser List</b> window opens in the Hue web page.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-<span class="image-wrap" style=""><img src="/jobbrowser/static/help/images/6259462.jpg" height="276" width="718" style="border: 0px solid black"/></span></p>
+<p>If there are jobs running, then the <b>Job Browser List</b> window opens.
+<br class="atl-forced-newline" /></p>
 
-<h2><a name="JobBrowser-FilteringtheJobBrowserList"></a><a name="JobBrowser-FilteringtheJobBrowserList"></a>Filtering the Job Browser List</h2>
+<p><a name="JobBrowser-FilteringtheJobBrowserList"></a></p>
+<h1><a name="JobBrowser-FilteringtheJobBrowserList"></a>Filtering the Job Browser List</h1>
 
 <p><b>To filter the jobs displayed in the Job Browser list:</b></p>
 
 <ol>
 	<li>To filter the jobs by their state (such as <b>Running</b> or <b>Completed</b>), choose a state from the <b>Filter Jobs</b> menu.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
 	<li>To filter by a user who ran the jobs, enter the user's name in the <b>User Name Filter</b> query box.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
 	<li>To filter by job name, enter the name in the <b>Text Filter</b> query box.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-<span class="image-wrap" style=""><img src="/jobbrowser/static/help/images/6259460.jpg" height="129" width="718" style="border: 0px solid black"/></span>
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
 	<li>To clear the filters, choose <b>All States</b> from the <b>Filter Jobs</b> menu and delete any text in the <b>User Name Filter</b> and <b>Text Filter</b> query boxes.</li>
 </ol>
 
 
-<h2><a name="JobBrowser-ViewingJobInformationandLogs"></a><a name="JobBrowser-ViewingJobInformationandLogs"></a>Viewing Job Information and Logs</h2>
+<p><a name="JobBrowser-ViewingJobInformationandLogs"></a></p>
+<h1><a name="JobBrowser-ViewingJobInformationandLogs"></a>Viewing Job Information and Logs</h1>
 
-<p><b>To view job information and logs:</b></p>
+<p><b>To view job information and logs:</b>  <font color="red"><em>Looks like this has changed, don't see how to do it?</em></font></p>
 
 <ol>
-	<li>In the <b>Job Browser</b> window, double-click the job you want to view, or click this icon <span class="image-wrap" style=""><img src="/jobbrowser/static/help/images/6259461.jpg" height="20" width="20" style="border: 0px solid black"/></span> next to the job.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
+	<li>In the <b>Job Browser</b> window, double-click the job you want to view.
+<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
 The recent tasks associated with the job is displayed.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-<span class="image-wrap" style=""><img src="/jobbrowser/static/help/images/6259458.jpg" height="336" width="721" style="border: 0px solid black"/></span>
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>To view the attempts for a task, double-click the task or click this icon <span class="image-wrap" style=""><img src="/jobbrowser/static/help/images/6259461.jpg" height="20" width="20" style="border: 0px solid black"/></span> next to the task.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /> 
+<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+	<li>To view the attempts for a task, double-click the task.
+<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
 The attempts associated with the task are displayed.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-<span class="image-wrap" style=""><img src="/jobbrowser/static/help/images/6259457.jpg" height="227" width="843" style="border: 0px solid black"/></span>
-<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 information about a task attempt, click the <b>Metadata</b> tab.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
 The metadata associated with the attempt is displayed.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-<span class="image-wrap" style=""><img src="/jobbrowser/static/help/images/6259459.jpg" height="474" width="717" style="border: 0px solid black"/></span>
-<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 Hadoop counters for a task attempt, click the <b>Counters</b> tab.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
 The counters associated with the attempt is displayed.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-<span class="image-wrap" style=""><img src="/jobbrowser/static/help/images/6259456.jpg" height="251" width="708" style="border: 0px solid black"/></span>
-<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>Logs</b> tab.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
 The logs associated with the task attempt is displayed.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-<span class="image-wrap" style=""><img src="/jobbrowser/static/help/images/6259455.jpg" height="468" width="709" style="border: 0px solid black"/></span>
-<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+	<li>To return to the list of tasks for the current job, click the job number next to <b>Job</b> near the top of the window.
 <br class="atl-forced-newline" /></li>
-	<li>To return to the list of tasks for the current job, click the job number next to <b>Job</b> near the top of the window.</li>
 </ol>
 
 
-<h2><a name="JobBrowser-ViewingJobOutput"></a><a name="JobBrowser-ViewingJobOutput"></a>Viewing Job Output</h2>
+<p><a name="JobBrowser-ViewingJobOutput"></a></p>
+<h1><a name="JobBrowser-ViewingJobOutput"></a>Viewing Job Output</h1>
 
 <p><b>To view job output:</b></p>
 
 <ol>
-	<li>In the <b>Job Browser</b> window, double-click the job or click this icon <span class="image-wrap" style=""><img src="/jobbrowser/static/help/images/6259461.jpg" height="20" width="20" style="border: 0px solid black"/></span> next to the job.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
+	<li>In the <b>Job Browser</b> window, double-click the job.
+<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
 	<li>To view the output of the job, click the link next to <b>Output</b> at the top of the screen.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-<span class="image-wrap" style=""><img src="/jobbrowser/static/help/images/6259458.jpg" height="320" width="723" style="border: 0px solid black"/></span></li>
+<br class="atl-forced-newline" /></li>
 </ol>
 
 
-				    					    <br/>
-                        
+				    
+                    			    </td>
+		    </tr>
+	    </table>
+	    
+    </body>
+</html>
+

BIN
apps/jobsub/static/help/images/6259476.jpg


BIN
apps/jobsub/static/help/images/6259477.jpg


BIN
apps/jobsub/static/help/images/6259478.jpg


BIN
apps/jobsub/static/help/images/6259479.jpg


BIN
apps/jobsub/static/help/images/6259480.jpg


BIN
apps/jobsub/static/help/images/6259481.jpg


BIN
apps/jobsub/static/help/images/6259482.jpg


BIN
apps/jobsub/static/help/images/6259483.jpg


BIN
apps/jobsub/static/help/images/6259484.jpg


BIN
apps/jobsub/static/help/images/6259485.jpg


BIN
apps/jobsub/static/help/images/6259486.jpg


BIN
apps/jobsub/static/help/images/6259487.jpg


BIN
apps/jobsub/static/help/images/6259488.jpg


BIN
apps/jobsub/static/help/images/6259489.jpg


BIN
apps/jobsub/static/help/images/6259561.jpg


BIN
apps/jobsub/static/help/images/6259562.jpg


BIN
apps/jobsub/static/help/images/6259563.jpg


BIN
apps/jobsub/static/help/images/6259564.jpg


BIN
apps/jobsub/static/help/images/6259565.jpg


BIN
apps/jobsub/static/help/images/6259566.jpg


BIN
apps/jobsub/static/help/images/6259567.jpg


+ 227 - 170
apps/jobsub/static/help/index.html

@@ -1,79 +1,143 @@
 <h1><a name="JobDesigner-IntroducingHueJobDesigner"></a>Introducing Hue Job Designer</h1>
 
-<p>The Job Designer application enables you to create and submit Hadoop Map/Reduce jobs to the Hadoop cluster. You can include variables with your jobs to enable you and other users to enter values for the variables when they run your job. The Job Designer supports streaming and JAR jobs. For more information about Hadoop Map/Reduce, see the <a href="http://archive.cloudera.com/cdh/3/hadoop-0.20.2+320/mapred_tutorial.html">Hadoop Map/Reduce Tutorial</a>.</p>
+<p>The Job Designer application enables you to create and submit Hadoop Map/Reduce jobs to the Hadoop cluster. You can include variables with your jobs to enable you and other users to enter values for the variables when they run your job. The Job Designer supports streaming and JAR jobs. For more information about Hadoop Map/Reduce, see the <a href="http://archive.cloudera.com/cdh/3/hadoop-0.20.2+320/mapred_tutorial.html">Hadoop MapReduce Tutorial</a>. <font color="red"><em>update tutorial link</em></font></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> A job's input files must be uploaded to the cluster before you can submit the job.</td></tr></table></div>
 
-<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><br />A job's input files must be uploaded to the cluster before you can submit the job.</td></tr></table></div>
 
 <h2><a name="JobDesigner-Contents"></a>Contents</h2>
 
 <style type='text/css'>/*<![CDATA[*/
-div.rbtoc1286400014432 {margin-left: 1.5em;padding: 0px;}
-div.rbtoc1286400014432 ul {margin-left: 0px;padding-left: 20px;}
-div.rbtoc1286400014432 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1334175427865 {margin-left: 1.5em;padding: 0px;}
+div.rbtoc1334175427865 ul {margin-left: 0px;padding-left: 20px;}
+div.rbtoc1334175427865 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class='rbtoc1286400014432'>
+/*]]>*/</style><div class='rbtoc1334175427865'>
 <ul>
     <li><a href='#JobDesigner-IntroducingHueJobDesigner'>Introducing Hue Job Designer</a></li>
-    <li><a href='#JobDesigner-JobDesignerInstallationandConfiguration'> Job Designer Installation and Configuration</a></li>
-    <li><a href='#JobDesigner-UsingJobDesigner'>Using Job Designer</a></li>
+    <li><a href='#JobDesigner-JobDesignerInstallationandConfiguration'>Job Designer Installation and Configuration</a></li>
+    <li><a href='#JobDesigner-StartingJobDesigner'>Starting Job Designer</a></li>
+    <li><a href='#JobDesigner-InstallingtheJobDesignerSamples'>Installing the Job Designer Samples</a></li>
+    <li><a href='#JobDesigner-WorkingwithJobDesigns'>Working with Job Designs</a></li>
+<ul>
+<ul>
+    <li><a href='#JobDesigner-CreatingaMapReduceJobDesign'>Creating a MapReduce Job Design</a></li>
+    <li><a href='#JobDesigner-CreatingaStreamingJobDesign'>Creating a Streaming Job Design</a></li>
+    <li><a href='#JobDesigner-CreatingaJavaJobDesign'>Creating a Java Job Design</a></li>
+</ul>
+</ul>
+    <li><a href='#JobDesigner-SubmittingaJobtoaCluster'>Submitting a Job to a Cluster</a></li>
 <ul>
-    <li><a href='#JobDesigner-StartingJobDesigner'> Starting Job Designer</a></li>
-    <li><a href='#JobDesigner-InstallingtheJobDesignerSamples'> Installing the Job Designer Samples</a></li>
-    <li><a href='#JobDesigner-WorkingwithJobDesigns'> Working with Job Designs</a></li>
 <ul>
-    <li><a href='#JobDesigner-CreatingaStreamingJobDesign'> Creating a Streaming Job Design</a></li>
-    <li><a href='#JobDesigner-CreatingaJARJobDesign'> Creating a JAR Job Design</a></li>
-    <li><a href='#JobDesigner-SubmittingaJobtoaCluster'> Submitting a Job to a Cluster</a></li>
-    <li><a href='#JobDesigner-Copying%2CEditing%2CandDeletingaJobDesign'> Copying, Editing, and Deleting a Job Design</a></li>
-    <li><a href='#JobDesigner-FilteringtheJobDesignList'> Filtering the Job Design List</a></li>
+    <li><a href='#JobDesigner-Copying%2CEditing%2CandDeletingaJobDesign'>Copying, Editing, and Deleting a Job Design</a></li>
+    <li><a href='#JobDesigner-FilteringtheJobDesigns'>Filtering the Job Designs</a></li>
 </ul>
-    <li><a href='#JobDesigner-DisplayingJobResults'> Displaying Job Results</a></li>
 </ul>
+    <li><a href='#JobDesigner-DisplayingJobResults'>Displaying Job Results</a></li>
 </ul></div>
+<p><br class="atl-forced-newline" /></p>
 
-<h1><a name="JobDesigner-JobDesignerInstallationandConfiguration"></a><a name="JobDesigner-JobDesignerInstallationandConfiguration"></a>Job Designer Installation and Configuration</h1>
+<p><a name="JobDesigner-JobDesignerInstallationandConfiguration"></a></p>
+<h1><a name="JobDesigner-JobDesignerInstallationandConfiguration"></a>Job Designer Installation and Configuration</h1>
 
-<p>Job Designer is one of the applications that can be installed as part of Hue. For more information about installing Hue, see <a href="https://ccp.cloudera.com/display/CDHDOC/Hue+Installation">https://ccp.cloudera.com/display/CDHDOC/Hue+Installation</a>.</p>
+<p>Job Designer is one of the applications that is installed as part of Hue. For more information about installing Hue, see <a href="https://ccp.cloudera.com/display/CDHDOC/Hue+Installation">Hue Installation</a>.</p>
 
-<h1><a name="JobDesigner-UsingJobDesigner"></a>Using Job Designer </h1>
+<p><a name="JobDesigner-StartingJobDesigner"></a></p>
+<h1><a name="JobDesigner-StartingJobDesigner"></a>Starting Job Designer</h1>
 
-<p>The following sections describe how to start and use Job Designer. </p>
+<p>To start Job Designer, click the <b>Job Designer</b> tab 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>
 
-<h2><a name="JobDesigner-StartingJobDesigner"></a><a name="JobDesigner-StartingJobDesigner"></a>Starting Job Designer</h2>
+<p><a name="JobDesigner-InstallingtheJobDesignerSamples"></a></p>
+<h1><a name="JobDesigner-InstallingtheJobDesignerSamples"></a>Installing the Job Designer Samples</h1>
 
-<p>To start Job Designer, click this icon <span class="image-wrap" style=""><img src="/jobsub/static/help/images/6259489.jpg" height="27" width="27" style="border: 0px solid black"/></span> in the application bar at the bottom of the Hue web page. The <b>Job Design List</b> window opens in the Hue web page.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /> <span class="image-wrap" style=""><img src="/jobsub/static/help/images/6259488.jpg" height="302" width="711" style="border: 0px solid black"/></span></p>
+<p>The Job Designer sample jobs can help you learn how to use Job Designer. </p>
 
-<h2><a name="JobDesigner-InstallingtheJobDesignerSamples"></a><a name="JobDesigner-InstallingtheJobDesignerSamples"></a>Installing the Job Designer Samples</h2>
+<p>To install the Job Designer samples, click <b>Install Samples</b> in the <b>Job Designs</b> window and then click <b>Ok</b>. The sample jobs are displayed in the <b>Job Designs</b> window. Job Designer removes the <b>Install Samples</b> button after the samples are installed so you can only install the samples once. <font color="red"><em>has this changed?</em></font>
+<br class="atl-forced-newline" /></p>
 
-<p>The Job Designer sample jobs can help you learn how to use Job Designer. To install the Job Designer samples, click <b>Install Samples</b> in the <b>Job Design List</b> window and then click <b>Ok</b>. The sample jobs are displayed in the <b>Job Design List</b> window. Job Designer removes the <b>Install Samples</b> button after the samples are installed so you can only install the samples once.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /> <span class="image-wrap" style=""><img src="/jobsub/static/help/images/6259487.jpg" height="302" width="711" style="border: 0px solid black"/></span></p>
+<p><a name="JobDesigner-WorkingwithJobDesigns"></a></p>
+<h1><a name="JobDesigner-WorkingwithJobDesigns"></a>Working with Job Designs</h1>
 
-<h2><a name="JobDesigner-WorkingwithJobDesigns"></a><a name="JobDesigner-WorkingwithJobDesigns"></a>Working with Job Designs</h2>
+<p>In the Job Designer, a job design specifies several meta-level properties of a MapReduce job, including the job design name, description, the MapReduce executable scripts or classes, and any parameters for those scripts or classes. You can create three types of job designs: a <a href="#JobDesigner-CreatingaMapreducedesign">MapReduce Job</a>, a <a href="#JobDesigner-CreatingaStreamingJobDesign">streaming job</a> and a <a href="#JobDesigner-CreatingaJavaJobDesign">Java job design</a>.</p>
 
-<p>In the Job Designer, a job design specifies several meta-level properties of a Map/Reduce job, including the job design name, description, the Map/Reduce executable scripts or classes, and any parameters for those scripts or classes. You can create two types of job designs: a <a href="#JobDesigner-CreatingaStreamingJobDesign">streaming job design</a> and a <a href="#JobDesigner-CreatingaJARJobDesign">JAR job design</a>.</p>
+<p><a name="JobDesigner-CreatingaMapreducedesign"></a></p>
+<h3><a name="JobDesigner-CreatingaMapReduceJobDesign"></a>Creating a MapReduce Job Design</h3>
 
-<h3><a name="JobDesigner-CreatingaStreamingJobDesign"></a><a name="JobDesigner-CreatingaStreamingJobDesign"></a>Creating a Streaming Job Design</h3>
+<p>A Hadoop JAR consists of MapReduce functions written in Java.<br/>
+<font color="red"><em>how is this different from a Java job?</em></font></p>
 
-<p>Hadoop streaming jobs enable you to create Map/Reduce functions in any non-Java language that reads standard Unix input and writes standard Unix output. For more information about Hadoop streaming jobs, see <a href="http://archive.cloudera.com/cdh/3/hadoop-0.20.2+320/streaming.html">http://archive.cloudera.com/cdh/3/hadoop-0.20.2+320/streaming.html</a></p>
+<p><b>To create a MapReduce job design:</b></p>
+
+<ol>
+	<li>In the <b>Job Designs</b> window, click <b>Create MapReduce Design</b>.
+<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
+The <b>Job Design (mapreduce type)</b> window opens where you can specify information about the MapReduce job.
+<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+	<li>In the <b>Job Design (mapreduce type)</b> window, specify the following information.
+<br class="atl-forced-newline" /> <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> You can use variables of the form <tt>$variable_name</tt> for the <b>Arguments</b> setting described in the following table. When the MapReduce job is run, a dialog box will appear to enable you or users to specify the values of the variables. <font color="red"><em>no longer supported?</em></font></td></tr></table></div>
+<p><br class="atl-forced-newline" /></p>
+<div class='table-wrap'>
+<table class='confluenceTable'><tbody>
+<tr>
+<th class='confluenceTh'> <b>Setting</b> </th>
+<th class='confluenceTh'> <b>Description</b> </th>
+</tr>
+<tr>
+<td class='confluenceTd'> <b>Name</b> </td>
+<td class='confluenceTd'> The <b>Name</b> identifies the MapReduce job and it's collection of parameters. </td>
+</tr>
+<tr>
+<td class='confluenceTd'> <b>Description</b> </td>
+<td class='confluenceTd'> Specify a description of the MapReduce job. The description is displayed in the dialog box that appears if you specify variables for the job. </td>
+</tr>
+<tr>
+<td class='confluenceTd'> <b>Jar path</b> </td>
+<td class='confluenceTd'> Specify the name of the JAR file, including the path. </td>
+</tr>
+<tr>
+<td class='confluenceTd'> <b>Job Properties</b> </td>
+<td class='confluenceTd'> Click <b>Add Property</b>, to set a property value: <br/>
+&diams;&nbsp;&nbsp; For <b>Property name</b>, enter a configuration variable name. <br/>
+&diams;&nbsp;&nbsp; For <b>Value</b>, enter the value you want to use for the variable.  </td>
+</tr>
+<tr>
+<td class='confluenceTd'> <b>Files</b> </td>
+<td class='confluenceTd'> Click <b>Add File</b>, then enter a file name <font color="red"><em>what files?</em></font>  </td>
+</tr>
+<tr>
+<td class='confluenceTd'> <b>Archives</b> </td>
+<td class='confluenceTd'> Click <b>Add Archive</b>, then enter an archive name <font color="red"><em>what is this?</em></font>   </td>
+</tr>
+</tbody></table>
+</div>
+
+<p><br class="atl-forced-newline" /></p></li>
+</ol>
 
-<p><b>To create a streaming job design:</b></p>
 
 <ol>
-	<li>In the <b>Job Design List</b> window, click <b>Streaming</b>.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-The <b>Job Design Editor:Streaming Job</b> window opens to enable you to specify information about the streaming job.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /> <span class="image-wrap" style=""><img src="/jobsub/static/help/images/6259486.jpg" height="363" width="720" style="border: 0px solid black"/></span>
-<br class="atl-forced-newline" />
+	<li>Click <b>Save</b> to save the job settings.
 <br class="atl-forced-newline" /></li>
-	<li>In the <b>Job Design Editor:Streaming Job</b> window, specify the following information.
-<br class="atl-forced-newline" />
-<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><br />You can use variables of the form <tt>$variable_name</tt> for the <b>Input</b>, <b>Output</b>, <b>Mapper Cmd</b>, and <b>Reducer Cmd</b> settings described in the following table. When the streaming job is run, a dialog box will appear to enable you or users to specify the values of the variables.</td></tr></table></div>
+</ol>
+
+
+<p><a name="JobDesigner-CreatingaStreamingJobDesign"></a></p>
+<h3><a name="JobDesigner-CreatingaStreamingJobDesign"></a>Creating a Streaming Job Design</h3>
+
+<p>Hadoop streaming jobs enable you to create MapReduce functions in any non-Java language that reads standard Unix input and writes standard Unix output. For more information about Hadoop streaming jobs, see <a href="http://archive.cloudera.com/cdh/3/hadoop-0.20.2+320/streaming.html">needs updated link to info</a>.</p>
+
+<p><b>To create a streaming job design:</b></p>
+
+<ol>
+	<li>In the <b>Job Designs</b> window, click <b>Create Streaming Design</b>.
+<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
+The <b>Job Design (streaming type)</b> window opens to enable you to specify information about the streaming job.
+<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+	<li>In the <b>Job Design (streaming type)</b> window, specify the following information.
+<br class="atl-forced-newline" /> <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> You can use variables of the form <tt>$variable_name</tt> for the <b>Mapper</b>, and <b>Reducer</b> settings described in the following table. When the streaming job is run, a dialog box will appear to enable you or users to specify the values of the variables.</td></tr></table></div>
 <p><br class="atl-forced-newline" /></p>
 <div class='table-wrap'>
 <table class='confluenceTable'><tbody>
@@ -90,69 +154,61 @@ The <b>Job Design Editor:Streaming Job</b> window opens to enable you to specify
 <td class='confluenceTd'> Specify a description of the streaming job design. The description is displayed in the dialog box that appears if you specify variables for the job. </td>
 </tr>
 <tr>
-<td class='confluenceTd'> <b>Input</b> </td>
-<td class='confluenceTd'> Specify the path to the file or directory you want to use as the input data for the streaming job. If you specify a directory, all files in that directory are used for input. Equivalent to the Hadoop <tt>-input</tt> option. </td>
-</tr>
-<tr>
-<td class='confluenceTd'> <b>Output</b> </td>
-<td class='confluenceTd'> Specify the path to the directory where you want to save the output of the streaming job. The directory cannot exist before you run the job or else the job will not run. (This requirement is a precaution to prevent overwriting data from other jobs.) Equivalent to the Hadoop <tt>-output</tt> option. </td>
+<td class='confluenceTd'> <b>Mapper</b> </td>
+<td class='confluenceTd'> Specify the path to the mapper script or class. If the mapper file is not on the machines on the cluster, use the <b>Files</b> option to pack it as a part of job submission. Equivalent to the Hadoop <tt>-mapper</tt> option. </td>
 </tr>
 <tr>
-<td class='confluenceTd'> <b>Mapper Cmd</b> </td>
-<td class='confluenceTd'> Specify the path to the mapper script or class. If the mapper file is not on the machines on the cluster, use the <b>Required Files</b> option to pack it as a part of job submission. Equivalent to the Hadoop <tt>-mapper</tt> option. </td>
+<td class='confluenceTd'> <b>Reducer</b> </td>
+<td class='confluenceTd'> Specify the path to the reducer script or class. If the reducer file is not on the machines on the cluster, use the <b>Files</b> option to pack it as a part of job submission. Equivalent to the Hadoop <tt>-reducer</tt> option. </td>
 </tr>
 <tr>
-<td class='confluenceTd'> <b>Reducer Cmd</b> </td>
-<td class='confluenceTd'> Specify the path to the reducer script or class. If the reducer file is not on the machines on the cluster, use the <b>Required Files</b> option to pack it as a part of job submission. Equivalent to the Hadoop <tt>-reducer</tt> option. </td>
+<td class='confluenceTd'> <b>Job Properties</b> </td>
+<td class='confluenceTd'> Click <b>Add Property</b>, to set a property value: <br/>
+&ordm;&nbsp;&nbsp; For <b>Property name</b>, enter a configuration variable name. <br/>
+&ordm;&nbsp;&nbsp; For <b>Value</b>, enter the value you want to use for the variable.  </td>
 </tr>
 <tr>
-<td class='confluenceTd'> <b>Num Reduce Tasks</b> </td>
-<td class='confluenceTd'> Specify the number of reduce tasks you want to use. Specify zero if you do not want to run any reducer tasks. If you don't specify a value for this setting, the default specified in your cluster configuration takes effect. The optimal number of reduce tasks is the product of the following values: <br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-&#45;&#45; a factor of 0.95 or 1.75 <br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-multiplied by: <br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-&#45;&#45; <em>the number of nodes in your cluster</em> multiplied by the <tt>mapred.tasktracker.reduce.tasks.maximum</tt> property <br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-If your reduce tasks are not very big, use a factor of 0.95 to use fewer reduce tasks than the number of nodes in your cluster. This factor allows for a small number of failed reduce tasks without increasing the time required for running the jobs. <br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-If your reduce tasks are very big, use a factor of 1.75 to use more reduce tasks than the number of nodes in your cluster. This factor allows for better load balancing and failed reduce tasks do not significantly increase the time required for running the jobs. </td>
+<td class='confluenceTd'> <b>Files</b> </td>
+<td class='confluenceTd'> Click <b>Add File</b>, then enter a file name <font color="red"><em>what files?</em></font>  </td>
 </tr>
 <tr>
-<td class='confluenceTd'> <b>Required Files</b> </td>
-<td class='confluenceTd'> Specify the executable files that do not exist on the machines in the cluster to pack your executable files as a part of job submission. </td>
+<td class='confluenceTd'> <b>Archives</b> </td>
+<td class='confluenceTd'> Click <b>Add Archive</b>, then enter an archive name <font color="red"><em>what is this?</em></font>   </td>
 </tr>
 </tbody></table>
 </div>
 
 <p><br class="atl-forced-newline" /></p></li>
-	<li>Select <b>Submit upon save</b> to submit the job to the cluster immediately after you click <b>Save</b>.
-<br class="atl-forced-newline" />
+</ol>
+
+
+<p><br class="atl-forced-newline" /></p>
+
+<ol>
+	<li>Click <b>Save</b> to save the job settings.
 <br class="atl-forced-newline" /></li>
-	<li>Click <b>Save</b> to save the job settings.</li>
 </ol>
 
 
-<h3><a name="JobDesigner-CreatingaJARJobDesign"></a><a name="JobDesigner-CreatingaJARJobDesign"></a>Creating a JAR Job Design</h3>
+<p><a name="JobDesigner-CreatingaJavaJobDesign"></a></p>
+<h3><a name="JobDesigner-CreatingaJavaJobDesign"></a>Creating a Java Job Design</h3>
 
-<p>A Hadoop JAR consists of Map/Reduce functions written in Java.</p>
+<p>A Hadoop JAR consists of MapReduce functions written in Java.<br/>
+<font color="red"><em>how is this different from a MapReduce job?</em></font></p>
 
-<p><b>To create a JAR job design:</b></p>
+<p><b>To create a Java job design:</b></p>
 
 <ol>
-	<li>In the <b>Job Design List</b> window, click <b>Jar</b>.
-<br class="atl-forced-newline" />
+	<li>In the <b>Job Designs</b> window, click <b>Create Java Design</b>.
 <br class="atl-forced-newline" />
-The <b>Job Design Editor:Jar Job</b> window opens where you can specify information about the JAR job.
 <br class="atl-forced-newline" />
-<br class="atl-forced-newline" /> <span class="image-wrap" style=""><img src="/jobsub/static/help/images/6259485.jpg" height="363" width="720" style="border: 0px solid black"/></span>
+The <b>Job Design (java type)</b> window opens where you can specify information about the JAR job.
 <br class="atl-forced-newline" />
 <br class="atl-forced-newline" /></li>
-	<li>In the <b>Job Design Editor:Jar Job</b> window, specify the following information.
+	<li>In the <b>Job Design (java type)</b> window, specify the following information.
 <br class="atl-forced-newline" />
 <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><br />You can use variables of the form <tt>$variable_name</tt> for the <b>Arguments</b> setting described in the following table. When the JAR job is run, a dialog box will appear to enable you or users to specify the values of the variables.</td></tr></table></div>
+<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> You can use variables of the form <tt>$variable_name</tt> for the <b>Args</b> setting described in the following table. When the JAR job is run, a dialog box will appear to enable you or users to specify the values of the variables.</td></tr></table></div>
 <p><br class="atl-forced-newline" /></p>
 <div class='table-wrap'>
 <table class='confluenceTable'><tbody>
@@ -162,83 +218,94 @@ The <b>Job Design Editor:Jar Job</b> window opens where you can specify informat
 </tr>
 <tr>
 <td class='confluenceTd'> <b>Name</b> </td>
-<td class='confluenceTd'> The <b>Name</b> identifies the JAR job and it's collection of parameters. </td>
+<td class='confluenceTd'> The <b>Name</b> identifies the Java job and it's collection of parameters. </td>
 </tr>
 <tr>
 <td class='confluenceTd'> <b>Description</b> </td>
-<td class='confluenceTd'> Specify a description of the JAR job. The description is displayed in the dialog box that appears if you specify variables for the job. </td>
+<td class='confluenceTd'> Specify a description of the java job. The description is displayed in the dialog box that appears if you specify variables for the job. </td>
 </tr>
 <tr>
-<td class='confluenceTd'> <b>Jarfile</b> </td>
+<td class='confluenceTd'> <b>Jar path</b> </td>
 <td class='confluenceTd'> Specify the name of the JAR file, including the path. </td>
 </tr>
 <tr>
-<td class='confluenceTd'> <b>Arguments</b> </td>
+<td class='confluenceTd'> <b>Main class</b> </td>
+<td class='confluenceTd'> Specify the (name of?) the Main class to invoke the program. </td>
+</tr>
+<tr>
+<td class='confluenceTd'> <b>Args</b> </td>
 <td class='confluenceTd'> Specify the arguments you want to pass to the running JAR job. </td>
 </tr>
+<tr>
+<td class='confluenceTd'> <b>Java opts</b> </td>
+<td class='confluenceTd'> Specify any Java options you want to specify as part of the job. </td>
+</tr>
+<tr>
+<td class='confluenceTd'> <b>Job Properties</b> </td>
+<td class='confluenceTd'> Click <b>Add Property</b>, to set a property value: <br/>
+&raquo;&nbsp;&nbsp; For <b>Property name</b>, enter a configuration variable name. <br/>
+&raquo;&nbsp;&nbsp; For <b>Value</b>, enter the value you want to use for the variable.  </td>
+</tr>
+<tr>
+<td class='confluenceTd'> <b>Files</b> </td>
+<td class='confluenceTd'> Click <b>Add File</b>, then enter a file name <font color="red"><em>what files?</em></font>  </td>
+</tr>
+<tr>
+<td class='confluenceTd'> <b>Archives</b> </td>
+<td class='confluenceTd'> Click <b>Add Archive</b>, then enter an archive name <font color="red"><em>what is this?</em></font>   </td>
+</tr>
 </tbody></table>
 </div>
 
 <p><br class="atl-forced-newline" /></p></li>
-	<li>Select <b>Submit upon save</b> to submit the job to the cluster immediately after you click <b>Save</b>.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
+</ol>
+
+
+<ol>
 	<li>Click <b>Save</b> to save the job settings.</li>
 </ol>
 
 
-<h3><a name="JobDesigner-SubmittingaJobtoaCluster"></a><a name="JobDesigner-SubmittingaJobtoaCluster"></a>Submitting a Job to a Cluster</h3>
+<p><a name="JobDesigner-SubmittingaJobtoaCluster"></a></p>
+
+<h1><a name="JobDesigner-SubmittingaJobtoaCluster"></a>Submitting a Job to a Cluster</h1>
 
 <p><b>To submit a job to a cluster:</b></p>
 
 <ol>
-	<li>In the <b>Job Design List</b> window, click <b>job designs</b> in the upper left corner.
-<br class="atl-forced-newline" />
-Your jobs and other users' jobs are displayed in the <b>Job Design List</b> window.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /> <span class="image-wrap" style=""><img src="/jobsub/static/help/images/6259484.jpg" height="363" width="720" style="border: 0px solid black"/></span>
+	<li>In the <b>Job Designs</b> window, click <b>Designs</b> in the upper left corner.
 <br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>In the <b>Job Design List</b> window, double-click the job you want to submit. You can also right-click and choose <b>Submit to Cluster</b>.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
+Your jobs and other users' jobs are displayed in the <b>Job Designs</b> window.
+<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+	<li>In the <b>Job Design</b> window, click the <b>Submit</b> button for the job you want to submit.
+<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
 	<li>If the job contains variables, enter the information requested in the dialog box that appears.
 <br class="atl-forced-newline" />
 For example, the sample streaming PI Calculator job displays the following dialog box to enable you to specify the settings for <b>Iterations per Mapper</b> and <b>Num of mappers</b>.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /> <span class="image-wrap" style=""><img src="/jobsub/static/help/images/6259483.jpg" height="234" width="615" style="border: 0px solid black"/></span>
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>Click <b>Ok</b> to submit the job.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
+<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+	<li>Click <b>Submit</b> to submit the job.
+<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
 After the job is complete, the Job Designer displays the results of the job including the last 10 KB of <tt>stdout</tt> and <tt>stderr</tt> for a streaming job. For example, after the sample streaming PI Calculator job is complete, the following results appear.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /> <span class="image-wrap" style=""><img src="/jobsub/static/help/images/6259482.jpg" height="520" width="716" style="border: 0px solid black"/></span>
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-For information about displaying job results, see <a href="#JobDesigner-DisplayingJobResults">Displaying Job Results</a>.</li>
+<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
+For information about displaying job results, see <a href="#JobDesigner-DisplayingJobResults">Displaying Job Results</a>.
+<br class="atl-forced-newline" /></li>
 </ol>
 
 
-<h3><a name="JobDesigner-Copying%2CEditing%2CandDeletingaJobDesign"></a><a name="JobDesigner-Copying%2CEditing%2CandDeletingaJobDesign"></a>Copying, Editing, and Deleting a Job Design</h3>
+<p><a name="JobDesigner-Copying%2CEditing%2CandDeletingaJobDesign"></a></p>
+<h3><a name="JobDesigner-Copying%2CEditing%2CandDeletingaJobDesign"></a>Copying, Editing, and Deleting a Job Design</h3>
 
 <p>If you want to edit and use a job but you don't own it, you can make a copy of it and then edit and use the copied job.</p>
 
 <p><b>To copy a job design:</b></p>
 
 <ol>
-	<li>In the <b>Job Design List</b> window, click <b>job designs</b>.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-The jobs are displayed in the <b>Job Design List</b> window.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>In the <b>Job Design List</b> window, select the job, right click, and choose <b>Copy</b> from the context menu.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /> <span class="image-wrap" style=""><img src="/jobsub/static/help/images/6259480.jpg" height="276" width="718" style="border: 0px solid black"/></span>
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
+	<li>In the <b>Job Designs</b> window, click <b>Designs</b>.
+<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
+The jobs are displayed in the <b>Job Designs</b> window.
+<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+	<li>Click the <b>Clone</b> button to the right of the job you want to copy.
+<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
 	<li>In the <b>Job Design Editor</b> window, change the settings and then click <b>Save</b> to save the job settings.</li>
 </ol>
 
@@ -246,86 +313,70 @@ The jobs are displayed in the <b>Job Design List</b> window.
 <p><b>To edit a job design:</b></p>
 
 <ol>
-	<li>In the <b>Job Design List</b> window, click <b>job designs</b>.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-The jobs are displayed in the <b>Job Design List</b> window.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>In the <b>Job Design List</b> window, select the job, right click, and choose <b>Edit</b> from the context menu.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>In the <b>Job Design Editor</b> window, change the settings and then click <b>Save</b> to save the job settings.</li>
+	<li>In the <b>Job Designs</b> window, click <b>Designs</b>.
+<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
+The jobs are displayed in the <b>Job Designs</b> window.
+<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+	<li>Click the <b>Edit</b> button to the right of the job you want to copy.
+<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+	<li>In the <b>Job Design</b> window, change the settings and then click <b>Save</b> to save the job settings.</li>
 </ol>
 
 
 <p><b>To delete a job design:</b></p>
 
 <ol>
-	<li>In the <b>Job Design List</b> window, click <b>job designs</b>.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-The jobs are displayed in the <b>Job Design List</b> window.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>In the <b>Job Design List</b> window, select the job, right click, and choose <b>Delete</b> from the context menu.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
+	<li>In the <b>Job Designs</b> window, click <b>job designs</b>.
+<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
+The jobs are displayed in the <b>Job Designs</b> window.
+<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+	<li>In the <b>Job Designs</b> window, select the job, right click, and choose <b>Delete</b> from the context menu.
+<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
 	<li>Click <b>Ok</b> to confirm the deletion.</li>
 </ol>
 
 
-<h3><a name="JobDesigner-FilteringtheJobDesignList"></a><a name="JobDesigner-FilteringtheJobDesignList"></a>Filtering the Job Design List</h3>
+<p><a name="JobDesigner-FilteringtheJobDesigns"></a></p>
+<h3><a name="JobDesigner-FilteringtheJobDesigns"></a>Filtering the Job Designs</h3>
 
-<p>You can filter the <b>Job Design List</b> by owner, by job name, or both.</p>
+<p>You can filter the <b>Job Designs</b> by owner, by job name, or both.</p>
 
-<p><b>To filter the Job Design list:</b></p>
+<p><b>To filter the Job Designs list:</b></p>
 
 <ol>
-	<li>In the <b>Job Design List</b> window, click <b>job designs</b>.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>Enter the name of the owner, job name, or both in the query search boxes at the top of the <b>Job Design List</b> window.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
+	<li>In the <b>Job Designs</b> window, click <b>job designs</b>.
+<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
+	<li>Enter the name of the owner, job name, or both in the query search boxes at the top of the <b>Job Designs</b> window.
+<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
 <b>Job Designer</b> displays the jobs that match the filter criteria.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /> <span class="image-wrap" style=""><img src="/jobsub/static/help/images/6259479.jpg" height="115" width="718" style="border: 0px solid black"/></span>
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
+<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></li>
 </ol>
 
 
-<h2><a name="JobDesigner-DisplayingJobResults"></a><a name="JobDesigner-DisplayingJobResults"></a>Displaying Job Results</h2>
+<p><a name="JobDesigner-DisplayingJobResults"></a></p>
+<h1><a name="JobDesigner-DisplayingJobResults"></a>Displaying Job Results</h1>
 
 <p><b>To display job results:</b></p>
 
 <ol>
-	<li>In the <b>Job Design List</b> window, click <b>history</b>.
+	<li>In the <b>Job Designs</b> window, click the <b>History</b> tab.
 <br class="atl-forced-newline" />
 <br class="atl-forced-newline" />
-The jobs are displayed in the <b>Job History</b> window.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /> <span class="image-wrap" style=""><img src="/jobsub/static/help/images/6259478.jpg" height="258" width="716" style="border: 0px solid black"/></span>
+The jobs are displayed in the <b>Recently Launched Jobs</b> list.
 <br class="atl-forced-newline" />
 <br class="atl-forced-newline" /></li>
-	<li>To display details about a job, double-click it or click this icon <span class="image-wrap" style=""><img src="/jobsub/static/help/images/6259481.jpg" height="16" width="16" style="border: 0px solid black"/></span> next to the task.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
+	<li>To display details about a job, double-click it or click <font color="red">??</font> next to the task.
+<br class="atl-forced-newline" /> <br class="atl-forced-newline" />
 The results of the job appear.
 <br class="atl-forced-newline" />
-<br class="atl-forced-newline" /> <span class="image-wrap" style=""><img src="/jobsub/static/help/images/6259482.jpg" height="520" width="716" style="border: 0px solid black"/></span>
-<br class="atl-forced-newline" />
 <br class="atl-forced-newline" /></li>
 	<li>To display details about the job, click the job name under the <b>Launched Jobs</b> heading at the top of the results window.
 <br class="atl-forced-newline" />
 <br class="atl-forced-newline" />
 The following Job Browser screen appears with details about the job.
 <br class="atl-forced-newline" />
-<br class="atl-forced-newline" /> <span class="image-wrap" style=""><img src="/jobsub/static/help/images/6259477.jpg" height="391" width="711" style="border: 0px solid black"/></span>
-<br class="atl-forced-newline" />
 <br class="atl-forced-newline" /></li>
-	<li>To display details about a task, double-click a task under <b>Recent Tasks</b> or click this icon <span class="image-wrap" style=""><img src="/jobsub/static/help/images/6259476.jpg" height="16" width="16" style="border: 0px solid black"/></span> next to the task.
+	<li>To display details about a task, double-click a task under <b>Recent Tasks</b> or click this <font color="red">??</font> next to the task.
 <br class="atl-forced-newline" />
 <br class="atl-forced-newline" /></li>
 	<li>To view other types of job information, click the <b>Metadata</b> and <b>Counters</b> tabs.
@@ -337,9 +388,15 @@ The following Job Browser screen appears with details about the job.
 	<li>To view status information of all jobs, click the <b>view all tasks</b> link.
 <br class="atl-forced-newline" />
 <br class="atl-forced-newline" />
-Click <a href="https://wiki.cloudera.com/display/DOCSTAGE/Job+Browser" title="Job Browser">here</a> for more information about using Job Browser.</li>
+Click here for more information about using Job Browser.</li>
 </ol>
 
 
-				    					    <br/>
-                        
+				    
+                    			    </td>
+		    </tr>
+	    </table>
+	    
+    </body>
+</html>
+

BIN
apps/shell/src/shell/static/help/images/12517859.jpg


BIN
apps/shell/src/shell/static/help/images/12517860.jpg


+ 44 - 28
apps/shell/src/shell/static/help/index.html

@@ -2,30 +2,55 @@
 
 <p>The Hue Shell application provides access to the Pig, Flume, 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>
 
-<h1><a name="HueShell-UsingHueShell"></a>Using Hue Shell</h1>
 
-<p><b>To use the Shell application:</b></p>
+<h2><a name="HueShell-Contents"></a>Contents</h2>
+
+<style type='text/css'>/*<![CDATA[*/
+div.rbtoc1334175459150 {margin-left: 1.5em;padding: 0px;}
+div.rbtoc1334175459150 ul {margin-left: 0px;padding-left: 20px;}
+div.rbtoc1334175459150 li {margin-left: 0px;padding-left: 0px;}
+
+/*]]>*/</style><div class='rbtoc1334175459150'>
+<ul>
+    <li><a href='#HueShell-IntroducingHueShell'>Introducing Hue Shell</a></li>
+    <li><a href='#HueShell-HueShellInstallationandConfiguration'>Hue Shell Installation and Configuration</a></li>
+<ul>
+<ul>
+    <li><a href='#HueShell-UnixUserAccounts'>Unix User Accounts</a></li>
+</ul>
+</ul>
+    <li><a href='#HueShell-StartingtheShell'>Starting the Shell</a></li>
+    <li><a href='#HueShell-ViewingDocumentationfortheShells'>Viewing Documentation for the Shells</a></li>
+</ul></div>
+<p><br class="atl-forced-newline" /></p>
+
+
+<h1><a name="HueShell-HueShellInstallationandConfiguration"></a>Hue Shell Installation and Configuration</h1>
+
+<p>Shell is one of the applications that is installed as part of Hue. For more information about installing Hue, see <a href="https://ccp.cloudera.com/display/CDH4B2/Hue+Installation" title="Hue Installation">Hue Installation</a>.</p>
+
+<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/CDH4B2/Hue+Installation#HueInstallation-UnixUserAccounts">Hue Installation Guide</a> for instructions.
+<br class="atl-forced-newline" /> <br class="atl-forced-newline" /></p>
+
+<h1><a name="HueShell-StartingtheShell"></a>Starting the Shell</h1>
 
 <ol>
-	<li>To start the Shell application, click this icon <span class="image-wrap" style=""><img src="/shell/static/help/images/12517860.jpg" height="33" width="33" style="border: 0px solid black"/></span> in the application bar at the bottom of the Hue web page. (To start a second instance of the Shell application, double-click the icon.)
+	<li>To start the Shell application, click the <b>Shell</b> tab 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>
+	<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" />
-<br class="atl-forced-newline" />
-The <b>Hue Shell</b> window opens in the Hue web page.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-<span class="image-wrap" style=""><img src="/shell/static/help/images/12517859.jpg" height="233" width="699" style="border: 0px solid black"/></span> 
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>Click any of the buttons in the center of the Shell window to open a subprocess shell of that type.
-<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><br />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>Click a button at the top of the window to open a subprocess shell of that type in a new instance of the Shell application.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
+<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>
+<p><br class="atl-forced-newline" /></p></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>
+	<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" />
-<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. You can also click the <b>Close</b> button on the instance of the Shell application.
-<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><br />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></li>
+<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>
 </ol>
 
 
@@ -55,20 +80,11 @@ The <b>Hue Shell</b> window opens in the Hue web page.
 </div>
 
 
-				    					    <br/>
-                        
 				    
                     			    </td>
 		    </tr>
 	    </table>
-	    <table border="0" cellpadding="0" cellspacing="0" width="100%">
-			<tr>
-				<td height="12" background="https://ccp.cloudera.com/images/border/border_bottom.gif"><img src="images/border/spacer.gif" width="1" height="1" border="0"/></td>
-			</tr>
-		    <tr>
-			    <td align="center"><font color="grey">Document generated by Confluence on Jun 23, 2011 13:53</font></td>
-		    </tr>
-	    </table>
+	    
     </body>
 </html>
 

BIN
apps/useradmin/static/help/images/user_admin.gif


+ 0 - 27
apps/useradmin/static/help/index.md

@@ -1,27 +0,0 @@
-User Admin
-============
-<a target="UserAdmin"><img src="/useradmin/static/art/useradmin-logo.png" class="help-logo"/></a>
-The User Admin lets the system administrator
-create and delete users, and update their passwords
-and e-mail addresses.  
-
-<img src="/useradmin/static/help/images/user_admin.gif"/>
-
-What's the e-mail address used for?
------------------------------------
-Certain applications will alert you by e-mail when certain actions
-have occurred.  The Job Designer, for example,
-e-mails you when your job has completed.
-
-How do I change my password?
-----------------------------
-Hit the "gear" icon in the user admin to edit your own
-user profile.  (You won't be able to edit other folks.)
-Type the password twice, and hit Save!
-
-Integrating Hue with Other Authentication
-------------------------------------------------------
-Your administrator may choose to configure Desktop
-such that the authentication goes through a different
-system (e.g., PAM, LDAP, etc.)  In this case,
-you need to change your password in that system.

+ 43 - 0
desktop/core/static/help/index.html

@@ -0,0 +1,43 @@
+<h1><a name="WelcometoHue-WelcometoHue%21"></a>Welcome to Hue!</h1>
+
+<p>Hue is a browser-based environment that enables you to interact with a Hadoop cluster. Hue includes several easy to use applications that help you work with Hadoop Map/Reduce jobs, Hive queries, and user accounts. The Hue applications run in a Web browser and require no client installation. </p>
+
+<h3><a name="WelcometoHue-StartingApplications"></a>Starting Applications</h3>
+
+<p>To open a Hue application, click the appropriate tab in the navigation bar at the top of the Hue web browser window. To open a second application (or a second instance of the same application), open it in a new tab (right-click on the tab and select "Open link in new tab").</p>
+
+<h3><a name="WelcometoHue-DisplayingHelpfortheHueApplications"></a>Displaying Help for the Hue Applications</h3>
+
+<p>To display the help text for a Hue application, click the Help tab in the Hue Navigation Bar, then click the appropriate link in the navigation bar at the top of the Help window. </p>
+
+<h3><a name="WelcometoHue-LoggingInandOut"></a>Logging In and Out</h3>
+
+<p>To log out of Hue, click the "Sign out" link at the top left corner of the Hue web browser window, next to your user name.</p>
+
+
+<h3><a name="WelcometoHue-ChangingyourPassword"></a>Changing your Password</h3>
+
+<p>If authentication is managed by Hue (that is, authentication is not managed via some external mechanism), you can use the User Admin application to change your password. For more information, see the User Admin Help.</p>
+
+<h3><a name="WelcometoHue-SeekingHelp%2CReportingBugs%2CandProvidingFeedback"></a>Seeking Help, Reporting Bugs, and Providing Feedback</h3>
+
+<p>The Hue team strongly values your feedback. The best way to contact us is to send email to hue-user@cloudera.com.  <font color="red"><em>Put a link to <a href="https://groups.google.com/a/cloudera.org/group/hue-issues/topics">https://groups.google.com/a/cloudera.org/group/hue-issues/topics</a> ?</em></font></p>
+
+<p>If you're experiencing transient errors (typically an error message saying a service is down), contact your system administrator first.</p>
+
+<h3><a name="WelcometoHue-BrowserCompatibility"></a>Browser Compatibility</h3>
+
+<p>Hue works best in Firefox, and works well in Chrome and Safari. Internet Explorer 8 is also supported. <font color="red"><em>Ensure this is current?</em></font></p>
+
+<h3><a name="WelcometoHue-HueSDK"></a>Hue SDK</h3>
+
+<p>Hue supports an SDK to build new applications within the framework. If you're interested in building new applications within the framework, send email to <a href="mailto:hue-user@cloudera.com">hue-user@cloudera.com</a>.</p>
+
+				    
+                    			    </td>
+		    </tr>
+	    </table>
+	    
+    </body>
+</html>
+

+ 0 - 49
desktop/core/static/help/index.md

@@ -1,49 +0,0 @@
-Welcome to Hue!
-===============
-
-<img src='/static/art/help/logo.png' class="help-logo">
-
-Hue is a browser-based, desktop-style environment that enables you to interact with a Hadoop cluster. Hue includes several easy to use applications that help you work with Hadoop Map/Reduce jobs, Hive queries, and user accounts. The Hue applications run in a Web browser and require no client installation. Hue is also a development platform for building custom applications via the Hue SDK.   
-
-## Displaying Help for the Hue Applications
-
-To display the help text for each Hue application, click the links in the **Index** on the left side of the Help window.
-
-## Starting Applications
-
-To open the Hue applications, click the icons at the bottom of the Hue web browser window. You can double-click an icon to open a second instance of the application.
-
-## Logging In and Out
-
-To log out of Hue, click the **logout** link at the top left corner of the Hue web browser window, next to your user name.  When you log back in, Hue restores the application windows you had open the last time you logged out.
-
-<img src="/static/help/images/logout.gif"/>
-
-## Hue Keyboard Shortcuts
-
-To view a list of Hue keyboard shortcuts, press Ctrl-/ or click the **Shortcuts** in the top right corner of the screen.
- 
-<img src="/static/help/images/shortcuts.gif"/>
-
-## Changing your Password
-
-If authentication is managed by Hue (that is, authentication is not managed via some external mechanism), you can use the User Manager or User Admin application to change your password. For more information, see the User Manager Help.
-
-## Seeking Help, Reporting Bugs, and Providing Feedback
-
-The Hue team strongly values your feedback. The best way to contact us is to click the **feedback** link in the bottom left section of the Hue web browser window. 
-
-<img src="/static/help/images/feedback.gif"/>
-
-If you're experiencing transient errors (typically an error message saying a service is down), contact your system administrator first.
-
-Every window that's rendered in Hue is typically backed by an HTTP GET or POST request sent to the server via AJAX.  If you are reporting a problem and you are familiar with web development and a tool such as Firebug, mention the request that is failing in your bug report. 
-
-## Browser Compatibility
-
-Hue works best in Firefox, and works well in Chrome and Safari. Internet Explorer 8 is also supported. 
-
-## Extending Desktop
-
-Hue supports an SDK to build new applications within the framework. If you're interested in building new applications within the framework, click the **feedback** link to contact us via the Hue-users group.
-