Skip to content

Commit c2e652d

Browse files
authored
Merge pull request #11 from notapatch/chapter-01
chapter 1 rails 6 released and spelling and grammar changes
2 parents 9499efd + a81e8f9 commit c2e652d

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

rails6/en/chapter01-introduction.adoc

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -129,22 +129,20 @@ We then install the necessary gems and ignore documentation for each gem:
129129
[source,bash]
130130
----
131131
$ gem install bundler
132-
$ gem install rails -v 6.0.0.rc1
132+
$ gem install rails -v 6.0.0
133133
----
134134

135-
NOTE: You may ask yoursel "what does RC1 mean?". RC1 means _Release Candidate_. As I write these lines, the final version for Rails 6.0 is not finished. So I use the he most recent version wich is 6.0.0.rc1
136-
137135
Check for everything to be running nice and smooth:
138136

139137
[source,bash]
140138
----
141139
$ rails -v
142-
Rails 6.0.0.rc1
140+
Rails 6.0.0
143141
----
144142

145143
==== Database
146144

147-
I highly recommend you installing http://www.postgresql.org/[Postgresql] to manage your databases. But here we’ll using http://www.sqlite.org/[SQlite] for simplicity . If you are using Mac OS you should be ready to go, in case you are on Linux, don’t worry we have you covered:
145+
I highly recommend you install http://www.postgresql.org/[Postgresql] to manage your databases. But here we’ll be using http://www.sqlite.org/[SQlite] for simplicity . If you are using Mac OS you should be ready to go, in case you are on Linux, don’t worry we have you covered:
148146

149147
[source,bash]
150148
----
@@ -171,7 +169,7 @@ $ cd ~/workspace
171169
$ rails new market_place_api --api
172170
----
173171

174-
NOTE: The `--api` option appeared in version 5 of Rails. It allows to limit the libraries and _Middleware_ included in the application. This also avoids generating HTML views when using Rails generators.
172+
NOTE: The `--api` option appeared in version 5 of Rails. It allows you to limit the libraries and _Middleware_ included in the application. This also avoids generating HTML views when using Rails generators.
175173

176174
As you may guess, the commands above will generate the bare bones of your Rails application.
177175

@@ -189,7 +187,7 @@ $ git config --global user.name "Type in your name"
189187
$ git config --global user.email "Type in your email"
190188
----
191189

192-
Rails also provide a _.gitignore_ file to ignore some files that we don’t want to track. The default _.gitignore_ file should looks like the one shown below:
190+
Rails also provides a _.gitignore_ file to ignore some files that we don’t want to track. The default _.gitignore_ file should look like the one shown below:
193191

194192
..gitignore
195193
----
@@ -215,15 +213,15 @@ Rails also provide a _.gitignore_ file to ignore some files that we don’t want
215213
/config/master.key
216214
----
217215

218-
After modifying the _.gitignore_ file we just need adding the files and commiting the changes, commands necessary are shown below:
216+
After modifying the _.gitignore_ file we just need to add the files and commit the changes, the necessary commands are shown below:
219217

220218
[source,bash]
221219
----
222220
$ git add .
223221
$ git commit -m "Initial commit"
224222
----
225223

226-
TIP: I have encounter that committing with a message starting with a present tense verb, describes what the commit does and not what it did, this way when you are exploring the history of the project it is more natural to read and understand (or at least for me). I’ll follow this practice until the end of the tutorial.
224+
TIP: I have found that committing a message starting with a present tense verb, describing what the commit does and not what it did, helps when you are exploring the history of the project. I find it is more natural to read and understand. I’ll follow this practice until the end of the tutorial.
227225

228226
Lastly and as an optional step we setup the GitHub (I’m not going through that in here) project and push our code to the remote server: We first add the remote:
229227

0 commit comments

Comments
 (0)