[gnome-terminal/wip/mallard-merge: 95/287] Help: Recommit of changes.

[Ekaterina Gerasimova <egerasimov src gnome org>]

commit e6ea68d1d159fb6aa48609a081ab276a526a7dd4
Author: Sindhu S <sindhus live in>
Date:   Fri Feb 15 17:39:03 2013 +0530

    Help: Recommit of changes.
    
    Includes changes from both Ekaterina Gerasimova and Sindhu S.

 help/C/overview.page |   36 +++++++++++++++++++++++++++++++++---
 1 files changed, 33 insertions(+), 3 deletions(-)
---
diff --git a/help/C/overview.page b/help/C/overview.page
index e27cd8a..4265dbe 100644
--- a/help/C/overview.page
+++ b/help/C/overview.page
@@ -24,14 +24,44 @@
 <!-- What is VTE? -->
 
   <p>A terminal is a text input point in a computer also called the Command
+<<<<<<< Updated upstream
   Line Interface (CLI). A terminal emulator, such as VTE, emulates a text
   terminal inside a graphical user interface (GUI) environment.
   <app>Terminal</app> is a terminal emulator for GNOME. </p>
 
 <!-- What is the connection between a terminal and a shell? Explain. -->
+=======
+  Line Interface (CLI). A terminal emulator such as VTE emulates a text
+  terminal inside a graphical user interface (GUI) environment. <app>Terminal</app> is a terminal emulator 
for GNOME.</p>
+>>>>>>> Stashed changes
 
-  <p>A shell is a program that provides an interface to invoke or "launch"
-  commands or another program inside a terminal. It also allows you to view
-  and browse the contents of directories.</p>
+  <terms>
+    <item>
+      <title>Shell</title>
+      <p>A shell is a program that provides an interface to invoke or "launch"
+  commands or another program inside a terminal. It also allows you to view and
+  browse the contents of directories.</p>
+    </item>
+    <item>
+      <title>Prompt</title>
+      <p>A prompt also called a command prompt is a sequence of characters used in the CLI to indicate the 
readiness of the shell to accept commands.</p>
+
+      <p>A prompt usually ends with characters $, %, # or > and includes information about path of present 
working directory. On Unix based systems, it is common for the prompt to end in a $ or % character depending 
on the user role such as $ for user and # for superuser (also called root).</p>
+
+      <p>Prompts are customisable to include colors, special characters and variables for system time, user, 
working directory to make the prompt informative and distinguishable from sessions on various machines.</p>
+
+      <p>In a bash shell, the $PS1 variable can be used to set the prompt. 
+      <code>[time] user host: work_dir $
+      export PS1='[\t] \u \H: \W $'</code></p>
+    </item>
+    <item>
+      <title>Escape Sequences</title>
+      <p><!--TODO: write about escape sequences --></p>
+    </item>
+    <item>
+      <title>Emulators</title>
+      <p><!-- What are emulators, what can a user expect from them --></p>
+    </item>
+  </terms>
 
 </page>