Browse code

Carry of PR #13520 Removinig files

Signed-off-by: Mary Anthony <mary@docker.com>

Mary Anthony authored on 2015/06/14 01:21:50
Showing 46 changed files
... ...
@@ -15,7 +15,7 @@
15 15
 - Prohibit mount of /sys
16 16
 
17 17
 #### Runtime
18
-- Update Apparmor policy to not allow mounts
18
+- Update AppArmor policy to not allow mounts
19 19
 
20 20
 ## 1.6.0 (2015-04-07)
21 21
 
... ...
@@ -309,7 +309,7 @@
309 309
 
310 310
 #### Hack
311 311
 * Clean up "go test" output from "make test" to be much more readable/scannable.
312
-* Excluse more "definitely not unit tested Go source code" directories from hack/make/test.
312
+* Exclude more "definitely not unit tested Go source code" directories from hack/make/test.
313 313
 + Generate md5 and sha256 hashes when building, and upload them via hack/release.sh.
314 314
 - Include contributed completions in Ubuntu PPA.
315 315
 + Add cli integration tests.
... ...
@@ -589,7 +589,7 @@ With the ongoing changes to the networking and execution subsystems of docker te
589 589
 * The ADD instruction now supports caching, which avoids unnecessarily re-uploading the same source content again and again when it hasn’t changed
590 590
 * The new ONBUILD instruction adds to your image a “trigger” instruction to be executed at a later time, when the image is used as the base for another build
591 591
 * Docker now ships with an experimental storage driver which uses the BTRFS filesystem for copy-on-write
592
-* Docker is officially supported on Mac OSX
592
+* Docker is officially supported on Mac OS X
593 593
 * The Docker daemon supports systemd socket activation
594 594
 
595 595
 ## 0.7.6 (2014-01-14)
... ...
@@ -643,12 +643,12 @@ With the ongoing changes to the networking and execution subsystems of docker te
643 643
 - Fix ADD caching issue with . prefixed path
644 644
 - Fix docker build on devicemapper by reverting sparse file tar option
645 645
 - Fix issue with file caching and prevent wrong cache hit
646
-* Use same error handling while unmarshalling  CMD and ENTRYPOINT
646
+* Use same error handling while unmarshalling CMD and ENTRYPOINT
647 647
 
648 648
 #### Documentation
649 649
 
650 650
 * Simplify and streamline Amazon Quickstart
651
-* Install instructions use unprefixed fedora image
651
+* Install instructions use unprefixed Fedora image
652 652
 * Update instructions for mtu flag for Docker on GCE
653 653
 + Add Ubuntu Saucy to installation
654 654
 - Fix for wrong version warning on master instead of latest
... ...
@@ -823,7 +823,7 @@ With the ongoing changes to the networking and execution subsystems of docker te
823 823
 * Improve unit tests
824 824
 * The test suite now runs all tests even if one fails
825 825
 * Refactor C in Go (Devmapper)
826
-- Fix OSX compilation
826
+- Fix OS X compilation
827 827
 
828 828
 ## 0.7.0 (2013-11-25)
829 829
 
... ...
@@ -841,7 +841,7 @@ With the ongoing changes to the networking and execution subsystems of docker te
841 841
 
842 842
 #### Runtime
843 843
 
844
-* Improve stability, fixes some race conditons
844
+* Improve stability, fixes some race conditions
845 845
 * Skip the volumes mounted when deleting the volumes of container.
846 846
 * Fix layer size computation: handle hard links correctly
847 847
 * Use the work Path for docker cp CONTAINER:PATH
... ...
@@ -220,7 +220,7 @@ set of patches that should be reviewed together: for example, upgrading the
220 220
 version of a vendored dependency and taking advantage of its now available new
221 221
 feature constitute two separate units of work. Implementing a new function and
222 222
 calling it in another file constitute a single logical unit of work. The very
223
-high majory of submissions should have a single commit, so if in doubt: squash
223
+high majority of submissions should have a single commit, so if in doubt: squash
224 224
 down to one.
225 225
 
226 226
 After every commit, [make sure the test suite passes]
... ...
@@ -19,7 +19,7 @@
19 19
 #  -e GPG_PASSPHRASE=gloubiboulga \
20 20
 #  docker hack/release.sh
21 21
 #
22
-# Note: Apparmor used to mess with privileged mode, but this is no longer
22
+# Note: AppArmor used to mess with privileged mode, but this is no longer
23 23
 # the case. Therefore, you don't have to disable it anymore.
24 24
 #
25 25
 
... ...
@@ -30,7 +30,7 @@ security@docker.com and not by creating a github issue.
30 30
 
31 31
 A common method for distributing applications and sandboxing their
32 32
 execution is to use virtual machines, or VMs. Typical VM formats are
33
-VMware's vmdk, Oracle Virtualbox's vdi, and Amazon EC2's ami. In theory
33
+VMWare's vmdk, Oracle VirtualBox's vdi, and Amazon EC2's ami. In theory
34 34
 these formats should allow every developer to automatically package
35 35
 their application into a "machine" for easy distribution and deployment.
36 36
 In practice, that almost never happens, for a few reasons:
... ...
@@ -19,7 +19,7 @@
19 19
 #  -e GPG_PASSPHRASE=gloubiboulga \
20 20
 #  docker hack/release.sh
21 21
 #
22
-# Note: Apparmor used to mess with privileged mode, but this is no longer
22
+# Note: AppArmor used to mess with privileged mode, but this is no longer
23 23
 # the case. Therefore, you don't have to disable it anymore.
24 24
 #
25 25
 
... ...
@@ -1,16 +1,16 @@
1 1
 # Docker.tmbundle
2 2
 
3
-Dockerfile syntaxt highlighting for TextMate and Sublime Text.
3
+Dockerfile syntax highlighting for TextMate and Sublime Text.
4 4
 
5 5
 ## Install
6 6
 
7 7
 ### Sublime Text
8 8
 
9
-Available for Sublime Text under [package control](https://sublime.wbond.net/packages/Dockerfile%20Syntax%20Highlighting).
9
+Available for Sublime Text under [Package Control](https://sublime.wbond.net/packages/Dockerfile%20Syntax%20Highlighting).
10 10
 Search for *Dockerfile Syntax Highlighting*
11 11
 
12 12
 ### TextMate 2
13 13
 
14
-Copy the directory `Docker.tmbundle` (showed as a Package in OSX) to `~/Library/Application Support/TextMate/Managed/Bundles`
14
+Copy the directory `Docker.tmbundle` (shown as a Package in OS X) to `~/Library/Application Support/TextMate/Managed/Bundles`
15 15
 
16
-enjoy.
16
+Enjoy.
... ...
@@ -262,7 +262,7 @@ Here is the list of supported options:
262 262
     device. And devices automatically goes away when last user of device
263 263
     exits.
264 264
 
265
-    For example, when contianer exits, its associated thin device is
265
+    For example, when container exits, its associated thin device is
266 266
     removed. If that devices has leaked into some other mount namespace
267 267
     can can't be removed now, container exit will still be successful
268 268
     and this option will just schedule device for deferred removal and
... ...
@@ -288,3 +288,4 @@ project.
288 288
 
289 289
 
290 290
 
291
+
... ...
@@ -262,7 +262,7 @@ Docker containers are, by default, quite secure; especially if you take
262 262
 care of running your processes inside the containers as non-privileged
263 263
 users (i.e., non-`root`).
264 264
 
265
-You can add an extra layer of safety by enabling Apparmor, SELinux,
265
+You can add an extra layer of safety by enabling AppArmor, SELinux,
266 266
 GRSEC, or your favorite hardening solution.
267 267
 
268 268
 Last but not least, if you see interesting security features in other
... ...
@@ -22,8 +22,8 @@ page_keywords: docker, documentation, about, technology, understanding, enterpri
22 22
 ### CS Docker Engine 1.6.2-cs5
23 23
 (21 May 2015)
24 24
 
25
-For customers running Docker Engine on [supported versions of RedHat Enterprise
26
-Linux](https://www.docker.com/enterprise/support/) with [SELinux
25
+For customers running Docker Engine on [supported versions of Red Hat Enterprise
26
+Linux (RHEL)](https://www.docker.com/enterprise/support/) with [SELinux
27 27
 enabled](https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/
28 28
 6/html/Security-Enhanced_Linux/sect-Security-Enhanced_Linux-Working_with_SELinux
29 29
 -Enabling_and_Disabling_SELinux.html), the `docker build` and `docker run`
... ...
@@ -225,7 +225,7 @@ Follow the steps below to configure the GitHub Service hooks for your Automated
225 225
     <tr>
226 226
       <td>1.</td>
227 227
       <td><img src="/docker-hub/hub-images/gh_settings.png"></td>
228
-      <td>Log in to Github.com, and go to your Repository page. Click on "Settings" on
228
+      <td>Log in to GitHub.com, and go to your Repository page. Click on "Settings" on
229 229
       the right side of the page. You must have admin privileges to the repository in order to do this.</td>
230 230
     </tr>
231 231
     <tr>
... ...
@@ -87,7 +87,7 @@ To set the file's execute bit on Linux and OS X:
87 87
 
88 88
     $ chmod +x docker
89 89
 
90
-To get the list of stable release version numbers from Github, view the
90
+To get the list of stable release version numbers from GitHub, view the
91 91
 `docker/docker` [releases page](https://github.com/docker/docker/releases). 
92 92
 
93 93
 > **Note**
... ...
@@ -346,7 +346,7 @@ Use `boot2docker help` to list the full command line reference. For more
346 346
 information about using SSH or SCP to access the Boot2Docker VM, see the README
347 347
 at  [Boot2Docker repository](https://github.com/boot2docker/boot2docker).
348 348
 
349
-Thanks to Chris Jones whose [blog](http://goo.gl/Be6cCk)  inspired me to redo
350
-this page.
349
+Thanks to Chris Jones whose [blog](http://viget.com/extend/how-to-use-docker-on-os-x-the-missing-guide)  
350
+inspired me to redo this page.
351 351
 
352 352
 Continue with the [Docker User Guide](/userguide/).
... ...
@@ -1,5 +1,5 @@
1 1
 page_title: Installation on IBM SoftLayer 
2
-page_description: Installation instructions for Docker on IBM Softlayer.
2
+page_description: Installation instructions for Docker on IBM SoftLayer.
3 3
 page_keywords: IBM SoftLayer, virtualization, cloud, docker, documentation, installation
4 4
 
5 5
 # IBM SoftLayer
... ...
@@ -130,7 +130,7 @@ to you using:
130 130
 
131 131
     boot2docker ip
132 132
 
133
-Typically, it is 192.168.59.103, but it could get changed by Virtualbox's DHCP
133
+Typically, it is 192.168.59.103, but it could get changed by VirtualBox's DHCP
134 134
 implementation.
135 135
 
136 136
 For further information or to report issues, please see the [Boot2Docker site](http://boot2docker.io)
... ...
@@ -147,6 +147,6 @@ Making a pull request with a design proposal simplifies this process:
147 147
 * you can leave comments on specific design proposal line
148 148
 * replies around line are easy to track
149 149
 * as a proposal changes and is updated, pages reset as line items resolve
150
-* Github maintains the entire history
150
+* GitHub maintains the entire history
151 151
 
152 152
 While proposals in pull requests do not end up merged into a master repository, they provide a convenient tool for managing the design process.
... ...
@@ -207,7 +207,7 @@ Text taken from a GUI (e.g., menu text or button text) should appear in "double
207 207
 quotes". The text should take the exact same capitalisation, etc. as appears in
208 208
 the GUI. E.g., Click "Continue" to save the settings.
209 209
 
210
-Text that refers to a keyboard command or hotkey is  capitalized (e.g., Ctrl-D).
210
+Text that refers to a keyboard command or hotkey is capitalized (e.g., Ctrl-D).
211 211
 
212 212
 When writing CLI examples, give the user hints by making the examples resemble
213 213
 exactly what they see in their shell: 
... ...
@@ -225,7 +225,7 @@ the branch to your fork on GitHub:
225 225
          * [new branch]      dry-run-test -> dry-run-test
226 226
         Branch dry-run-test set up to track remote branch dry-run-test from origin.
227 227
 
228
-9. Open your browser to Github.
228
+9. Open your browser to GitHub.
229 229
 
230 230
 10. Navigate to your Docker fork.
231 231
 
... ...
@@ -191,8 +191,8 @@ In this section, you install the Go language. Then, you build the source so that
191 191
 
192 192
 ## Get the Docker repository
193 193
 
194
-In this step, you start a Git `bash` terminal and get the Docker source code from
195
-Github. 
194
+In this step, you start a Git `bash` terminal and get the Docker source code 
195
+from GitHub. 
196 196
 
197 197
 1. Locate the **Git Bash** program and start it.
198 198
 
... ...
@@ -178,7 +178,7 @@ Status Codes:
178 178
              "Warnings":[]
179 179
         }
180 180
 
181
-    **Second, start (using the ID returned above) the image we jus
181
+    **Second, start (using the ID returned above) the image we just
182 182
     created, mapping the ssh port 22 to something on the host**:
183 183
 
184 184
         POST /containers/e90e34656806/start HTTP/1.1
... ...
@@ -190,7 +190,7 @@ Status Codes:
190 190
 
191 191
 **Example response**:
192 192
 
193
-        HTTP/1.1 204 No Conten
193
+        HTTP/1.1 204 No Content
194 194
         Content-Type: text/plain; charset=utf-8
195 195
         Content-Length: 0
196 196
 
... ...
@@ -698,13 +698,13 @@ to any of the files in the context. For example, your build can use an
698 698
 [*ADD*](/reference/builder/#add) instruction to reference a file in the
699 699
 context.
700 700
 
701
-The `URL` parameter can specify the location of a Git repository; the
702
-repository acts as the build context. The system recursively clones the
703
-repository and its submodules using a `git clone --depth 1 --recursive`
704
-command. This command runs in a temporary directory on your local host. After
705
-the command succeeds, the directory is sent to the Docker daemon as the
706
-context. Local clones give you the ability to access private repositories using
707
-local user credentials, VPN's, and so forth.
701
+The `URL` parameter can specify the location of a Git repository; the repository
702
+acts as the build context. The system recursively clones the repository and its
703
+submodules using a `git clone --depth 1 --recursive` command. This command runs
704
+in a temporary directory on your local host. After the command succeeds, the
705
+directory is sent to the Docker daemon as the context. Local clones give you the
706
+ability to access private repositories using local user credentials, VPNs, and
707
+so forth.
708 708
 
709 709
 Git URLs accept context configuration in their fragment section, separated by a
710 710
 colon `:`.  The first part represents the reference that Git will check out,
... ...
@@ -90,7 +90,7 @@ Docker and its components. It provides the following services:
90 90
 - Docker image hosting
91 91
 - User authentication
92 92
 - Automated image builds and work-flow tools such as build triggers and web hooks
93
-- Integration with GitHub and BitBucket
93
+- Integration with GitHub and Bitbucket
94 94
 
95 95
 
96 96
 ## Dockerfile
... ...
@@ -40,7 +40,7 @@ repository](https://github.com/docker/docker/issues/).
40 40
 An idiosyncrasy in AUFS prevented permissions from propagating predictably
41 41
 between upper and lower layers. This caused issues with accessing private
42 42
 keys, database instances, etc.  This issue was closed in this release:
43
-[Github Issue 783](https://github.com/docker/docker/issues/783).
43
+[GitHub Issue 783](https://github.com/docker/docker/issues/783).
44 44
 
45 45
 
46 46
 * *Docker Hub incompatible with Safari 8*
... ...
@@ -16,7 +16,7 @@ most out of Docker. To do this, it provides services such as:
16 16
 * User authentication.
17 17
 * Automated image builds and work-flow tools such as build triggers and web
18 18
   hooks.
19
-* Integration with GitHub and BitBucket.
19
+* Integration with GitHub and Bitbucket.
20 20
 
21 21
 In order to use Docker Hub, you will first need to register and create an account. Don't
22 22
 worry, creating an account is simple and free.
... ...
@@ -118,16 +118,16 @@ manage private repositories. You can learn how to create and manage an organizat
118 118
 ### Automated Builds
119 119
 
120 120
 Automated Builds automate the building and updating of images from
121
-[GitHub](https://www.github.com) or [BitBucket](http://bitbucket.com), directly on Docker
122
-Hub. It works by adding a commit hook to your selected GitHub or BitBucket repository,
121
+[GitHub](https://www.github.com) or [Bitbucket](http://bitbucket.com), directly on Docker
122
+Hub. It works by adding a commit hook to your selected GitHub or Bitbucket repository,
123 123
 triggering a build and update when you push a commit.
124 124
 
125 125
 #### To setup an Automated Build
126 126
 
127 127
 1.  Create a [Docker Hub account](https://hub.docker.com/) and login.
128
-2.  Link your GitHub or BitBucket account through the ["Link Accounts"](https://registry.hub.docker.com/account/accounts/) menu.
128
+2.  Link your GitHub or Bitbucket account through the ["Link Accounts"](https://registry.hub.docker.com/account/accounts/) menu.
129 129
 3.  [Configure an Automated Build](https://registry.hub.docker.com/builds/add/).
130
-4.  Pick a GitHub or BitBucket project that has a `Dockerfile` that you want to build.
130
+4.  Pick a GitHub or Bitbucket project that has a `Dockerfile` that you want to build.
131 131
 5.  Pick the branch you want to build (the default is the `master` branch).
132 132
 6.  Give the Automated Build a name.
133 133
 7.  Assign an optional Docker tag to the Build.
... ...
@@ -135,7 +135,7 @@ triggering a build and update when you push a commit.
135 135
 
136 136
 Once the Automated Build is configured it will automatically trigger a
137 137
 build and, in a few minutes, you should see your new Automated Build on the [Docker Hub](https://hub.docker.com)
138
-Registry. It will stay in sync with your GitHub and BitBucket repository until you
138
+Registry. It will stay in sync with your GitHub and Bitbucket repository until you
139 139
 deactivate the Automated Build.
140 140
 
141 141
 If you want to see the status of your Automated Builds, you can go to your
... ...
@@ -144,7 +144,7 @@ and it will show you the status of your builds and their build history.
144 144
 
145 145
 Once you've created an Automated Build you can deactivate or delete it. You
146 146
 cannot, however, push to an Automated Build with the `docker push` command.
147
-You can only manage it by committing code to your GitHub or BitBucket
147
+You can only manage it by committing code to your GitHub or Bitbucket
148 148
 repository.
149 149
 
150 150
 You can create multiple Automated Builds per repository and configure them
... ...
@@ -80,9 +80,9 @@ directory from your Docker daemon's host into a container.
80 80
 
81 81
 > **Note:**
82 82
 > If you are using Boot2Docker, your Docker daemon only has limited access to
83
-> your OSX/Windows filesystem. Boot2Docker tries to auto-share your `/Users`
84
-> (OSX) or `C:\Users` (Windows) directory - and so you can mount files or directories
85
-> using `docker run -v /Users/<path>:/<container path> ...` (OSX) or
83
+> your OS X/Windows filesystem. Boot2Docker tries to auto-share your `/Users`
84
+> (OS X) or `C:\Users` (Windows) directory - and so you can mount files or directories
85
+> using `docker run -v /Users/<path>:/<container path> ...` (OS X) or
86 86
 > `docker run -v /c/Users/<path>:/<container path ...` (Windows). All other paths
87 87
 > come from the Boot2Docker virtual machine's filesystem.
88 88
 
... ...
@@ -74,7 +74,7 @@ RUN apt-get install -y <input id="gcc" class="l_fill" type="text"><br>
74 74
 <input id="run6" class="l_fill" type="text">cd redis-stable && make && make install<br>
75 75
 &#35; launch redis when starting the image
76 76
 <input id="entrypoint" class="l_fill" type="text"> ["redis-server"]<br>
77
-&#35; run as user dameon
77
+&#35; run as user daemon
78 78
 <input id="user" class="l_fill" type="text"> daemon<br>
79 79
 &#35; expose port 6379
80 80
 <input id="expose" class="l_fill" type="text"> 6379
... ...
@@ -4,7 +4,7 @@ This page contains a list of features in the Docker engine which are
4 4
 experimental. Experimental features are **not** ready for production. They are
5 5
 provided for test and evaluation in your sandbox environments.  
6 6
 
7
-The information below describes each feature and the Github pull requests and
7
+The information below describes each feature and the GitHub pull requests and
8 8
 issues associated with it. If necessary, links are provided to additional
9 9
 documentation on an issue.  As an active Docker user and community member,
10 10
 please feel free to provide any feedback on these features you wish.
... ...
@@ -52,7 +52,7 @@ This specification uses the following terms:
52 52
     </dt>
53 53
     <dd>
54 54
         Each layer is given an ID upon its creation. It is 
55
-        represented as a hexidecimal encoding of 256 bits, e.g.,
55
+        represented as a hexadecimal encoding of 256 bits, e.g.,
56 56
         <code>a9561eb1b190625c9adb5a9513e72c4dedafc1cb2d4c5236c9a6957ec7dfd5a9</code>.
57 57
         Image IDs should be sufficiently random so as to be globally unique.
58 58
         32 bytes read from <code>/dev/urandom</code> is sufficient for all
... ...
@@ -109,7 +109,7 @@ This specification uses the following terms:
109 109
         characters <code>[._-]</code>, however it MAY contain additional
110 110
         <code>/</code> and <code>:</code> characters for organizational
111 111
         purposes, with the last <code>:</code> character being interpreted
112
-        dividing the repository component of the name from the tag suffic
112
+        dividing the repository component of the name from the tag suffix
113 113
         component.
114 114
     </dd>
115 115
 </dl>
... ...
@@ -200,9 +200,9 @@ into account Docker community conventions.
200 200
 
201 201
 ## Building an image using a URL
202 202
 
203
-This will clone the specified Github repository from the URL and use it
203
+This will clone the specified GitHub repository from the URL and use it
204 204
 as context. The Dockerfile at the root of the repository is used as
205
-Dockerfile. This only works if the Github repository is a dedicated
205
+Dockerfile. This only works if the GitHub repository is a dedicated
206 206
 repository.
207 207
 
208 208
     docker build github.com/scollier/Fedora-Dockerfiles/tree/master/apache
... ...
@@ -91,7 +91,7 @@ The initial status of the container created with **docker create** is 'created'.
91 91
 **--cgroup-parent**=""
92 92
    Path to cgroups under which the cgroup for the container will be created. If the path is not absolute, the path is considered to be relative to the cgroups path of the init process. Cgroups will be created if they do not already exist.
93 93
 
94
-**--cpu-peroid**=0
94
+**--cpu-period**=0
95 95
     Limit the CPU CFS (Completely Fair Scheduler) period
96 96
 
97 97
 **--cpuset-cpus**=""
... ...
@@ -167,7 +167,7 @@ order ( and the corresponding representation of its value):
167 167
 * 'devmajor' - string of the integer
168 168
 * 'devminor' - string of the integer
169 169
 
170
-For >= Version1, the extented attribute headers ("SCHILY.xattr." prefixed pax
170
+For >= Version1, the extended attribute headers ("SCHILY.xattr." prefixed pax
171 171
 headers) included after the above list. These xattrs key/values are first
172 172
 sorted by the keys.
173 173
 
... ...
@@ -16,7 +16,7 @@ with "access" privileges for a particular channel.
16 16
 
17 17
 A similar command is used to give someone a particular access level.  For
18 18
 example, to add a new maintainer to the `#docker-maintainers` access list so
19
-that they can contribute to the dicsussions (after they've been merged
19
+that they can contribute to the discussions (after they've been merged
20 20
 appropriately in a `MAINTAINERS` file, of course), one would use `/msg ChanServ
21 21
 ACCESS #docker-maintainers ADD <nick> maintainer`.
22 22
 
... ...
@@ -1,4 +1,4 @@
1
-Triaging of issue
1
+Triaging of issues
2 2
 ------------------
3 3
 
4 4
 Triage provides an important way to contribute to an open source project.  Triage helps ensure issues resolve quickly by:  
... ...
@@ -9,7 +9,7 @@ Triage provides an important way to contribute to an open source project.  Triag
9 9
 
10 10
 - Lowering the issue count by preventing duplicate issues.
11 11
 
12
-- Streamling the development process by preventing duplicate discussions.
12
+- Streamlining the development process by preventing duplicate discussions.
13 13
 
14 14
 If you don't have time to code, consider helping with triage. The community will thank you for saving them time by spending some of yours.
15 15
 
... ...
@@ -3,7 +3,7 @@
3 3
 This document is a high-level overview of where we want to take Docker.
4 4
 It is a curated selection of planned improvements which are either important, difficult, or both.
5 5
 
6
-For a more complete view of planned and requested improvements, see [the Github issues](https://github.com/docker/docker/issues).
6
+For a more complete view of planned and requested improvements, see [the GitHub issues](https://github.com/docker/docker/issues).
7 7
 
8 8
 To suggest changes to the roadmap, including additions, please write the change as if it were already in effect, and make a pull request.
9 9
 
... ...
@@ -324,7 +324,7 @@ func (f *JSONFormatter) Format(entry *Entry) ([]byte, error) {
324 324
 
325 325
 #### Logger as an `io.Writer`
326 326
 
327
-Logrus can be transormed into an `io.Writer`. That writer is the end of an `io.Pipe` and it is your responsibility to close it.
327
+Logrus can be transformed into an `io.Writer`. That writer is the end of an `io.Pipe` and it is your responsibility to close it.
328 328
 
329 329
 ```go
330 330
 w := logger.Writer()
... ...
@@ -24,21 +24,21 @@ The following packages are required to compile libcontainer natively.
24 24
 - git
25 25
 - cgutils
26 26
 
27
-You can develop on OSX, but you are limited to Dockerfile-based builds only.
27
+You can develop on OS X, but you are limited to Dockerfile-based builds only.
28 28
 
29 29
 ### Building libcontainer from Dockerfile
30 30
 
31 31
     make all
32 32
 
33 33
 This is the easiest way of building libcontainer.
34
-As this build is done using Docker, you can even run this from [OSX](https://github.com/boot2docker/boot2docker)
34
+As this build is done using Docker, you can even run this from [OS X](https://github.com/boot2docker/boot2docker)
35 35
 
36 36
 ### Testing changes with "nsinit"
37 37
 
38 38
     make sh
39 39
 
40 40
 This will create an container that runs `nsinit exec sh` on a busybox rootfs with the configuration from ['minimal.json'](https://github.com/docker/libcontainer/blob/master/sample_configs/minimal.json).
41
-Like the previous command, you can run this on OSX too!
41
+Like the previous command, you can run this on OS X too!
42 42
 
43 43
 ### Building libcontainer directly
44 44
 
... ...
@@ -3,7 +3,7 @@
3 3
 This document is a high-level overview of where we want to take libcontainer next.
4 4
 It is a curated selection of planned improvements which are either important, difficult, or both.
5 5
 
6
-For a more complete view of planned and requested improvements, see [the Github issues](https://github.com/docker/libcontainer/issues).
6
+For a more complete view of planned and requested improvements, see [the GitHub issues](https://github.com/docker/libcontainer/issues).
7 7
 
8 8
 To suggest changes to the roadmap, including additions, please write the change as if it were already in effect, and make a pull request.
9 9
 
... ...
@@ -60,7 +60,7 @@ are required to be mounted within the rootfs that the runtime will setup.
60 60
 After a container's filesystems are mounted within the newly created 
61 61
 mount namespace `/dev` will need to be populated with a set of device nodes.
62 62
 It is expected that a rootfs does not need to have any device nodes specified
63
-for `/dev` witin the rootfs as the container will setup the correct devices
63
+for `/dev` within the rootfs as the container will setup the correct devices
64 64
 that are required for executing a container's process.
65 65
 
66 66
 |      Path    | Mode |   Access   |
... ...
@@ -44,7 +44,7 @@ func newConsoleFromPath(slavePath string) *linuxConsole {
44 44
 	}
45 45
 }
46 46
 
47
-// linuxConsole is a linux psuedo TTY for use within a container.
47
+// linuxConsole is a linux pseudo TTY for use within a container.
48 48
 type linuxConsole struct {
49 49
 	master    *os.File
50 50
 	slavePath string
... ...
@@ -18,7 +18,7 @@ which will give the process of the container that should be joined. Namespaces f
18 18
 be found from `/proc/[pid]/ns` and set by `setns` syscall.
19 19
 
20 20
 And then get the pipe number from `_LIBCONTAINER_INITPIPE`, error message could
21
-be transfered through it. If tty is added, `_LIBCONTAINER_CONSOLE_PATH` will 
21
+be transferred through it. If tty is added, `_LIBCONTAINER_CONSOLE_PATH` will 
22 22
 have value and start a console for output.
23 23
 
24 24
 Finally, `nsexec()` will clone a child process , exit the parent process and let 
... ...
@@ -16,7 +16,7 @@ import (
16 16
 )
17 17
 
18 18
 // joseBase64UrlEncode encodes the given data using the standard base64 url
19
-// encoding format but with all trailing '=' characters ommitted in accordance
19
+// encoding format but with all trailing '=' characters omitted in accordance
20 20
 // with the jose specification.
21 21
 // http://tools.ietf.org/html/draft-ietf-jose-json-web-signature-31#section-2
22 22
 func joseBase64UrlEncode(b []byte) string {
... ...
@@ -4,7 +4,7 @@ We always welcome contributions to help make `go-zfs` better. Please take a mome
4 4
 
5 5
 ### Reporting issues ###
6 6
 
7
-We use [Github issues](https://github.com/mistifyio/go-zfs/issues) to track bug reports, feature requests, and submitting pull requests.
7
+We use [GitHub issues](https://github.com/mistifyio/go-zfs/issues) to track bug reports, feature requests, and submitting pull requests.
8 8
 
9 9
 If you find a bug:
10 10
 
... ...
@@ -29,7 +29,7 @@ The tests have decent examples for most functions.
29 29
 
30 30
 ```go
31 31
 //assuming a zpool named test
32
-//error handling ommitted
32
+//error handling omitted
33 33
 
34 34
 
35 35
 f, err := zfs.CreateFilesystem("test/snapshot-test", nil)
... ...
@@ -8,7 +8,7 @@ the kernel. It can be used to add and remove interfaces, set ip addresses
8 8
 and routes, and configure ipsec. Netlink communication requires elevated
9 9
 privileges, so in most cases this code needs to be run as root. Since
10 10
 low-level netlink messages are inscrutable at best, the library attempts
11
-to provide an api that is loosely modeled on the CLI provied by iproute2.
11
+to provide an api that is loosely modeled on the CLI provided by iproute2.
12 12
 Actions like `ip link add` will be accomplished via a similarly named
13 13
 function like AddLink(). This library began its life as a fork of the
14 14
 netlink functionality in
... ...
@@ -38,7 +38,7 @@ func main() {
38 38
     newns, _ := netns.New()
39 39
     defer newns.Close()
40 40
 
41
-    // Do something with tne network namespace
41
+    // Do something with the network namespace
42 42
     ifaces, _ := net.Interfaces()
43 43
     fmt.Printf("Interfaces: %v\n", ifaces)
44 44