diff --git a/package_management_101.rst b/package_management_101.rst index b406aeb7..b9f46843 100644 --- a/package_management_101.rst +++ b/package_management_101.rst @@ -7,7 +7,7 @@ Workflow What is a package manager? ========================== -Modern operating systems use package managers to take care of the installation +Modern operating systems use package managers to take care of the installation, maintenance and removal of software. On Windows this is `Windows Installer `_ (formerly Microsoft Installer). On Linux there are two popular package managers: @@ -26,7 +26,7 @@ same functionality: RPM and yum (RedHat, CentOS, Fedora, Scientific Linux) ====================================================== -In the following examples, we will be using the package ``dstat`` in our examples. The +In the following examples, we will be using the package ``dstat``. The process however applies to any software you may want to install. Yum provides a wrapper around RPM, which can be used to search for, and install diff --git a/shell_tools_101.rst b/shell_tools_101.rst index fec17bf6..575bdda1 100644 --- a/shell_tools_101.rst +++ b/shell_tools_101.rst @@ -604,7 +604,7 @@ The ``END`` pattern tells ``awk`` what to do after all lines in the file have be In our case, that involves printing out the average age of all students. To get the average age, the sum of all ages (stored in variable ``sum``) was divided by the total number of lines in the file, represented by ``NR``. -In addition to the ``END`` pattern, ``awk`` also provides a ``BEGIN`` pattern, which describes an action that needs to be taken before a the first line of the file is processed. +In addition to the ``END`` pattern, ``awk`` also provides a ``BEGIN`` pattern, which describes an action that needs to be taken before the first line of the file is processed. For example: diff --git a/shells_101.rst b/shells_101.rst index 9d3abac0..dc20f9a0 100644 --- a/shells_101.rst +++ b/shells_101.rst @@ -26,6 +26,7 @@ this scenario easier: the command-line editing mode. The command-line editing mode emulates the movement functions of two common text editors, ``emacs`` and ``vi``. In the case of the shell, the cursor's movement is being controlled. + .. todo:: Tighten up the above sentence. It's wordy and doesn't seem to make the point I want it to make. By default, ``bash`` operates in ``emacs`` mode.