Skip to content

Commit fd05113

Browse files
committed
Merge pull request astaxie#383 from DeepAnchor/master
English grammar and typo fixes - 05.0.md to 08.5.md
2 parents 72bfa02 + ed1c9d5 commit fd05113

32 files changed

+593
-584
lines changed

en/eBook/01.0.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ Welcome to the world of Go, let's start exploring!
55
Go is a fast-compiled, garbage-collected, concurrent systems programming language. It has the following advantages:
66

77
- Compiles a large project within a few seconds.
8-
- Provides a software development model that is easy to reason about, avoiding most of the problems that caused by C-style header files.
8+
- Provides a software development model that is easy to reason about, avoiding most of the problems associated with C-style header files.
99
- Is a static language that does not have levels in its type system, so users do not need to spend much time dealing with relations between types. It is more like a lightweight object-oriented language.
1010
- Performs garbage collection. It provides basic support for concurrency and communication.
1111
- Designed for multi-core computers.
1212

13-
Go is a compiled language. It combines the development efficiency of interpreted or dynamic languages with the security of static languages. It is going to be the language of choice for the modern multi-core computers with networking. For these purposes, there are some problems that have to be resolved in language itself, such as a richly expressive lightweight type system, concurrency, and strictly regulated garbage collection. For quite some time, no packages or tools have come out that have solved all of these problems pragmatically; thus was born the motivation for the Go language.
13+
Go is a compiled language. It combines the development efficiency of interpreted or dynamic languages with the security of static languages. It is going to be the language of choice for modern, multi-core computers with networking. For these purposes, there are some problems that need to inherently be resolved at the level of the language of choice, such as a richly expressive lightweight type system, a native concurrency model, and strictly regulated garbage collection. For quite some time, no packages or tools have emerged that have aimed to solve all of these problems in a pragmatic fashion; thus was born the motivation for the Go language.
1414

1515
In this chapter, I will show you how to install and configure your own Go development environment.
1616

en/eBook/01.1.md

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,33 @@
22

33
## Three ways to install Go
44

5-
There are many ways to configure the Go development environment on your computer, you can choose any one you like. The three most common ways are as follows.
5+
There are many ways to configure the Go development environment on your computer, and you can choose whichever one you like. The three most common ways are as follows.
66

77

88
- Official installation packages.
9-
- The Go team provides convenient installation packages in Windows, Linux, Mac and other operating systems. The easiest way to get started.
10-
- Install from source code.
9+
- The Go team provides convenient installation packages in Windows, Linux, Mac and other operating systems. This is probably the easiest way to get started.
10+
- Install it yourself from source code.
1111
- Popular with developers who are familiar with Unix-like systems.
12-
- Use third-party tools.
12+
- Using third-party tools.
1313
- There are many third-party tools and package managers for installing Go, like apt-get in Ubuntu and homebrew for Mac.
1414

15-
In case you want to install more than one version of Go in one computer, you should take a look at the tool called [GVM](https://github.com/moovweb/gvm). It is the best tool I've seen so far for achieving this job, otherwise you have to know how to deal with this problem by yourself.
15+
In case you want to install more than one version of Go on a computer, you should take a look at a tool called [GVM](https://github.com/moovweb/gvm). It is the best tool I've seen so far for accomplishing this task, otherwise you'd have to deal with it yourself.
1616

1717
## Install from source code
1818

1919
Because some parts of Go are written in Plan 9 C and AT&T assembler, you have to install a C compiler before taking the next step.
2020

21-
On a Mac, once you install the Xcode, you have already have the compiler.
21+
On a Mac, if you have installed Xcode, you already have the compiler.
22+
23+
On Unix-like systems, you need to install gcc or a similar compiler. For example, using the package manager apt-get (included with Ubuntu), one can install the required compilers as follows:
2224

23-
On Unix-like systems, you need to install gcc or a like compiler. For example, using the package manager apt-get included with Ubuntu, one can install the required compilers as follows:
2425
`sudo apt-get install gcc libc6-dev`
2526

26-
On Windows, you need to install MinGW in order to install gcc. Don't forget to configure environment variables after the installation is finished.( ***Everything looks like this means it's commented by translator: If you are using 64-bit Windows, you would better install 64-bit version of MinGW*** )
27+
On Windows, you need to install MinGW in order to install gcc. Don't forget to configure your environment variables after the installation has completed.( ***Everything that looks like this means it's commented by a translator: If you are using 64-bit Windows, you should install the 64-bit version of MinGW*** )
2728

28-
The Go team uses [Mercurial](http://mercurial.selenic.com/downloads/) to manage source code, so you need to install this tool in order to download Go source code.
29+
The Go team uses [Mercurial](http://mercurial.selenic.com/downloads/) to manage their source code, so you need to install this tool in order to download the Go source code.
2930

30-
At this point, execute following commands to clone Go source code, and start compiling.( ***It will clone source code to you current directory, switch your work path before you continue. This may take some time.*** )
31+
At this point, execute the following commands to clone the Go source code and compile it.( ***It will clone the source code to your current directory. Switch your work path before you continue. This may take some time.*** )
3132

3233
hg clone -u release https://code.google.com/p/go
3334
cd go/src
@@ -37,7 +38,7 @@ A successful installation will end with the message "ALL TESTS PASSED."
3738

3839
On Windows, you can achieve the same by running `all.bat`.
3940

40-
If you are using Windows, installation package will set environment variables automatically. In Unix-like systems, you need to set these variables manually as follows.( ***If your Go version is greater than 1.0, you don't have to set $GOBIN, and it will automatically be related to your $GOROOT/bin, which we will talk about in the next section***)
41+
If you are using Windows, the installation package will set your environment variables automatically. In Unix-like systems, you need to set these variables manually as follows. ( ***If your Go version is greater than 1.0, you don't have to set $GOBIN, and it will automatically be related to your $GOROOT/bin, which we will talk about in the next section***)
4142

4243
export GOROOT=$HOME/go
4344
export GOBIN=$GOROOT/bin
@@ -47,59 +48,59 @@ If you see the following information on your screen, you're all set.
4748

4849
![](images/1.1.mac.png?raw=true)
4950

50-
Figure 1.1 Information after installed from source code
51+
Figure 1.1 Information after installing from source code
5152

52-
Once you see the usage information of Go, it means you successfully installed Go on your computer. If it says "no such command", check if your $PATH environment variable contains the installation path of Go.
53+
Once you see the usage information of Go, it means you have successfully installed Go on your computer. If it says "no such command", check that your $PATH environment variable contains the installation path of Go.
5354

54-
## Use standard installation packages
55+
## Using the standard installation packages
5556

56-
Go has one-click installation packages for every operating system. These packages will install Go in `/usr/local/go` (`c:\Go` in Windows) as default. Of course you can change it, but you also need to change all the environment variables manually as I showed above.
57+
Go has one-click installation packages for every supported operating system. These packages will install Go in `/usr/local/go` (`c:\Go` in Windows) by default. Of course this can be modified, but you also need to change all the environment variables manually as I've shown above.
5758

5859
### How to check if your operating system is 32-bit or 64-bit?
5960

6061
Our next step depends on your operating system type, so we have to check it before we download the standard installation packages.
6162

62-
If you are using Windows, press `Win+R` and then run the command tool, type command `systeminfo` and it will show you some useful information just few seconds. Find the line with "system type", if you see "x64-based PC" that means your operating system is 64-bit, 32-bit otherwise.
63+
If you are using Windows, press `Win+R` and then run the command tool. Type the `systeminfo` command and it will show you some useful system information. Find the line that says "system type" -if you see "x64-based PC" that means your operating system is 64-bit, 32-bit otherwise.
6364

64-
I strongly recommend downloading the 64-bit version of package if you are Mac users as Go is no longer supports pure 32-bit processors in Mac OS.
65+
I strongly recommend downloading the 64-bit package if you are a Mac user, as Go no longer supports pure 32-bit processors on Mac OSX.
6566

6667
Linux users can type `uname -a` in the terminal to see system information.
67-
64-bit operating system shows as follows.
68+
A 64-bit operating system will show the following:
6869

6970
<some description> x86_64 x86_64 x86_64 GNU/Linux
7071
// some machines such as Ubuntu 10.04 will show as following
7172
x86_64 GNU/Linux
7273

73-
32-bit operating system shows as follows.
74+
32-bit operating systems instead show:
7475

7576
<some description> i686 i686 i386 GNU/Linux
7677

7778
### Mac
7879

79-
Go to the [download page](http://code.google.com/p/go/downloads/list), choose `go1.0.3.darwin-386.pkg` for 32-bit systems and `go1.0.3.darwin-amd64.pkg` for 64-bit systems. All the way to the end by clicking "next", `~/go/bin` will be added to $PATH after you finished the installation. Now open the terminal and type `go`. You should now see the what is displayed in figure 1.1.
80+
Go to the [download page](http://code.google.com/p/go/downloads/list), choose `go1.0.3.darwin-386.pkg` for 32-bit systems and `go1.0.3.darwin-amd64.pkg` for 64-bit systems. Going all the way to the end by clicking "next", `~/go/bin` will be added to your system's $PATH after you finish the installation. Now open the terminal and type `go`. You should see the same output shown in igure 1.1.
8081

8182
### Linux
8283

83-
Go to the [download page]((http://code.google.com/p/go/downloads/list), choose `go1.0.3.linux-386.tar.gz` for 32-bit systems and `go1.0.3.linux-amd64.tar.gz` for 64-bit systems. Suppose you want to install Go in path `$GO_INSTALL_DIR`, uncompress `tar.gz` to the path by command `tar zxvf go1.0.3.linux-amd64.tar.gz -C $GO_INSTALL_DIR`. Then set your $PATH `export PATH=$PATH:$GO_INSTALL_DIR/go/bin`. Now just open the terminal and type `go`. You should now see the what is displayed in figure 1.1.
84+
Go to the [download page]((http://code.google.com/p/go/downloads/list), choose `go1.0.3.linux-386.tar.gz` for 32-bit systems and `go1.0.3.linux-amd64.tar.gz` for 64-bit systems. Suppose you want to install Go in the `$GO_INSTALL_DIR` path. Uncompress the `tar.gz` to your chosen path using the command `tar zxvf go1.0.3.linux-amd64.tar.gz -C $GO_INSTALL_DIR`. Then set your $PATH with the following: `export PATH=$PATH:$GO_INSTALL_DIR/go/bin`. Now just open the terminal and type `go`. You should now see the same output displayed in figure 1.1.
8485

8586
### Windows
8687

87-
Go to the [download page]((http://code.google.com/p/go/downloads/list), choose `go1.0.3.windows-386.msi` for 32-bit systems and `go1.0.3.windows-amd64.msi` for 64-bit systems. All the way to the end by clicking "next", `c:/go/bin` will be added to `path`. Now just open a command line window and type `go`. You should now see the what is displayed in figure 1.1.
88+
Go to the [download page]((http://code.google.com/p/go/downloads/list), choose `go1.0.3.windows-386.msi` for 32-bit systems and `go1.0.3.windows-amd64.msi` for 64-bit systems. Going all the way to the end by clicking "next", `c:/go/bin` will be added to `path`. Now just open a command line window and type `go`. You should now see the same output displayed in figure 1.1.
8889

8990
## Use third-party tools
9091

9192
### GVM
9293

93-
GVM is a Go multi-version control tool developed by third-party, like rvm in ruby. It's quite easy to use it. Install gvm by typing following commands in your terminal.
94+
GVM is a Go multi-version control tool developed by a third-party, like rvm for ruby. It's quite easy to use. Install gvm by typing the following commands in your terminal:
9495

9596
bash < <(curl -s https://raw.github.com/moovweb/gvm/master/binscripts/gvm-installer)
9697

97-
Then we install Go by following commands.
98+
Then we install Go using the following commands:
9899

99100
gvm install go1.0.3
100101
gvm use go1.0.3
101102

102-
After the process finished, you're all set.
103+
After the process has finished, you're all set.
103104

104105
### apt-get
105106

@@ -111,7 +112,7 @@ Ubuntu is the most popular desktop release version of Linux. It uses `apt-get` t
111112

112113
### Homebrew
113114

114-
Homebrew is a software manage tool commonly used in Mac to manage software. Just type following commands to install Go.
115+
Homebrew is a software management tool commonly used in Mac to manage packages. Just type the following commands to install Go.
115116

116117
brew install go
117118

0 commit comments

Comments
 (0)