From ee255aac275892c2bb07c90f7fd8010a52133c4f Mon Sep 17 00:00:00 2001
From: bevilj <bevilj@usi.ch>
Date: Wed, 14 Nov 2018 08:56:17 +0000
Subject: [PATCH] code review fpr basic and advanced pages

git-svn-id: svn+ssh://atelier.inf.usi.ch/home/bevilj/group-1@169 a672b425-5310-4d7a-af5c-997e18724b81
---
 site/pages/cmd/advanced/echo.html          |  37 +--
 site/pages/cmd/advanced/grep.html          |  65 ++--
 site/pages/cmd/advanced/nl.html            |  63 ++--
 site/pages/cmd/advanced/pipes.html         |  33 +-
 site/pages/cmd/advanced/tr.html            |  75 +++--
 site/pages/cmd/basic/closeshell.html       |  17 +-
 site/pages/cmd/basic/more-less.html        |   4 +-
 site/pages/cmd/basic/open.html             |   4 +-
 site/pages/cmd/basic/openshell.html        |   4 +-
 site/pages/cmd/basic/terminal-toolbar.html | 368 +++++++++------------
 site/pages/cmd/interm/git.html             |   4 +-
 11 files changed, 319 insertions(+), 355 deletions(-)

diff --git a/site/pages/cmd/advanced/echo.html b/site/pages/cmd/advanced/echo.html
index 04cc2ef..9da0e82 100644
--- a/site/pages/cmd/advanced/echo.html
+++ b/site/pages/cmd/advanced/echo.html
@@ -7,31 +7,18 @@ tags: echo calculator print
 title: echo
 ---
 
+<p>
+In computing, <code>echo</code> is a command in Unix operating systems that outputs the
+strings it is being passed as arguments.<br>
 
+It is a command typically used to output status text to the screen or a
+computer file, or as a source part of a pipeline.<br>
 
+To use this simple command just type "echo" with the topic we want to
+print. The computer will return your argument as a string
 
-
-
-<p> In computing, echo is a command in Unix operating systems that outputs the
-  strings it is being passed as arguments. <br>
-  It is a command typically used in
-  shell scripts and batch files to output status text to the screen or a
-  computer file, or as a source part of a pipeline.</p>
-<br>
-   <h3>How to use</h3>
-
-     <p> To use this simple command just type "echo" with the topic we want to
-        print. The computer will return your argument as a string, for example,
-        <pre><code> echo  hello world</pre></code>
-        will return hello world.
-     </p>
-
-<br>
-
-   <h3>Skills</h3>
-   <br>
-   <ul>
-     <li><h4>bc:</h4> It permits you to make arithmetic calculation
-       through the terminal using this format:
-       <pre><code> echo 12+4 | bc</code></pre>
-       will return 16.</li>
+<pre>
+echo  "hello world"
+    hello world
+</pre>
+</p>
diff --git a/site/pages/cmd/advanced/grep.html b/site/pages/cmd/advanced/grep.html
index 1d906e7..c74d17d 100644
--- a/site/pages/cmd/advanced/grep.html
+++ b/site/pages/cmd/advanced/grep.html
@@ -3,11 +3,16 @@ layout: page
 author: Domenico Votta
 category-page: advanced
 category-title: Advanced commands
-tags: search for occurences
+tags: search for occurencies
 title: grep
 ---
-<p>The <code>grep</code>  is a command that permits to search occurences of a keyword or more in a file or more. Through some flags you can decide the search criteria. The command grep is case sensitive (robot is different from Robot), but we will see how to ignore it</p>
-Here we have two files named <code>example1.txt</code> and <code>example2.txt</code> that contain 5 elements, to test this command:
+<p>The <code>grep</code>  is a command that permits to search occurences of a
+keyword or more in a file or more. Through some flags you can decide the search criteria.
+The command grep is case sensitive (robot is different from Robot), but we will see how
+to ignore it.<br>
+
+Here we have two files named <code>example1.txt</code> and
+<code>example2.txt</code> that contain 5 elements, to test this command:
 
 <code>example1.txt</code>
 {% highlight bash linenos %}
@@ -31,50 +36,56 @@ The syntax command is:
 <pre>grep [flag] [keyword] [file]</pre>
 You can put different flags together to refine the search.
 
-{% highlight ruby linenos %}
+<pre>
 grep Robot example1.txt example2.txt (if you write robot you won't have the correspondence.)
-example1.txt: Robot
-example2.txt: Robot
-{% endhighlight %}
-<p>Your output will be this because grep found the keyword Robot in both files</p>
+    example1.txt: Robot
+    example2.txt: Robot
+</pre>
+
+Your output will be this because grep found the keyword Robot in both files
 
 <h2>Flags</h2>
-<p>Here a list that contains the main flags of these command:
+Here a list that contains the main flags of these command:
 
 <ul>
-  <li> <b>-i</b>: this flag ignore the case sensitive. Here we can write Robot or robot that grep will find the correspondence. </li>
+    <li> <b>-i</b>: this flag ignore the case sensitive. Here we can write Robot or
+        robot that grep will find the correspondence.
 <pre>
 grep -i robot example1.txt example2.txt
-example1.txt: Robot
-example2.txt: Robot
+    example1.txt: Robot
+    example2.txt: Robot
 </pre>
+    </li>
 
-  <li> <b>-v</b>: this flag ignore the keyword from the search. </li>
+    <li> <b>-v</b>: this flag ignore the keyword from the search.
 <pre>
 grep -i -v robot example1.txt example2.txt
-example1.txt:Car
-example1.txt:Computer
-example1.txt:Smartphone
-example1.txt:Videogame
-example2.txt:Apple
-example2.txt:Computer
-example2.txt:Microsoft
-example2.txt:Huawei
+    example1.txt:Car
+    example1.txt:Computer
+    example1.txt:Smartphone
+    example1.txt:Videogame
+    example2.txt:Apple
+    example2.txt:Computer
+    example2.txt:Microsoft
+    example2.txt:Huawei
 </pre>
+    </li>
 
-  <li> <b>-c</b>: this flag indicates the number of times that the keyword appears in the file. </li>
+    <li> <b>-c</b>: this flag indicates the number of times that the keyword appears in the file.
 <pre>
 grep -i -c robot example1.txt
-1
+    1
 </pre>
-<p> If in the file you would have had two times the keyword Robot, the output would have been 2</p>
+    (If in the file you would have had two times the keyword Robot, the output would have been 2)
+    </li>
 
-<li> <b>-h</b>: Remove from the output the file name where it found the keyword</li>
+    <li> <b>-h</b>: Remove from the output the file name where it found the keyword
 <pre>
 grep -i -h apple example1.txt example2.txt
-Apple
+    Apple
 </pre>
-<p>How you can see the output doesn't show tha file name <code>example2.txt</code></p>
+    How you can see the output doesn't show tha file name <code>example2.txt</code>
+    </li>
 </ul>
 
 </p>
diff --git a/site/pages/cmd/advanced/nl.html b/site/pages/cmd/advanced/nl.html
index 2b3cb7c..652337b 100644
--- a/site/pages/cmd/advanced/nl.html
+++ b/site/pages/cmd/advanced/nl.html
@@ -6,8 +6,12 @@ category-title: Advanced commands
 tags: number lines count
 title: nl
 ---
-<p>The <code>nl</code>  is a command that permits to number the lines. Through some flags you can decide how to filter this command.</p>
+<p>
+The <code>nl</code> is a command that permits to number the lines.
+Through some flags you can decide how to filter this command.<br>
+
 We have a file named <code>example.txt</code> that contains 5 elements, to test this command:
+
 {% highlight bash linenos %}
 Car
 Computer
@@ -21,49 +25,52 @@ The syntax command is:
 
 <pre>
 nl example.txt
- 1  Car
- 2  Computer
- 3  Robot
- 4  Smartphone
- 5  Videogame
+    1  Car
+    2  Computer
+    3  Robot
+    4  Smartphone
+    5  Videogame
 </pre>
-<p>How you can see the command has numbered the lines.</p>
+
+How you can see the command has numbered the lines.
 
 <h2>Flags</h2>
 
-<p>Here a list that contains the main flags of these command:
 <ul>
-
-  <li> <b>-b</b>: Specify the lines to be numered </li>
+    <li> <b>-b (regex)</b>: Specify the lines to be numered
 <pre>
 nl -b p^[cv] example.txt
-   1  Car
-   2  Computer
-   3  Videogame
-      Robot
-      Smartphone
+    1  Car
+    2  Computer
+    3  Videogame
+       Robot
+       Smartphone
 </pre>
-  <p> <code>p^[cv]</code> says to nl to number only the lines that start with c and v.</p>
+    <code>p^[cv]</code> says to nl to number only the lines that start with c and v.
+    </li>
 
-  <li> -b<b>n</b>: The flag n goes with b, doesn't number any lines </li>
+    <li> -b<b>n</b>: The flag n goes with b, doesn't number any lines
 <pre>
 nl -bn example.txt
-     Car
-     Computer
-     Videogame
-     Robot
-     Smartphone
+    Car
+    Computer
+    Videogame
+    Robot
+    Smartphone
 </pre>
+    </li>
 
-  <li> <b>-s</b>: Usually nl separes the number of the line from the text with a tab, with -s flag you can choose another separator, in this example we will use "=". </li>
+  <li> <b>-s</b>: Usually nl separes the number of the line from the text with a tab, with -s
+      flag you can choose another separator, in this example we will use "=".
 <pre>
 nl -s= example.txt
-   1=Car
-   2=Computer
-   3=Videogame
-   4=Robot
-   5=Smartphone
+    1=Car
+    2=Computer
+    3=Videogame
+    4=Robot
+    5=Smartphone
 </pre>
+    </li>
 
 </ul>
 </p>
diff --git a/site/pages/cmd/advanced/pipes.html b/site/pages/cmd/advanced/pipes.html
index 037a057..cf1b903 100644
--- a/site/pages/cmd/advanced/pipes.html
+++ b/site/pages/cmd/advanced/pipes.html
@@ -7,22 +7,35 @@ tags: pipes redirect output input
 title: pipes
 ---
 
-<p>The <code>pipes</code> that in the shell are representend with the symbol | , they are used to join two commands on the terminal, taking the output of the first command and using it as input of the second. </p>
-<p> It is usually common to see the command grep and ps together, an example below.</p>
+<p>
+The <code>pipes</code> that in the shell are representend with the symbol | ,
+they are used to join two commands on the terminal, taking the output of the first
+command and using it as input of the second.<br>
+It is usually common to see the command <code>grep</code> and <code>ps</code> together,
+an example below.<br>
 
+Example: lists all processes with your username
 <pre>
 ps aux | grep user
 </pre>
-<p>Lists all processes with your username</p>
 
+Example: count the lines of a file, using the
+<a href="{{ site.baseurl }}/pages/cmd/advanced/nl.html">nl</a> command
 <pre>
 cat example1.txt | nl
-  1  Car
-  2  Computer
-  3  Robot
-  4  Smartphone
-  5  Videogame
+    1  Car
+    2  Computer
+    3  Robot
+    4  Smartphone
+    5  Videogame
 </pre>
-<p>In this example you send this output to another process, in this case, the <a href="{{ site.baseurl }}/pages/cmd/advanced/nl.html">nl</a> </p>
 
-<p>You can use the commands that you learned and put them together, always respecting the logic of the command.</p>
+Example: passing expressions to <a href="{{ site.baseurl }}/pages/cmd/advanced/bc.html">bc</a>
+to do calculations
+<pre>
+echo "(12 / 2 - 3) * 3 + 1.5" | bc
+    10.5
+</pre>
+
+You can use the commands that you learned and put them together, always
+respecting the logic of the command.
diff --git a/site/pages/cmd/advanced/tr.html b/site/pages/cmd/advanced/tr.html
index dd0825f..450ba2e 100644
--- a/site/pages/cmd/advanced/tr.html
+++ b/site/pages/cmd/advanced/tr.html
@@ -7,42 +7,49 @@ tags: translate
 title: tr
 ---
 
+<p>
+The <code>tr</code> command in Unix-like operating systems, which name stands for
+<i>TRanslate</i> or <i>TRansliterate</i>, indicating its operation of replacing or removing
+specific characters in its input data set.
+
+<h3>How to use</h3>
+
+The utility reads a byte stream from its standard input and writes the
+result to the standard output. As arguments, it takes two sets of
+characters (generally of the same length), and replaces occurrences of
+the characters in the first set with the corresponding elements from the
+second set.<br>
+
+For example,
+<pre>
+tr 'abcd' 'jkmn'
+</pre>
+
+would maps all characters a to j, b to k, c to m, and d to n.<br>
+The character set may be abbreviated by using character ranges. The
+previous example could be also written as:
+
+<pre>
+tr 'a-d' 'jkmn'
+</pre>
 
 
-
-
-<p> tr is a command in Unix-like operating systems. It is an abbreviation of
-   translate or transliterate, indicating its operation of replacing or removing
-   specific characters in its input data set.</p>
-
-   <h3>How to use</h3>
-
-     <p> The utility reads a byte stream from its standard input and writes the
-       result to the standard output. As arguments, it takes two sets of
-       characters (generally of the same length), and replaces occurrences of
-       the characters in the first set with the corresponding elements from the
-       second set. For example,
-     </p>
-
-       <pre> <code>tr 'abcd' 'jkmn'</code></pre>
-       <p> maps all characters a to j, b to k, c to m, and d to n.</p>
-       <p> The character set may be abbreviated by using character ranges. The
-         previous example could be written: </p>
-
-         <pre> tr 'a-d' 'jkmn' </pre>
-
-
-   <h3>Flags</h3>
-   <ul>
-     <li><h4> -s:</h4> The s flag causes tr to compress sequences of identical
-       adjacent characters in its output to a single token.
-       <pre> tr -s '\n'</pre>
-       replaces sequences of one or more newline characters with a single
-       newline.</li>
-
-      <li><h4> -d</h4>:The d flag causes tr to delete all tokens of the specified
+<h3>Flags</h3>
+<ul>
+    <li> <b>-s</b>: The s flag causes tr to compress sequences of identical
+        adjacent characters in its output to a single token.
+<pre>
+tr -s '\n'
+</pre>
+        replaces sequences of one or more newline characters with a single
+        newline.
+    </li>
+    <li> <b>-d</b>: The d flag causes tr to delete all tokens of the specified
         set of characters from its input. In this case, only a single character
         set argument is used. The following command removes carriage return
         characters.
-        <pre>tr -d '\r'</pre>
-        </li>
+<pre>
+tr -d '\r'
+</pre>
+    </li>
+</ul>
diff --git a/site/pages/cmd/basic/closeshell.html b/site/pages/cmd/basic/closeshell.html
index 17c189f..fc56659 100644
--- a/site/pages/cmd/basic/closeshell.html
+++ b/site/pages/cmd/basic/closeshell.html
@@ -8,9 +8,16 @@ title: Closing the shell
 <!--next-page: pages/cmd/basic/ --> <!-- The sequence must be defined -->
 ---
 
-<h2> Close </h2>
+<p>
+If you want to close the shell session, there are several ways to do so:
 
-<p> If you want to close the shell session, all you have to do is press <code> ^ (control) + D.</code>
-Apply the change and save the session.
-After closing the session, the screen is still visible but the program does not allow you to type a new command.
-To continue using the shel all you need to do is quit the terminal and reopen the application </p>
+<ul>
+    <li>Press <code>^ (control) + D</code>. Although this key combination closes the shell,
+        it doesn't quit the terminal application as it just saves and closes the current session.
+        A closed session does not allow any input or output anymore.
+    </li>
+    <li>Insert the <code>exit</code> command. Unlike the mentioned key combo, exit also quits
+        the terminal application itself.
+    </li>
+</ul>
+</p>
diff --git a/site/pages/cmd/basic/more-less.html b/site/pages/cmd/basic/more-less.html
index 3f39ee7..0dc0694 100644
--- a/site/pages/cmd/basic/more-less.html
+++ b/site/pages/cmd/basic/more-less.html
@@ -55,9 +55,9 @@ Such commands must be used once the file has been displayed.
 They are not. For a single operation there can be multiple commands. </p>
 
 <ul>
-    <li><code>  g  <  ESC-<   </code>:
+    <li><code>  g  <  ESC-&lt;   </code>:
         Go to line N, by default 1, if N is not specified.</li>
-    <li><code> G  >  ESC-> </code>:
+    <li><code> G  >  ESC-&gt; </code>:
         Go to line N, by default the last one , if N is not specified.</li>
     <li><code>  t </code>:
         Go to the (N-th) next tag. </li>
diff --git a/site/pages/cmd/basic/open.html b/site/pages/cmd/basic/open.html
index 1e02af7..76c6dfa 100644
--- a/site/pages/cmd/basic/open.html
+++ b/site/pages/cmd/basic/open.html
@@ -35,7 +35,7 @@ open -a preview Desktop/abc.pdf
 </pre>
 
 As result, a new <i>Preview</i> window appears showing the content of the
-chosen file.<br><br>
+chosen file.<br>
 
 <h3>Open the folder which contains the file</h3>
 If you want to open the folder that contains a specific file, just use
@@ -54,7 +54,7 @@ the file you want to open.
 
 <pre>
 open -t Desktop/text.txt
-</pre><br>
+</pre>
 
 <h3>Visit a Website</h3>
 You can use this tool not only to open files and folders, but also webpages.
diff --git a/site/pages/cmd/basic/openshell.html b/site/pages/cmd/basic/openshell.html
index b84e6bf..a8d89a9 100644
--- a/site/pages/cmd/basic/openshell.html
+++ b/site/pages/cmd/basic/openshell.html
@@ -7,9 +7,9 @@ author: Gianmarco De Vita
 title: Open the Shell
 next-page: pages/cmd/basic/open.html
 ---
-
+<p>
 The tool that allows us to interact with the system with the shell is the terminal.
-There are mainly two ways to access to the terminal on a MacOS system.</p>
+There are mainly two ways to access to the terminal on a MacOS system.
 
 <h3>Through the Finder</h3>
 
diff --git a/site/pages/cmd/basic/terminal-toolbar.html b/site/pages/cmd/basic/terminal-toolbar.html
index 069f4bb..de1ddee 100644
--- a/site/pages/cmd/basic/terminal-toolbar.html
+++ b/site/pages/cmd/basic/terminal-toolbar.html
@@ -2,248 +2,180 @@
 layout: page
 tags: toolbar
 author: Marzio Lunghi
-title: Terminal's toolbar
+title: MacOS terminal toolbar
 <!--next-page: pages/cmd/basic/ --> <!-- The sequence must be defined -->
 ---
 
 <p>
-Once the Terminal has been opened, a menu bar will appear exactly in the upper left corner of the screen.
-This menu contains some preferences that could improve the user experience and use of the Terminal.
+Once the MacOS Terminal app has been opened, a menu bar will appear exactly in the upper
+left corner of the screen. This menu contains some preferences that could improve the user
+experience and use of the Terminal.<br>
 The menu is divided into 6 sections that I will describe briefly to give you a basic knowledge
-that could be very useful once you have become familiar with the program.<br>
+that could be very useful once you have become familiar with the program.
 
-<li><h3> Terminal </h3></li>
+<h3>Terminal</h3>
 
- <ul>
-    <img src="" alt="Terminal section" height="">
+<img src="" alt="Terminal section" height="">
 
-      <li> <h4> Secure Keyboard Entry </h4>
-      </li>
-        <p> Inside the Terminal section you will find the item “secure Keyboard Entry”, this tool allows the user to enable an additional system security.
-            Essentially, this option prevents other Application from seeing what you are typing on the shell.
-            It also prevents processes that are working in background from monitoring your keystrokes.
-            In a first moment it seems that it doesn’t do anything, that’s because for people who works on their own personal computer, this additional secure becomes an unnecessary precaution.
-            However, this option could be very useful if you using an unknown computer or a public computer.
-      <li> <h4> Hide Terminal </h4>
-      </li>
-        <p> Although Shell’s window does not occupy a lot of space, it is possible to hide the window by pressing ⌘ + H . </p>
-      <li> <h4> Hide Others </h4>
-      </li>
-        <p> In the other hand, it’s possible to hide all the others windows (except the Terminal) by pressing  ⌥ + ⌘ + H . </p>
-      <li> <h4> Quit Terminal </h4>
-      </li>
-        <p> Once you have finished working with the Terminal, you can definitely close it by pressing  ⌘ + Q . </p>
-      <li> <h4> Preferences </h4>
-      </li>
-        <p> ... </p>
+<ul>
+    <li><b>Secure Keyboard Entry</b>:
+        Inside the Terminal section you will find the item “secure Keyboard Entry”, this tool
+        allows the user to enable an additional system security.<br>
+        Essentially, this option prevents other Application from seeing what you are
+        typing on the shell.<br>
+        It also prevents processes that are working in background from
+        monitoring your keystrokes.<br>
+        In a first moment it seems that it doesn’t do anything, that’s because for
+        people who works on their own personal computer, this additional secure may
+        become an unnecessary precaution.<br>
+        However, this option could be very useful if you using an unknown computer
+        or a public computer.
+    </li>
+    <li><b>Hide terminal</b>:
+        Although Shell’s window does not take a lot of space, it is possible to hide
+        the window by pressing <code>⌘ + H</code>.
+    </li>
+    <li><b>Hide Others</b>:
+        In the other hand, it’s possible to hide all the others windows (except the Terminal) by
+        pressing  <code>⌥ + ⌘ + H</code>.
+    </li>
+    <li><b>Quit Terminal</b>:
+        Once you have finished working with the Terminal, you can definitely close it by
+        pressing  <code>⌘ + Q</code>.
+    </li>
 </ul>
 
-<li><h3> Shell    </h3></li>
-  <ul>
-       <img src="" alt="Shell section" height="">
+<h3>Shell</h3>
 
-      <li> <h4> New Window </h4>
-      </li>
-        <p> It creates a new window </p>
-      <li> <h4> New Tab </h4>
-      </li>
-        <p> It creates a new tab </p>
-      <li> <h4> Import </h4>
-      </li>
-        <p> ... </p>
-      <li> <h4> Close window </h4>
-      </li>
-        <p> This option close the window without quitting the terminal </p>
-      <li> <h4> Show Inspector </h4>
-      </li>
-        <p> This option allows the user to customise the layout of the shell. This option contains some profiles that you can use instead of spending time to create your own one.
-            This option is not permanent, once the terminal has been quitted, the shell is set with the default settings. </p>
-      <li> <h4> Edit Title </h4>
-      </li>
-        <p> This options shows the inspector too, but it selects the current title that you want to change. </p>
-      <li> <h4> Edit Background Colour </h4>
-      </li>
-        <p> This options shows some useful tools to customise the background of the shell. </p>
-      <li> <h4> Reset </h4>
-      </li>
-        <p> This option re-initializes the terminal.
-            /ref/ </p>
-      <li> <h4> Hard Reset </h4>
-      </li>
-        <p> This option re-initialize completely the terminal
-            /ref/ </p>
-      <li> <h4> Print Selection </h4>
-      </li>
-        <p> This option allows the user to print only a selection of the shell.
-The text must be selected by holding down the touchpad and then moving the mouse cursor. </p>
-      <li> <h4> Print  </h4>
-      </li>
-        <p> This options prints all the content of the shell </p>
+<img src="" alt="Shell section" height="">
+
+  <ul>
+    <li><b>New Window</b>: It creates a new window.</li>
+    <li><b>New Tab</b>: It creates a new tab</li>
+    <li><b>Close window</b>: This option closes the window without quitting the terminal.</li>
+    <li><b>Show Inspector</b>:
+        This option allows the user to customise the layout of the shell.
+        This option contains some profiles that you can use instead of spending
+        time to create your own one.<br>
+        This option is not permanent, once the terminal has been quitted, the shell is set
+        with the default settings.
+    </li>
+
+    <li><b>Edit Title</b>:
+        This options shows the inspector too, but it selects the current title that
+        you want to change
+    </li>
+    <li><b>Edit Background Colour</b>:
+        This options shows some useful tools to customise the background of the shell.
+    </li>
+    <li><b>Reset</b>: This option re-initializes the terminal.</li>
+    <li><b>Hard Reset</b>: This option re-initialize completely the terminal.</li>
+    <li><b>Print Selection</b>:
+        This option allows the user to print only a selection of the shell.
+        The text must be selected by holding down the touchpad and then moving the mouse cursor.
+    </li>
+    <li><b>Print</b>: This options prints all the content of the shell.</li>
   </ul>
 
-<li><h3> Edit     </h3></li>
-<ul>
-      <img src="" alt="Edit section" height="">
+<h3>Edit</h3>
 
-      <li> <h4> Undo </h4>
-      </li>
-        <p> ... </p>
-      <li> <h4> Redo </h4>
-      </li>
-        <p> ... </p>
-      <li> <h4> Cut </h4>
-      </li>
-        <p> Traditionally, the cut command was designed to move texts within applications, but, according to the Mac user community, it’s not very intuitive.
-            There is a much easier alternative way, the copy and paste, known as ⌘ + C (copy) and ⌘ + V (paste). </p>
-      <li> <h4> Copy </h4>
-      </li>
-        <p> It copies a selected text </p>
-      <li> <h4> Copy Special </h4>
-      </li>
-        <p> It copy a selected text by giving you more options.
-            For example, if you have a black background, copy special allows you to copy a selected file without considering the colour of the background. </p>
-      <li> <h4> Paste </h4>
-      </li>
-        <p> It paste a previously copied text. </p>
-      <li> <h4> Paste Escaped Text </h4>
-      </li>
-        <p> If you want to copy a text with special symbols, precisely code text, you have to use paste escaped text to maintain the text intact and not have characters interpreted as code. </p>
-      <li> <h4> Paste Selection </h4>
-      </li>
-        <p> ... </p>
-      <li> <h4> Select All </h4>
-      </li>
-        <p> It selects all the content of the shell. </p>
-      <li> <h4> Select Between Marks </h4>
-      </li>
-        <p> It select a portion of the text between marks </p>
-      <li> <h4> Clear to Previous Mark  </h4>
-      </li>
-        <p> Delete the last command and its content </p>
-      <li> <h4> Clear to Start </h4>
-      </li>
-        <p> Delete all the content up to the start.
-            /ref/ </p>
-      <li> <h4> Clear Scrollback </h4>
-      </li>
-        <p> It delete all the not visible content. </p>
-      <li> <h4> Clear Screen </h4>
-      </li>
-        <p> It delete all the visible content on the screen. </p>
-      <li> <h4> Find </h4>
-      </li>
-        <p> It allows the user to find portions of text or words that matches with the inserted one. </p>
+<img src="" alt="Edit section" height="">
+
+<ul>
+    <li><b>Undo</b>: Undo the last input action.</li>
+    <li><b>Redo</b>: Redo the last undone input action.</li>
+    <li><b>Cut</b>:
+        Traditionally, the cut command was designed to move texts within applications, but,
+        according to the Mac user community, it’s not very intuitive.<br>
+        There is a much easier alternative way, the copy and paste,
+        known as <code>⌘ + C</code> (copy) and <code>⌘ + V</code> (paste).
+    <li><b>Copy</b>: Copy the selected text.</li>
+    <li><b>Copy Special</b>:
+        It copy a selected text by giving you more options.
+        For example, if you have a black background, copy special allows you to copy a
+        selected file without considering the colour of the background
+    </li>
+    <li><b>Paste</b>: Past the text from the system clipboard.</li>
+    <li><b>Paste Escaped Text</b>:
+        If you want to copy a text with special symbols, precisely code text,
+        you have to use paste escaped text to maintain the text intact and not have characters
+        interpreted as code.
+    </li>
+    <li><b>Select All</b>: It selects all the content of the shell.</li>
+    <li><b>Select Between Marks</b>: It selects a portion of the text between marks.</li>
+    <li><b>Clear to Previous Mark</b>: Delete the last command and its contents.</li>
+    <li><b>Clear to Start</b>: Delete all the content up to the start.</li>
+    <li><b>Clear Scrollback</b>: It deletes all the not visible content.</li>
+    <li><b>Clear Screen</b>: It deletes all the visible content on the screen.</li>
+    <li><b>Find</b>:
+        It allows the user to find portions of text or words that matches with the inserted one.
+    </li>
 </ul>
 
-<li><h3> View     </h3></li>
+<h3>View</h3>
+
+<img src="" alt="View section" height="">
+
  <ul>
-      <img src="" alt="View section" height="">
-
-      <li> <h4> Show All Tabs </h4>
-      </li>
-        <p> It shows all tabs that you created, if no one has been created it will show only the current one. </p>
-      <li> <h4> Show Tab Bar </h4>
-      </li>
-        <p> It shows you a tab bar with all the tabs created, this option is automatically enabled when you select “New Tab” under Shell section. </p>
-      <li> <h4> Hide Marks </h4>
-      </li>
-        <p> . . . </p>
-      <li> <h4> Show Alternate Screen </h4>
-      </li>
-        <p> It creates an alternate screen. </p>
-      <li> <h4> Hide Alternate Screen </h4>
-      </li>
-        <p> Disable the option “Show Alternate Screen”. </p>
-      <li> <h4> Allow Mouse Reporting </h4>
-      </li>
-        <p> It means that mouse clicks will be visible to whatever is reading the terminal, the position and click will be encoded and used by Text mode mouse-aware applications with standards permissions.</p>
-      <li> <h4> Split Pane  </h4>
-      </li>
-        <p> It split every window in two windows </p>
-      <li> <h4> Close Split pane </h4>
-      </li>
-        <p> It closes all the windows created with the command “Split pane” </p>
-      <li> <h4> Default Font Size </h4>
-      </li>
-        <p> It set up default font size, if the size has been increased or decreased. </p>
-      <li> <h4> Bigger  </h4>
-      </li>
-        <p> It makes the font bigger. </p>
-      <li> <h4> Smaller </h4>
-      </li>
-        <p> It makes the font smaller. </p>
-      <li> <h4> Scroll to Top </h4>
-      </li>
-        <p> Scroll to the top, at the start. </p>
-      <li> <h4> Scroll to Bottom </h4>
-      </li>
-        <p> Scroll to the bottom, at the end. </p>
-      <li> <h4> Page Up</h4>
-      </li>
-        <p> It scroll up to the previous page. </p>
-      <li> <h4> Page Down </h4>
-      </li>
-        <p> It scroll down to the next page. </p>
-      <li> <h4> Line Up </h4>
-      </li>
-        <p> It scroll up to one line. </p>
-      <li> <h4> Line Down </h4>
-      </li>
-        <p> It scroll down to one line. </p>
-      <li> <h4> Enter Full Screen </h4>
-      </li>
-        <p> Full screen </p>
-
-
+    <li><b>Show All Tabs</b>:
+        It shows all tabs that you created, if no one has been created it will
+        show only the current one.
+    </li>
+    <li><b>Show Tab Bar</b>:
+        It shows you a tab bar with all the tabs created, this option is
+        automatically enabled when you select “New Tab” under Shell section.
+    </li>
+    <li><b>Show Alternate Screen</b>: It creates an alternate screen.</li>
+    <li><b>Hide Alternate Screen</b>: Disable the option “Show Alternate Screen”.</li>
+    <li><b>Allow Mouse Reporting</b>:
+        It means that mouse clicks will be visible to whatever is reading the terminal,
+        the position and click will be encoded and used by Text mode mouse-aware
+        applications with standards permissions
+    </li>
+    <li><b>Split Panel</b>: It split every window in two windows</li>
+    <li><b>Close Split panel</b>: It closes all the windows created with the "Split panel"</li>
+    <li><b>Default Font Size</b>:
+        It set up default font size, if the size has been increased or decreased.
+    </li>
+    <li><b>Bigger</b>: It makes the font bigger.</li>
+    <li><b>Smaller</b>: It makes the font smaller.</li>
+    <li><b>Scroll to Top</b>: Scroll to the top, at the start.</li>
+    <li><b>Scroll to Bottom</b>: Scroll to the bottom, at the end.</li>
+    <li><b>Page Up</b>: It scroll up to the previous page.</li>
+    <li><b>Page Down</b>: It scroll down to the next page.</li>
+    <li><b>Line Up</b>: It scroll up to one line.</li>
+    <li><b>Line Down</b>: It scroll down to one line.</li>
+    <li><b>Enter Full Screen</b>: It makes the window fulls screen.</li>
 </ul>
 
-<li><h3> Window   </h3></li>
+<h3>Window</h3>
+
+<img src="" alt="Window section" height="">
+
 <ul>
-     <img src="" alt="Window section" height="">
-
-    <li> <h4> Minimise </h4>
+    <li><b>Minimise</b>: It reduces the terminal to an icon.</li>
+    <li><b>Zoom</b>:
+        It increases the size of the window.
+        By default the size is set up to 80 x 24.
     </li>
-      <p> It reduces the terminal to an icon. </p>
-    <li> <h4> Zoom </h4>
-    </li>
-      <p> It increases the size of the window.
-          By default the size is set up to 80 x 24.</p>
-    <li> <h4> Cycle Trough Windows </h4>
-    </li>
-      <p> It switches between open windows. </p>
-    <li> <h4> Show Previous Tab  </h4>
-    </li>
-      <p> It shows previous tab, if created. </p>
-    <li> <h4> Show Next Tab </h4>
-    </li>
-      <p> It shows next tab, if created. </p>
-    <li> <h4> Move Tab to New Window </h4>
-    </li>
-      <p> It moves a tab to a new window. </p>
-    <li> <h4> Marge All Windows  </h4>
-    </li>
-      <p> It takes all the windows and moves them to Tabs. </p>
-    <li> <h4> Return to Default Size </h4>
-    </li>
-      <p> It returns to default size of the window (80 x 24). </p>
-    <li> <h4> Bring All to Font </h4>
-    </li>
-      <p> ... </p>
-
+    <li><b>Cycle Trough Windows</b>: It switches between open windows</li>
+    <li><b>Show Previous Tab</b>: It shows previous tab, if any</li>
+    <li><b>Show Next Tab</b>: It shows next tab, if any.</li>
+    <li><b>Move Tab to New Window</b>: It moves a tab to a new window.</li>
+    <li><b>Merge All Windows</b>: It takes all the windows and moves them to Tabs.</li>
+    <li><b>Return to Default Size</b>: It returns to default size of the window (80 x 24).</li>
 </ul>
 
-<li><h3> Help     </h3></li>
+<h3>Help</h3>
+
+<img src="" alt="Help section" height="">
+
 <ul>
-     <img src="" alt="Help section" height="">
-
-    <li> <h4> Terminal Help </h4>
+    <li><b>Terminal Help</b>:
+        It opens a useful guide that show you how familiarize with Terminal.
     </li>
-      <p> It opens a useful guide that show you how familiarize with Terminal. </p>
-    <li> <h4> Open man Page for selection </h4>
+    <li><b>Open man Page for selection</b>:
+        Instead of digit man on the shell you can simply select the command and click on this option.
+        It will give you back an external manual page with all the descriptions
     </li>
-      <p> Instead of digit man on the shell you can simply select the command and click on this option.
-          It will give you back an external manual page with all the descriptions. </p>
-
-
 </ul>
-</ol>
diff --git a/site/pages/cmd/interm/git.html b/site/pages/cmd/interm/git.html
index d427b91..c10e33d 100644
--- a/site/pages/cmd/interm/git.html
+++ b/site/pages/cmd/interm/git.html
@@ -2,7 +2,7 @@
 layout: page
 category-title: Intermediate commands
 category-page: intermediate
-tags: 
+tags:
 author: Andrea Brites Marto
 title: git
 ---
@@ -53,4 +53,4 @@ title: git
 		<li>-pull: fetch from and update your local directory with the repository.</li>
 		<li>-push: update the remote repository with your changes.</li>
 	</ul>
-</p>
\ No newline at end of file
+</p>