Merge branch 'master' of https://github.com/FOSSEE/sdes-stscripts

2 files changed, 48 insertions, 34 deletions

diff --git a/ult/ult_6/script.rst b/ult/ult_6/script.rst
index 020f3a6..0cb3c7b 100644
--- a/ult/ult_6/script.rst
+++ b/ult/ult_6/script.rst
@@ -11,7 +11,7 @@
 
 ..   1. Getting started with Linux
 ..   2. Basic File Handling
-..   4. Advanced file handling
+
  
 Script
 ------
@@ -24,7 +24,7 @@ team along with the logo of MHRD }}}
 .. R1
 
 Hello friends and Welcome to the tutorial on 
-'Redirection and Piping'.
+'Features of the Shell'.
 
 .. L2
 
@@ -44,7 +44,7 @@ At the end of this tutorial, you will be able to,
 .. R3
 
 Before beginning this tutorial,we would suggest you to complete the 
-former tutorials as being displayed currently.
+previous tutorials as being displayed currently.
 
 .. L4
 
@@ -73,12 +73,12 @@ latter one, hitting the tab key a second time, will list the possibilities.
 
 Bash provides tab completion for the following.
 
-        File Names
-        Directory Names
-        Executable Names
-        User Names (when they are prefixed with a ~)
-        Host Names (when they are prefixed with a @)
-        Variable Names (when they are prefixed with a $)
+- File Names
+- Directory Names
+- Executable Names
+- User Names (when they are prefixed with a ~)- tilde
+- Host Names (when they are prefixed with a @)- at sign
+- Variable Names (when they are prefixed with a $)- dollar sign
 
 .. R6
 
@@ -127,7 +127,7 @@ command directives. The shell meta characters are recognized anywhere they
 appear in the command line, even if they are not surrounded by blank space. 
 For that reason, it is safest to only use the characters A-Z, a-z, 0-9, and 
 the period, dash, and underscore characters when naming files and directories
- on Unix. If your file or directory has a shell meta character in the name, 
+on Unix. If your file or directory has a shell meta character in the name, 
 you will find it difficult to use the name in a shell command.
 
 The characters that you see on the slide are the shell meta characters
@@ -147,8 +147,8 @@ Let's take an example,
 
 .. R11
 
-It means, run on a directory containing the files file, file.c, file.lst, and 
-myfile would list the files file.c and file.lst. However,
+It means, run on a directory containing the files - file.c, file.lst, and 
+file.txt. However,
 
 .. L11
 
@@ -158,28 +158,27 @@ myfile would list the files file.c and file.lst. However,
 
 .. R12
 
-Run on the same directory would only list file.c because the ? only 
-matches  one character, no more, no less. This can save you a great deal of 
-typing time.
+Run on the same directory would only list file.c because the ?(question mark) 
+matches only one character, in our case it is ``.c``. This can save you a great 
+deal of typing time.
 
-For example, if there is a file called california_cornish_hens_with_wild_rice 
-and no other files whose names begin with 'c', you could view the file without 
-typing the whole name by typing this
+.. L13
 
-.. L12
+{{{ Show slide, with File names }}}
 
+.. R13
+
+For example,if there is a file called ``california_cornish_hens_with_wild_rice``
+and no other files whose names begin with 'c', you could view the file without 
+typing the whole name by typing 
 ::
 
     more c*
 
-.. R13
-
 Here, the c* matches that long file name.
 
-File-names containing metacharacters can pose many problems and should never 
-be intentionally created.
-
-.. L13
+Hence, File-names containing metacharacters can pose many problems and should 
+never be intentionally created.
 
 .. L14
 
@@ -277,3 +276,4 @@ given link.
 
 Hope you have enjoyed this tutorial and found it useful.
 Thank you!
+
diff --git a/ult/ult_6/ult_6.tex b/ult/ult_6/ult_6.tex
index c42fa21..23108d9 100644
--- a/ult/ult_6/ult_6.tex
+++ b/ult/ult_6/ult_6.tex
@@ -82,8 +82,8 @@
 
 At the end of this tutorial, you will be able to,
 \begin{itemize}
-\item Understand various features of the shell
-\item Learn about shell meta characters
+\item Understand various features of the Shell
+\item Learn about Shell Metacharacters
 \end{itemize}
 \end{frame}
 
@@ -109,12 +109,12 @@ Spoken tutorial on,
 \begin{frame}[fragile]
   \frametitle{Tab-completion..}
   \begin{itemize}
-  \item Bash provides tab completion for the following
+  \item Bash provides tab completion for,
     \begin{enumerate}
     \item File Names
     \item Directory Names
     \item Executable Names
-    \item User Names (when prefixed with a \~{})
+    \item User Names (when prefixed with a \~{} )
     \item Host Names (when prefixed with a @)
     \item Variable Names (when prefixed with a \$)
     \end{enumerate}
@@ -125,23 +125,37 @@ Spoken tutorial on,
 \frametitle{History}
 \begin{itemize}
 \item Bash saves history of commands typed
-\item Up and down arrow keys allow to navigate history
+\item Up and down arrow keys allow to navigate through history
 \item \texttt{Ctrl-r} searches for commands used
 \item No. of commands limited, generally upto 1000
 \end{itemize}
 \end{frame}
 
 \begin{frame}[fragile]
-  \frametitle{Shell Meta Characters}
+  \frametitle{Shell Metacharacters}
   \begin{itemize}
-  \item ``meta characters''  are special command directives
-  \item No meta-characters in file-names
+  \item ``Metacharacters''  are special command directives
+  \item No Metacharacters in file-names
   \item While naming files, use characters A-Z, a-z, 0-9, . , - , \_
-  \item shell meta characters -- \\
+  \item shell Metacharacters -- \\
              \verb+/<>!$%^&*|{}[]"'`~;+
   \end{itemize}
 \end{frame}
 
+\begin{frame}[fragile]
+  \frametitle{File names}
+  \begin{itemize}
+\item Eg: Consider a file named \verb+california_cornish_hens_with_+
+\verb+wild_rice+
+\item If no other file-name begins with ``c'', 
+\end{itemize}
+\hspace{29pt}\verb~$ more c*~
+\begin{itemize}
+\item c* matches that long file name
+\end{itemize}
+\end{frame}
+
+
 \begin{frame}
 \frametitle{Summary}
 \label{sec-8}