diff --git a/deployment_101.rst b/deployment_101.rst index 4be7279..ff44310 100644 --- a/deployment_101.rst +++ b/deployment_101.rst @@ -15,8 +15,8 @@ inetd Shared containers vs self-contained binaries -------------------------------------------- -Package mangement -================= +Package management +================== Configuration files ------------------- diff --git a/index.rst b/index.rst index ffe6b4b..d2c8f53 100644 --- a/index.rst +++ b/index.rst @@ -1,12 +1,13 @@ -.. Ops School Curriculum documentation master file, created by - sphinx-quickstart on Thu Oct 11 16:31:56 2012. - You can adapt this file completely to your liking, but it should at least - contain the root `toctree` directive. +##################### +Ops School Curriculum +##################### -Welcome to Ops School Curriculum's documentation! -================================================= +Welcome to the Ops School curriculum documentation site. -Contents: + +***************** +Table of Contents +***************** .. toctree:: :maxdepth: 2 @@ -58,14 +59,17 @@ Contents: glossary +********* TODO List -========= +********* + .. todolist:: + +****************** Indices and tables -================== +****************** * :ref:`genindex` * :ref:`modindex` * :ref:`search` - diff --git a/networking_101.rst b/networking_101.rst index 3d6d399..91d282e 100644 --- a/networking_101.rst +++ b/networking_101.rst @@ -56,7 +56,7 @@ the layer below. just as easy to send text across the globe as it is to write to a file on a local disk - a technological miracle that is often taken for granted. The ICMP protocol, used by the ubiquitous ``ping`` utility, allows small test - packets to be sent to a destination for troublshooting purposes. + packets to be sent to a destination for troubleshooting purposes. * Layer 5 - Session layer @@ -70,7 +70,7 @@ the layer below. The job of the presentation layer is to handle data encoding and decoding as required by the application. An example of this function is the Multipurpose Internet Mail Extensions (MIME) protocol, used to encode things other than - unformated ASCII text into email messages. Both the session layer and the + unformatted ASCII text into email messages. Both the session layer and the presentation layer are often neglected when discussing TCP/IP because many application-layer protocols implement the functionality of these layers internally. @@ -95,13 +95,13 @@ version to be widely deployed. This is the version of the protocol you're most l encounter, and the default version of the IP protocol in Linux. IPv4 uses a 32-bit address space most typically represented in 4 dotted decimal notation, -each octect contains a value between 0-255, and is seperated by a dot. An example +each octet contains a value between 0-255, and is separated by a dot. An example address is below: 10.199.0.5 -There are several other representations, like dotted hexidecimal, dotted octal, hexidecimal, -decimal, and octal. These are infrequently used, and will be covered in later sections. +There are several other representations, like dotted hexadecimal, dotted octal, hexadecimal, +decimal, and octal. These are infrequently used, and will be covered in later sections. @@ -117,14 +117,14 @@ TCP vs UDP Subnetting, netmasks and CIDR ============================= -A subnet is a logical devision of an IP network, and allows the host system to identify which +A subnet is a logical division of an IP network, and allows the host system to identify which other hosts can be reached on the local network. The host system determines this by the application of a routing prefix. There are two typical representations of this prefix: a netmask and CIDR. Netmasks typically appear in the dotted decimal notation, with values between 0-255 in each octet. These are applied as bitmasks, and numbers at 255 mean that this host is not reachable. -Netmask can also be refered to as a Subnet Mask and these terms are often used interchangeably. An +Netmask can also be referred to as a Subnet Mask and these terms are often used interchangeably. An example IP Address with a typical netmask is below: ============= =============== diff --git a/package_management_101.rst b/package_management_101.rst index 8a3e85d..339c5e6 100644 --- a/package_management_101.rst +++ b/package_management_101.rst @@ -14,13 +14,13 @@ Workflow What is a package manager? ========================== High level overview. -Mention that most flavours of Unix have their own way of managing packages, but +Mention that most flavors of Unix have their own way of managing packages, but at their core they all follow the similar principles (install/uninstall packages, keep track of what is installed, etc). RPM and YUM (RedHat, CentOS, Fedora, Scientific Linux) =========================================================== -Some text about what RPM is, what YUM is, and how they both provide two halfs of +Some text about what RPM is, what YUM is, and how they both provide two halves of the same function. Installing packages diff --git a/soft_skills.rst b/soft_skills.rst index 9a3f9df..3802f16 100644 --- a/soft_skills.rst +++ b/soft_skills.rst @@ -71,12 +71,12 @@ to address IT security where it makes sense for the organization. Areas where organizations need the Operations professional to advice on IT security could include threats to data from internal and external sources, hardware failure, site availability or -reslience, data preservation, and information integrity. Again, +resilience, data preservation, and information integrity. Again, these areas are dependent on the organization's mission. For example: an ecommerce organization will most likely want strong site availability and protection of customer personal information. -The Operations professionals might build a site with high reslience +The Operations professionals might build a site with high resilience and availability including use of Content Delivery Networks (CDNs), strong encryption not only for the ecommerce session but also data at rest, role-based access for internal employees accessing customer diff --git a/troubleshooting_101.rst b/troubleshooting_101.rst index b60fbed..b3f4b55 100644 --- a/troubleshooting_101.rst +++ b/troubleshooting_101.rst @@ -60,7 +60,7 @@ Recent changes -------------- Often problems can be traced back to recent changes. -Problems that start around the time of a change aren't usually coincedence. +Problems that start around the time of a change aren't usually coincidence. Learning common errors ----------------------