浏览代码

Complete search doc.
Add search doc to index.
Fix broken links in converted docs.
New and updated graphics.

Stephanie Bodoff 12 年之前
父节点
当前提交
91fae47432

+ 2 - 1
docs/user-guide/admin.md

@@ -72,7 +72,7 @@ superusers and users.
     the application will not attempt to email the user.</td></tr>
 <tr><td>Groups</td><td> The groups to which the user belongs. By default, a user is assigned
     to the **default** group, which allows access to all applications.
-    See [Managing Application Permissions](#topic_11_4).</td></tr></table>
+    See [Permissions](#permissions).</td></tr></table>
     
 
 5.  Click **Add User** to save the information you specified and close
@@ -196,6 +196,7 @@ import groups from an LDAP directory.
 
 3.  Click **Add/sync group**.
 
+<a id="permissions"></a>
 Permissions
 -----------
 

+ 5 - 5
docs/user-guide/beeswax.md

@@ -17,7 +17,7 @@ Beeswax and Hive Installation and Configuration
 
 Beeswax is installed and configured as part of Hue. For information
 about installing and configuring Hue, see the Hue Installation
-manual..
+manual.
 
 Beeswax assumes an existing Hive installation. The Hue installation
 instructions include the configuration necessary for Beeswax to access
@@ -45,7 +45,7 @@ statements](http://archive.cloudera.com/cdh4/cdh/4/hive/language_manual/data-man
 in the Beeswax application.
 
 You can also use the [Metastore
-Manager](hue2.0ug_metastore_manager.html#xd_583c10bfdbd326ba-3ca24a24-13d80143249--7f9b)
+Manager](../metastore_manager.html)
 application to manage the databases, tables, and partitions and load
 data.
 
@@ -76,7 +76,7 @@ In the box to the left of the Query field, you can select a database,
 override the default Hive and Hadoop settings, specify file resources
 and user-defined functions, enable users to enter parameters at
 run-time, and request email notification when the job is complete. See
-[Advanced Query Settings](#topic_4_3_2) for details on using these
+[Advanced Query Settings](#advancedQuerySettings) for details on using these
 settings.
 
 ### Creating Queries
@@ -147,9 +147,9 @@ MapReduce jobs that the query generated.
             table**, enter a table name, and then click **Save**.
         -   To save the results in an HDFS file, select **In an HDFS
             directory**, enter a path and then click **Save**. You can
-            then download the file with [File
-            Browser](hue2.0ug_topic_6.html#topic_6).
+            then download the file with [File Browser](../filebrowser.html).
 
+<a id="advancedQuerySettings"></a>
 ### Advanced Query Settings
 
 The pane to the left of the Query Editor lets you specify the following

+ 20 - 17
docs/user-guide/filebrowser.md

@@ -11,11 +11,11 @@ Hue. With File Browser, you can:
 -   Create files and directories, upload and download files, upload zip
     archives, and rename, move, and delete files and directories. You
     can also change a file's or directory's owner, group, and
-    permissions. See [Working with Files and Directories](#topic_6_3).
+    permissions. See [Files and Directories](#filesAndDirectories).
 -   Search for files, directories, owners, and groups. See [Searching
-    for Files and Directories](#topic_6_4).
+    for Files and Directories](#searching).
 -   View and edit files as text or binary. See [Viewing and Editing
-    Files](#topic_6_5).
+    Files](#viewAndEdit).
 
 File Browser Installation and Configuration
 -------------------------------------------
@@ -31,6 +31,8 @@ Click the **File Browser** icon
 (![image](images/icon_filebrowser_24.png)) in the navigation bar at the
 top of the Hue browser page.
 
+
+<a id="fileAndDirectories"></a>
 Files and Directories
 ---------------------
 
@@ -41,7 +43,7 @@ must have the proper permissions to manipulate other user's files.
 
 ### Creating Directories
 
-1.  In the File Browser window, select **New \> Directory**.
+1.  In the File Browser window, select **New > Directory**.
 2.  In the **Create Directory** dialog box, enter a directory name and
     then click **Submit**.
 
@@ -62,10 +64,12 @@ a Hue administrator to create a home directory for you.
 
 ### Creating Files
 
-1.  In the File Browser window, select **New \> File**.
+1.  In the File Browser window, select **New > File**.
 2.  In the **Create File** dialog box, enter a file name and then click
     **Submit**.
 
+
+<a id="uploadingFiles"></a>
 ### Uploading Files
 
 You can upload text and binary files to the HDFS.
@@ -97,21 +101,17 @@ extracted to a directory named archivename.
 
 1.  In the **File Browser** window, browse to the directory where you
     want to upload the archive.
-2.  Select **Upload \> Zip file**.
+2.  Select **Upload > Zip file**.
 3.  In the box that opens, click **Upload a zip file** to browse to and
     select the archive you want to upload, and then click **Open**.
 
 ### Trash Folder
 
-File Browser supports the HDFS trash folder (home directory/.Trash) to
+File Browser supports the HDFS trash folder (*home directory*/.Trash) to
 contain files and directories before they are permanently deleted. Files
 in the folder have the full path of the deleted files (in order to be
 able to restore them if needed) and checkpoints. The length of time a
-file or directory stays in the trash depends on HDFS properties. For
-information on how to configure the HDFS trash folder, see Enabling
-Trash. in
-[http://www.cloudera.com/content/cloudera-content/cloudera-docs/CDH4/latest/CDH4-Installation-Guide/CDH4-Installation-Guide.html](http://www.cloudera.com/content/cloudera-content/cloudera-docs/CDH4/latest/CDH4-Installation-Guide/CDH4-Installation-Guide.html).
-
+file or directory stays in the trash depends on HDFS properties.
 
 **Open**
 
@@ -121,12 +121,12 @@ Trash. in
 
 1.  In the **File Browser** window, check the checkbox next to one or
     more files and directories.
-2.  Select Delete \> Move to trash
+2.  Select **Delete > Move to trash**.
 
 **Empty**
 
 1.  In the **File Browser** window, click ![image](images/fbtrash.png).
-2.  Click Empty.
+2.  Click **Empty**.
 
 ### Renaming, Moving, Deleting, and Restoring Files and Directories
 
@@ -153,8 +153,8 @@ Trash. in
     the files and subdirectories contained within that directory are
     also deleted.
 2.  Choose one of the following:
-    -   Delete \> Move to trash
-    -   Delete \> Delete forever
+    -   **Delete > Move to trash**
+    -   **Delete > Delete forever**
 
 3.  Click **Yes** to confirm. When you move a file to trash it is stored
     in the .Trash folder in your home directory.
@@ -197,7 +197,9 @@ can change a file's or directory's owner, group, or permissions.
 2.  Click the **Change Permissions** button.
 3.  In the **Change Permissions** dialog box, select the permissions you
     want to assign and then click **Submit**.
-
+    
+    
+<a id="searching"></a>
 Searching for Files and Directories
 -----------------------------------
 
@@ -205,6 +207,7 @@ To search for files or directories by name using the query search box,
 enter the name of the file or directory in the query search box. File
 Browser lists the files or directories matching the search criteria.
 
+<a id="viewAndEdit"></a>
 Viewing and Editing Files
 -------------------------
 

二进制
docs/user-guide/images/add.png


二进制
docs/user-guide/images/clear.jpg


二进制
docs/user-guide/images/clear.png


二进制
docs/user-guide/images/eyeglass.png


二进制
docs/user-guide/images/huearch.jpg


二进制
docs/user-guide/images/layoutChooser.png


+ 3 - 2
docs/user-guide/impala.md

@@ -40,7 +40,7 @@ statements](http://archive.cloudera.com/cdh4/cdh/4/hive/language_manual/data-man
 in the Beeswax application.
 
 You can also use the [Metastore
-Manager](hue2.0ug_metastore_manager.html#xd_583c10bfdbd326ba-3ca24a24-13d80143249--7f9b)
+Manager]()
 application to manage the databases, tables, and partitions and load
 data.
 
@@ -76,7 +76,7 @@ or return later to find the queries in the **History** view.
 
 In the box to the left of the Query field, you can select a database,
 override the default Cloudera Impala settings, enable users to enter
-parameters at run-time. See [Advanced Query Settings](#topic_5_3_2) for
+parameters at run-time. See [Advanced Query Settings](#advancedQuerySettings) for
 details on using these settings.
 
 ### Creating Queries
@@ -121,6 +121,7 @@ server.
 3.  If there are multiple statements in the query, click Next in the
     Multi-statement query pane to execute the remaining statements.
 
+<a id="advancedQuerySettings"></a>
 ### Advanced Query Settings
 
 The pane to the left of the Query Editor lets you specify the following

+ 5 - 3
docs/user-guide/index.md

@@ -9,12 +9,14 @@ Hue 2 User Guide
 -   [Beeswax](beeswax.html)
 -   [Cloudera Impala Query UI](impala.html)
 -   [Pig Editor](pig.html)
--   [HBase Browser](hbase.html)
--   [Metastore Manager](metastore_manager.html)
 -   [File Browser](filebrowser.html)
+-   [Metastore Manager](metastore_manager.html)
+-   [Sqoop UI](sqoop.html)
 -   [Job Browser](jobbrowser.html)
 -   [Job Designer](jobdesigner.html)
 -   [Oozie Editor and Dashboard](oozie.html)
--   [Sqoop UI](sqoop.html)
+-   [Solr Search](search.html)
 -   [Hue Shell](shell.html)
+-   [HBase Browser](hbase.html)
 -   [User Admin](admin.html)
+

+ 4 - 8
docs/user-guide/introducing.md

@@ -19,17 +19,13 @@ The following figure illustrates how Hue works. Hue Server is a
 "container" web application that sits in between CDH and the browser. It
 hosts all the Hue web applications and communicates with CDH components.
 
-\
-![image](images/huearch.jpg)\
+![image](images/huearch.jpg)
 
 Starting Applications
 ---------------------
 
 To open a Hue application, click the appropriate icon in the navigation
-bar at the top of the Hue web browser window:\
-![image](images/applications.png)\
-
-To open a second application concurrently (or a second instance of the
+bar at the top of the Hue web browser window. To open a second application concurrently (or a second instance of the
 same application), right-click the icon and select **Open link in new
 tab**.
 
@@ -53,7 +49,7 @@ Notice of Misconfiguration
 If Hue detects a misconfiguration, an indicator
 ![image](images/misconfiguration.png) appears in the navigation bar at
 the top of the page. Clicking this indicator takes you to the [Check
-Configuration](hue2.0ug_topic_3.html#topic_3__li_h1j_fhk_zj) screen
+Configuration](../about.html) screen
 which will indicate the potential misconfiguration(s) with hints about
 fixing them.
 
@@ -65,7 +61,7 @@ Profile at the right of the Hue navigation bar.
 
 If authentication is managed by Hue (that is, authentication is not
 managed via some external mechanism), and you are a superuser, you can
-use the [User Admin](hue2.0ug_topic_11.html#topic_11) application to
+use the [User Admin](../useradmin.html) application to
 change password and personal details.
 
 Seeking Help, Reporting Bugs, and Providing Feedback

+ 24 - 18
docs/user-guide/jobdesigner.md

@@ -94,17 +94,17 @@ delete them.
 
 Most job design types support all the settings listed in the following
 table. For job type specific settings, see:
-[MapReduce](#concept_gt5_bh3_zj__section_lvq_ch3_zj),
-[Streaming](#concept_gt5_bh3_zj__section_zrd_gh3_zj),
-[Java](#concept_gt5_bh3_zj__section_abl_hh3_zj),
-[Pig](#concept_gt5_bh3_zj__section_tvm_3h3_zj),
-[Hive](#concept_gt5_bh3_zj__section_lxq_3h3_zj),
-[Sqoop](#concept_gt5_bh3_zj__section_xb5_3h3_zj),
-[Shell](#concept_gt5_bh3_zj__section_xvw_3h3_zj),
-[Ssh](#concept_gt5_bh3_zj__section_tnz_3h3_zj),
-[DistCp](#concept_gt5_bh3_zj__section_qsc_jh3_zj),
-[Fs](#concept_gt5_bh3_zj__section_hx4_lh3_zj), and
-[Email](#concept_gt5_bh3_zj__section_qjt_lh3_zj).
+[MapReduce](#mapreduce),
+[Streaming](#streaming),
+[Java](#java),
+[Pig](#pig),
+[Hive](#hive),
+[Sqoop](#sqoop),
+[Shell](#shell),
+[Ssh](#ssh),
+[DistCp](#distcp),
+[Fs](#fs), and
+[Email](#email).
 
 All job design settings except Name and Description support the use of
 variables of the form $variable\_name. When you run the job, a dialog
@@ -125,7 +125,7 @@ allowing variables, functions, and complex expressions as parameters.<td></td></
 <tr><td>Files</td><td>Files to pass to the job. Equivalent to the Hadoop -files option.</td></tr>
 <tr><td>Archives</td><td>Files to pass to the job. Archives to pass to the job. Equivalent to the Hadoop -archives option.</td></tr></table>
 
-
+<a id="mapreduce"></a>
 #### MapReduce Job Design
 
 A MapReduce job design consists of MapReduce functions written in Java.
@@ -139,6 +139,7 @@ Job Properties setting.
 implement the Mapper and Reducer functions.</td></tr>
 </table>
 
+<a id="streaming"></a>
 #### Streaming Job Design
 
 Hadoop streaming jobs enable you to create MapReduce functions in any
@@ -156,6 +157,7 @@ the machines on the cluster, use the Files option to pass it as a
 part of job submission. Equivalent to the Hadoop -reducer option.</td></tr>
 </table>
 
+<a id="java"></a>
 #### Java Job Design
 
 A Java job design consists of a main class written in Java.
@@ -167,7 +169,7 @@ A Java job design consists of a main class written in Java.
 <tr><td>Java opts</td><td>The options to pass to the JVM.</td></tr>
 </table>
 
-
+<a id="pig"></a>
 #### Pig Job Design
 
 
@@ -175,10 +177,9 @@ A Pig job design consists of a Pig script.
 
 <table>
 <tr><td>Script name</td><td>Script name or path to the Pig script.</td></tr>
-<tr><td></td><td></td></tr>
-<tr><td></td><td></td></tr>
 </table>
 
+<a id="hive"></a>
 #### Hive Job Design
 
 A Hive job design consists of a Hive script.
@@ -188,7 +189,7 @@ A Hive job design consists of a Hive script.
 </table>
 
 
-
+<a id="sqoop"></a>
 #### Sqoop Job Design
 
 A Sqoop job design consists of a Sqoop command.
@@ -197,6 +198,7 @@ A Sqoop job design consists of a Sqoop command.
 <tr><td>Command</td><td>The Sqoop command.</td></tr>
 </table>
 
+<a id="shell"></a>
 #### Shell Job Design
 
 A Shell job design consists of a shell command.
@@ -206,7 +208,7 @@ A Shell job design consists of a shell command.
 <tr><td></td>Capture output<td>Indicate whether to capture the output of the command.</td></tr>
 </table>
 
-
+<a id="ssh"></a>
 #### Ssh Job Design
 
 A Ssh job design consists of an ssh command.
@@ -218,10 +220,12 @@ A Ssh job design consists of an ssh command.
 <tr><td></td>Capture output<td>Indicate whether to capture the output of the command.</td></tr>
 </table>
 
+<a id="distcp"></a>
 #### DistCp Job Design
 
 A DistCp job design consists of a DistCp command.
 
+<a id="fs"></a>
 #### Fs Job Design
 
 A Fs job design consists of a command that operates on HDFS.
@@ -234,6 +238,7 @@ content and then deletes the directory.</td></tr>
 <tr><td>Change permissions</td><td>The path whose permissions are to be changed, the permissions, and an
 indicator of whether to change permission recursively.</td></tr></table>
 
+<a id="email"></a>
 #### Email Job Design
 
 A Email job design consists of an email message.
@@ -268,7 +273,7 @@ submit the job.
 
 After the job is complete, the Job Designer displays the results of the
 job. For information about displaying job results, see [Displaying the
-Results of Submitting a Job](#topic_8_5).
+Results of Submitting a Job](#submitJob).
 
 ### Copying, Editing, and Deleting a Job Design
 
@@ -302,6 +307,7 @@ Delete
 3.  Click the **Delete** button.
 4.  Click **OK** to confirm the deletion.
 
+<a id="submitJob"></a>
 Displaying Results of Submitting a Job
 --------------------------------------
 

+ 20 - 21
docs/user-guide/metastore_manager.md

@@ -7,21 +7,21 @@ Metastore Manager
 The Metastore Manager application enables you to manage the databases,
 tables, and partitions of the
 [Hive](http://archive.cloudera.com/cdh4/cdh/4/hive/) metastore shared by
-the ([Beeswax](hue2.0ug_topic_4.html#topic_4) and [Cloudera Impala Query
-UI](hue2.0ug_topic_5.html#topic_5)) applications. You can use Metastore
+the ([Beeswax](../beeswax.html) and [Cloudera Impala Query
+UI](../impala.html)) applications. You can use Metastore
 Manager to perform the following operations:
 
 -   Databases
-    -   [Select a database](#topic_4_4_1)
-    -   [Create a database](#concept_hz4_snv_wj)
-    -   [Drop databases](#concept_pyc_tgw_wj)
+    -   [Select a database](#selectDatabase)
+    -   [Create a database](#createDatabase)
+    -   [Drop databases](#dropDatabase)
 
 -   Tables
-    -   [Create tables](#topic_4_4_2)
-    -   [Browse tables](#topic_4_4_3)
-    -   [Import data into a table](#topic_4_4_4)
-    -   [Drop tables](#topic_4_4_5)
-    -   [View the location of a table](#topic_4_4_6)
+    -   [Create tables](#createTables)
+    -   [Browse tables](#browseTables)
+    -   [Import data into a table](#importDataIntoTables)
+    -   [Drop tables](#dropTables)
+    -   [View the location of a table](#viewTableLocation)
 
 Metastore Manager Installation and Configuration
 ------------------------------------------------
@@ -50,14 +50,16 @@ this task.
 ### Importing Data
 
 If you want to import your own data instead of installing the sample
-tables, follow the procedure in [Creating Tables](#topic_4_4_2).
+tables, follow the procedure in [Creating Tables](#createTables).
 
+<a id="selectDatabase"></a>
 Selecting a Database
 --------------------
 
 1.  In the pane on the left, select the database from the DATABASE
     drop-down list.
 
+<a id="createDatabase"></a>
 Creating a Database
 -------------------
 
@@ -74,7 +76,8 @@ Creating a Database
                 to a folder and click **Select this folder**.
 
     3.  Click the **Create Database** button.
-
+    
+<a id="selectDatabase"></a>
 Dropping Databases
 ------------------
 
@@ -84,6 +87,7 @@ Dropping Databases
 3.  Click the ![image](images/trash.png) Drop button.
 4.  Confirm whether you want to delete the databases.
 
+<a id="createTables"></a>
 Creating Tables
 ---------------
 
@@ -139,6 +143,7 @@ as an additional step.
 
 3.  Click **Create table**. The Table Metadata window displays.
 
+<a id="browseTables"></a>
 Browsing Tables
 ---------------
 
@@ -162,6 +167,7 @@ Do one of the following:
     clicking **Show Partitions(n)**, where n is the number of partitions
     in the ACTIONS pane on the left.
 
+<a id="importDataIntoTables"></a>
 Importing Data into a Table
 ---------------------------
 
@@ -178,6 +184,7 @@ data with data from a file.
     the table.
 5.  Click **Submit**.
 
+<a id="dropTables"></a>
 Dropping Tables
 ---------------
 
@@ -186,6 +193,7 @@ Dropping Tables
 2.  In the ACTIONS pane, click **Drop Table**.
 3.  Click **Yes** to confirm the deletion.
 
+<a id="viewTableLocation"></a>
 Viewing a Table's Location
 --------------------------
 
@@ -193,12 +201,3 @@ Viewing a Table's Location
     window displays.
 2.  Click **View File Location**. The file location of the selected
     table displays in its directory in the File Browser window.
-
-Permissions
------------
-
-1.  Ideally install the Sentry project for getting full Hive security.
-2.  Make the Metastore App read only for a certain group of user: In
-    UserAdmin, add the permissions 'read_only_access' to their group.
-
-

+ 39 - 30
docs/user-guide/oozie.md

@@ -14,20 +14,17 @@ A workflow application is a collection of actions arranged in a directed
 acyclic graph (DAG). It includes two types of nodes:
 
 -   Control flow - start, end, fork, join, decision, and kill
--   Action -
-    [MapReduce](hue2.0ug_topic_8.html#concept_gt5_bh3_zj__section_lvq_ch3_zj),
-    [Streaming](hue2.0ug_topic_8.html#concept_gt5_bh3_zj__section_zrd_gh3_zj),
-    [Java](hue2.0ug_topic_8.html#concept_gt5_bh3_zj__section_abl_hh3_zj),
-    [Pig](hue2.0ug_topic_8.html#concept_gt5_bh3_zj__section_tvm_3h3_zj),
-    [Hive](hue2.0ug_topic_8.html#concept_gt5_bh3_zj__section_lxq_3h3_zj),
-    [Sqoop](hue2.0ug_topic_8.html#concept_gt5_bh3_zj__section_xb5_3h3_zj),
-    [Shell](hue2.0ug_topic_8.html#concept_gt5_bh3_zj__section_xvw_3h3_zj),
-    [Ssh](hue2.0ug_topic_8.html#concept_gt5_bh3_zj__section_tnz_3h3_zj),
-    [DistCp](hue2.0ug_topic_8.html#concept_gt5_bh3_zj__section_qsc_jh3_zj),
-    [Fs](hue2.0ug_topic_8.html#concept_gt5_bh3_zj__section_hx4_lh3_zj),
-    and
-    [Email](hue2.0ug_topic_8.html#concept_gt5_bh3_zj__section_qjt_lh3_zj))
-
+-   Action - [MapReduce](../jobdesigner.html#mapreduce),
+[Streaming](../jobdesigner.html#streaming),
+[Java](../jobdesigner.html#java),
+[Pig](../jobdesigner.html#pig),
+[Hive](../jobdesigner.html#hive),
+[Sqoop](../jobdesigner.html#sqoop),
+[Shell](../jobdesigner.html#shell),
+[Ssh](../jobdesigner.html#ssh),
+[DistCp](../jobdesigner.html#distcp),
+[Fs](../jobdesigner.html#fs), and
+[Email](../jobdesigner.html#email).
     In order to run DistCp, Streaming, Pig, Sqoop, and Hive jobs, Oozie
     must be configured to use the Oozie ShareLib. See the Oozie Installation
    manual.
@@ -54,15 +51,15 @@ Click the **Oozie Editor/Dashboard** icon
 the Hue browser page. **Oozie Editor/Dashboard** opens with the
 following screens:
 
--   [Dashboard](#topic_9_6) - shows the running and completed workflow,
+-   [Dashboard](#dashboard) - shows the running and completed workflow,
     coordinator, and bundle jobs and information about Oozie
     instrumentation and configuration. The screen is selected and opened
     to the Workflows page.
--   [Workflow Manager](#topic_9_7) - shows available workflows and
+-   [Workflow Manager](#workflowManager) - shows available workflows and
     allows you to create and import workflows.
--   [Coordinator Manager](#topic_9_8) - shows available coordinators and
+-   [Coordinator Manager](#coordinatorManager) - shows available coordinators and
     allows you to create coordinators.
--   [Bundle Manager](#concept_crd_ttp_wj) - shows available bundles and
+-   [Bundle Manager](#bundleManager) - shows available bundles and
     allows you to create bundles.
 
 Installing Oozie Editor/Dashboard Examples
@@ -121,6 +118,8 @@ restore or permanently delete them.
     bundles.
 3.  Click Restore.
 
+
+<a id="dashboard"></a>
 Dashboard
 ---------
 
@@ -133,6 +132,7 @@ You can filter the list by date (1, 7, 15, or 30 days) or status
 (Succeeded, Running, or Killed). The date and status buttons are
 toggles.
 
+
 ### Workflows
 
 Click the **Workflows** tab to view the running and completed workflow
@@ -175,6 +175,7 @@ For each action in the workflow you can:
 -   Click the ![image](images/log.png) icon to view the log in the Job
     Browser.
 
+
 ### Coordinators
 
 Click the **Coordinators** tab to view the running and completed
@@ -219,6 +220,7 @@ For information on the configuration properties supported by Oozie, see
 [Oozie
 Configuration](http://oozie.apache.org/docs/3.3.0/AG_Install.html#Oozie_Configuration).
 
+<a id="workflowManager"></a>
 Workflow Manager
 ----------------
 
@@ -251,7 +253,7 @@ Specification](http://archive.cloudera.com/cdh4/cdh/4/oozie/WorkflowFunctionalSp
 ### Opening a Workflow
 
 To open a workflow, in Workflow Manager, click the workflow. Proceed
-with [Editing a Workflow](#topic_9_7_7).
+with [Editing a Workflow](#editingWorkflow).
 
 ### Creating a Workflow
 
@@ -262,7 +264,7 @@ with [Editing a Workflow](#topic_9_7_7).
 4.  Click **advanced** to specify the deployment directory or a job.xml
     file.
 5.  Click **Save**. The Workflow Editor opens. Proceed with [Editing a
-    Workflow](#topic_9_7_7).
+    Workflow](#editingWorkflow).
 
 ### Importing a Workflow
 
@@ -273,7 +275,7 @@ with [Editing a Workflow](#topic_9_7_7).
 4.  Click **advanced** to specify whether the workflow is shared, the
     deployment directory, or a job.xml file.
 5.  Click **Save**. The Workflow Editor opens. Proceed with [Editing a
-    Workflow](#topic_9_7_7).
+    Workflow](#editingWorkflow).
 
 ### Submitting a Workflow
 
@@ -318,8 +320,9 @@ To schedule a workflow for recurring execution, do one of the following:
 -   In the Workflow Editor, click the **Schedule** button.
 
 A coordinator is created and opened in the Coordinator Editor. Proceed
-with [Editing a Coordinator](#topic_9_8_4).
+with [Editing a Coordinator](#editingCoordinator).
 
+<a id="editingWorkflow"></a>
 ### Editing a Workflow
 
 In the Workflow Editor you can easily perform operations on Oozie action
@@ -372,7 +375,7 @@ In the Workflow Editor, click the **Upload** button.
 
 The workspace of the workflow is opened in the File Browser application.
 Follow the procedure in [Uploading
-Files](hue2.0ug_topic_6.html#topic_6_3_4) to upload the files. You must
+Files](../filebrowser.html#uploadingFiles) to upload the files. You must
 put JAR files in a lib directory in the workspace.
 
 ### Editing Workflow Properties
@@ -393,6 +396,7 @@ put JAR files in a lib directory in the workspace.
 3.  Click a workflow.
 4.  Click the **Actions** tab.
 
+<a id="coordinatorManager"></a>
 Coordinator Manager
 -------------------
 
@@ -421,20 +425,21 @@ Specification](http://archive.cloudera.com/cdh4/cdh/4/oozie/CoordinatorFunctiona
 ### Opening a Coordinator
 
 To open a coordinator, in Coordinator Manager, click the coordinator.
-Proceed with [Editing a Coordinator](#topic_9_8_4).
+Proceed with [Editing a Coordinator](#editingCoordinator).
 
 ### Creating a Coordinator
 
 To create a coordinator, in Coordinator Manager:
 
 1.  Click the **Create** button at the top right. The Coordinator wizard
-    opens. Proceed with [Editing a Coordinator](#topic_9_8_4).
+    opens. Proceed with [Editing a Coordinator](#editingCoordinator).
 
 ### Submitting a Coordinator
 
 To submit a coordinator for execution, check the checkbox next to the
 coordinator and click the **Submit** button.
 
+<a id="editingCoordinator"></a>
 ### Editing a Coordinator
 
 In the Coordinator Editor you specify coordinator properties and the
@@ -454,7 +459,7 @@ screens. The following instructions walk you through the wizard.
     field to America/Los\_Angeles.
 3.  Click **Add** to select an input dataset and click **Next**. If no
     datasets exist, follow the procedure in [Creating a
-    Dataset](#topic_9_8_5).
+    Dataset](#creatingDataset).
 4.  Click **Add** to select an output dataset. Click **Save
     coordinator** or click **Next** to specify advanced settings.
 5.  To share the coordinator with all users, check the **Is****shared**
@@ -465,21 +470,23 @@ screens. The following instructions walk you through the wizard.
     execution policy.
 7.  Click **Save coordinator**.
 
+<a id="creatingDataset"></a>
 ### Creating a Dataset
 
 1.  In the Coordinator Editor, do one of the following:
     -   Click **here** in the Inputs or Outputs pane at the top of the
         editor.
     -   In the pane at the left, click the **Create new** link. Proceed
-        with [Editing a Dataset](#topic_9_8_7).
+        with [Editing a Dataset](#editingDataset).
 
 ### Displaying Datasets
 
 1.  In the Coordinator Editor, click **Show existing** in pane at the
     left.
 2.  To edit a dataset, click the dataset name in the Existing datasets
-    table. Proceed with [Editing a Dataset](#topic_9_8_7).
+    table. Proceed with [Editing a Dataset](#editingDataset).
 
+<a id="editingDataset"></a>
 ### Editing a Dataset
 
 1.  Type a name for the dataset.
@@ -507,6 +514,7 @@ screens. The following instructions walk you through the wizard.
 3.  Click a coordinator.
 4.  Click the **Actions** tab.
 
+<a id="bundleManager"></a>
 Bundle Manager
 --------------
 
@@ -532,7 +540,7 @@ Specification](http://archive.cloudera.com/cdh4/cdh/4/oozie/BundleFunctionalSpec
 ### Opening a Bundle
 
 To open a bundle, in Bundle Manager, click the bundle. Proceed with
-[Editing a Bundle](#concept_ur1_gmj_2k).
+[Editing a Bundle](#editingBundle).
 
 ### Creating a Bundle
 
@@ -542,13 +550,14 @@ To open a bundle, in Bundle Manager, click the bundle. Proceed with
 4.  Check the Is shared checkbox to allow all users to access the
     workflow.
 5.  Click **Save**. The Bundle Editor opens. Proceed with [Editing a
-    Bundle](#concept_ur1_gmj_2k).
+    Bundle](#editingBundle).
 
 ### Submitting a Bundle
 
 To submit a bundle for execution, check the checkbox next to the bundle
 and click the **Submit** button.
 
+<a id="editingBundle"></a>
 ### Editing a Bundle
 
 In the Bundle Editor, you specify properties by stepping through screens

+ 2 - 3
docs/user-guide/pig.md

@@ -12,9 +12,8 @@ Pig Editor Installation and Configuration
 -----------------------------------------
 
 Pig Editor is one of the applications installed as part of Hue. For
-information about installing and configuring Hue, see Hue Installation
-in
-[http://www.cloudera.com/content/cloudera-content/cloudera-docs/CDH4/latest/CDH4-Installation-Guide/CDH4-Installation-Guide.html](http://www.cloudera.com/content/cloudera-content/cloudera-docs/CDH4/latest/CDH4-Installation-Guide/CDH4-Installation-Guide.html).
+information about installing and configuring Hue, see the Hue Installation manual.
+
 Pig Editor assumes an existing Pig installation. The Hue installation
 instructions include the configuration necessary for Pig Editor to
 access Pig.

+ 92 - 42
docs/user-guide/search.md

@@ -1,73 +1,123 @@
 
 <link rel="stylesheet" href="docbook.css" type="text/css" media="screen" title="no title" charset="utf-8"></link>
 
-Solr Search
-==========================
+# Solr Search
 
-The Solr Search application allows you to 
 
- Solr Search Installation and Configuration
------------------------------------------------------
+The Solr Search application, which is based on  [Apache Solr](http://lucene.apache.org/solr/), allows you to perform keyword searches across Hadoop data. A wizard lets you style the result snippets, specify facets to group the results, sort the results, and highlight result fields.
 
-Search is one of the applications installed as part of
-Hue. For information about installing and configuring Hue, see the Hue Installation
+## Solr Search Installation and Configuration
+
+Solr Search is one of the applications installed as part of Hue. For information about installing and configuring Hue, see the Hue Installation
 manual.
 
-Starting  Solr Search
--------------------------------
+## Starting  Solr Search
 
 Click the ** Solr Search** icon
 (![image](images/icon_search_24.png)) in the navigation bar at the top of
-the Hue browser page. **Solr Search** opens with the
-following screens:
+the Hue browser page. **Solr Search** opens to the  [Collection Manager](#collectionManager). If there are no collections, the [Import Collections and Cores](#importCollection) dialog displays.
+
+<a id="collectionManager"></a>
+## Collection Manager
 
--   [Collection Manager](#topic_9_7) - shows available collections 
+In Collection Manager you import, copy, and delete [collections](http://wiki.apache.org/solr/SolrCloud#A_little_about_SolrCores_and_Collections).
 
-Installing Solr Search Examples
-------------------------------------------
+### Displaying the Collection Manager
+When you start Solr Search, the Collection Manager displays. You navigate to the Collection Manager by clicking **Collection manager** in the Search page or the Template Editor.
 
-![image](images/note.jpg) **Note**: You must be a superuser to perform
-this task.
+###  Filtering Collections
 
-1.  Click ![image](images/quick_start.png). The Quick Start Wizard
-    opens.
-2.  Click **Step 2: Examples**.
-3.  Click **Solr Search**.
+When you type in the Filter field, the list of collections is dynamically filtered to display only those rows
+containing text that matches the specified substring.
 
+<a id="importCollection"></a>
+### Importing Collections 
 
-Filtering Collections in Solr Search
------------------------------------------
+1. If there are existing collections, click the ![image](images/import.png) **Import** button at the top right. The Import Collections and Cores dialog displays.
+1. Check the checkboxes next to the collections to import.
+1. Click **Import Selected**. The collection is added to the Collection Manager.
 
-Many screens contain lists. When you type in the Filter field on
-screens, the lists are dynamically filtered to display only those rows
-containing text that matches the specified substring.
+### Editing Collection Properties
+1. In the Collection Manager, click a collection.
+1. In the **COLLECTION** area on the left, click **Properties**.
+1. Edit a property and click **Save**.
+
+
+### Searching a Collection
+
+1. In the Collection Manager, click **Search page** or click **Search it** in the Collection area on the left. The Search page displays.
+1. Select a collection from the **Search in** drop-down list.
+1. Type a search string in the **Search...** text box.
+1. Press **Enter** or click the ![image](images/eyeglass.png)  icon.
+
+-  If you have defined [facets](#facets), click a facet to display only those results in the group defined by the facet.
+-  If you have defined [sorting fields](#sorting), select from the **Sort by** drop-down list to sort the results.
+-  Click ![image](images/clear.png) to clear the search string.
+
+## Styling Search Results
+
+Do one of the following:
+
+- In the Collection Manager, click a collection.
+- In the Search page, select a collection from the **Search in** drop-down list and click ** Customize this collection**.  The Template Editor displays.
+
+### Template Editor
+
+The Template Editor provides four features:
+
+- [Snippet editor](#snippetEditor) - Specify the layout of the search result snippet, which fields appear in the snippet, and style the results.
+- [Facet editor](#facetEditor) - Define buckets in which to group results.
+- [Sort editor](#sortEditor) - Specify on which fields and order the results are sorted. 
+- [Highlighting editor](#highlightingEditor) - Enable highlighting of search fields. 
+
+<a id="snippetEditor"></a>
+#### Snippet Editor
+
+1. In the Snippet Editor, click a tab to choose the method for editing the search snippet fields and styling:
+1. - **Visual editor** - Click ![image](images/layoutChooser.png) to choose an overall layout for the snippet.
+1. - - Select the fields and functions from the drop-down lists on the right and click ![image](images/add.png). 
+1. - - Select fields, right-click, and select **Cut** and **Paste** to place the fields on the canvas. 
+1. - - Select fields and apply styling using the buttons on top.
+1. - **Source** - 
+1. - - Select the data fields and functions from the drop-down lists on the right.
+1. - - Specify layout and styling using HTML tags.
+1. - **Preview** - Preview the snippet.
+1. - **Advanced** - Specify styles for CSS classes specified in the Source tab.
+1. Click **Save**.
 
+<a id="facetEditor"></a>
+#### Facet Editor
 
-Collection Manager
-----------------
+By default, faceting  search result fields is disabled. Click **Enabled** to enable faceting.
 
-In Collection Manager you .
+1. In the Template Editor, click **2. Facets**. You can move between the facet tabs by clicking each **Step** tab, or by clicking **Back** and **Next**.
+1. In the General tab, specify 
+1. - **Limit** - the maximum number of values for each facet.
+1. - **Mincount** - the minimum number of search results that fall into a group for the facet to display on the Search page.
+1. In the Field, Range, and Date Facet tabs,  specify the facet properties and click ![image](images/add.png) **Add**.
+1. In the Facets Order tab, drag and drop the facet to specify the order in they appear in the Search page.
+1. Click **Save**. When you display the Search page, the facets display on the left.
 
+<a id="sortEditor"></a>
+#### Sorting Editor 
 
-### Creating a Collection
+By default, sorting on search result fields is disabled. Click **Enabled** to enable sorting.
 
-1.  Click the **Create** button at the top right.
-2.  In the Name field, type a name.
-3.  Check the Is shared checkbox to allow all users to access the
-    workflow.
-4.  Click **advanced** to specify the deployment directory or a job.xml
-    file.
-5.  Click **Save**. The Workflow Editor opens. Proceed with [Editing a
-    Workflow](#topic_9_7_7).
+1. In the Template Editor, click **3. Sorting**. 
+1. In the Field drop-down, select a field. Optionally specify a label for the field. 
+1. The default order is ascending. Click the arrows to change the order.
+1. Click  ![image](images/add.png) **Add**.
+1. Click **Save**. When you display search results, the results are sorted by the fields in the order that  they appear left to right. 
 
-### Importing a Collection
+<a id="highlightingEditor"></a>
+#### Highlighting Editor 
 
-1. Click the ![image](images/import.png) **Import** button at the top right.
-1. Check the checkboxes next to the collections or cores to import.
-1. Click **Import Selected**.
+By default,highlighting search result fields is disabled. Click **Enabled** to enable highlighting.
 
+1. In the Template Editor, click **3. Highlighting**. 
+1. Select the fields to be highlighted.
+1. Click **Save**. When you display search results, the selected fields are displayed with the style of the **em** class defined in the Advanced tab of the [Snippet editor](#snippetEditor). 
 
-#### A Heading