[gnome-terminal/wip/mallard-merge: 154/346] Help: Fixed overview.page.



commit a591d992db3d9e857cc667ba95c25e37911bffb3
Author: Sindhu S <sindhus live in>
Date:   Fri Feb 15 17:57:07 2013 +0530

    Help: Fixed overview.page.
    
    Due to previous clashes in stashing and unstashing changes, git
    had auto inserted changes and indicated them with text "Upstream
    Changes" in the file. Cleaned them.
    
    Organized review notes into TODOs.

 help/C/overview.page |   45 ++++++++++++++++++++++++---------------------
 1 files changed, 24 insertions(+), 21 deletions(-)
---
diff --git a/help/C/overview.page b/help/C/overview.page
index 4265dbe..b15d3ed 100644
--- a/help/C/overview.page
+++ b/help/C/overview.page
@@ -21,22 +21,18 @@
 
   <title>Overview of a terminal</title>
 
-<!-- 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 terminal is a text input point in a computer also called the Command 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>
 
   <terms>
     <item>
+      <title>VTE</title>
+      <p><!---What is VTE? --></p>
+      <p><!--What is the connection between a terminal and a shell?--></p>
+    </item>
+    <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
@@ -44,23 +40,30 @@
     </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 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>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>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>
+      <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>
+      <p><!--TODO: Write about escape sequences.--></p>
     </item>
     <item>
       <title>Emulators</title>
-      <p><!-- What are emulators, what can a user expect from them --></p>
+      <p><!--TODO: What are emulators, what can a user expect from them.--></p>
     </item>
   </terms>
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]