Skip to content

Commit f534731

Browse files
committed
[book][installation] Proofreading the installation chapter
1 parent 3c48141 commit f534731

File tree

1 file changed

+28
-10
lines changed

1 file changed

+28
-10
lines changed

book/installation.rst

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Installing and Configuring Symfony
55
==================================
66

7-
The goal of this chapter is to get you up-and-running with a working application
7+
The goal of this chapter is to get you up and running with a working application
88
built on top of Symfony. Fortunately, Symfony offers "distributions", which
99
are functional Symfony "starter" projects that you can download and begin
1010
developing in immediately.
@@ -35,7 +35,7 @@ Symfony2 distribution. Here, you'll need to make two choices:
3535
on your computer, you should download Symfony2 "without vendors", as it
3636
adds a bit more flexibility when including third-party/vendor libraries.
3737

38-
Download one of the archives somewhere under your local web server/s root
38+
Download one of the archives somewhere under your local web server's root
3939
directory and unpack it. From a UNIX command line, this can be done with
4040
one of the following commands (replacing ``###`` with your actual filename):
4141

@@ -94,7 +94,7 @@ sample code inside the ``src/`` directory.
9494

9595
Symfony2 comes with a visual server configuration tester to help make sure
9696
your Web server and PHP are configured to use Symfony. Use the following URL
97-
URL to check your configuration:
97+
to check your configuration:
9898

9999
.. code-block:: text
100100
@@ -142,23 +142,41 @@ development! Your distribution may contain some sample code - check the
142142
to learn about what sample code was included with your distribution and how
143143
you can remove it later.
144144

145+
If you're new to Symfony, join us in the ":doc:`page_creation`", where you'll
146+
learn how to create pages, change configuration, and do everything else you'll
147+
need in your new application.
148+
145149
Using Source Control
146-
~~~~~~~~~~~~~~~~~~~~
150+
--------------------
147151

148152
If you're using a version control system like ``Git`` or ``Subversion``, you
149-
can begin committing your project as normal. If you've downloaded the archive
150-
*without vendors*, you can safely ignore the entire ``vendors/`` directory
151-
and not commit it to source control. With ``Git``, this is done by creating
152-
and adding the following to a ``.gitignore`` file:
153+
can setup your version control system and begin committing your project to
154+
it as normal. For ``Git``, this can be done easily with the following command:
155+
156+
.. code-block:: bash
157+
158+
git init
159+
160+
For more information on setting up and using Git, check out the `GitHub Bootcamp`_
161+
tutorials.
162+
163+
Ignoring the ``vendor/`` Directory
164+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
165+
166+
If you've downloaded the archive *without vendors*, you can safely ignore
167+
the entire ``vendors/`` directory and not commit it to source control. With
168+
``Git``, this is done by creating and adding the following to a ``.gitignore``
169+
file:
153170

154171
.. code-block:: text
155172
156173
vendor/
157174
158175
Now, the vendor directory won't be committed to source control. This is fine
159-
(actually, it's great!) because when someone else clones our checks out the
176+
(actually, it's great!) because when someone else clones or checks out the
160177
project, he/she can simply run the ``php bin/vendors.php`` script to download
161178
all the necessary vendor libraries.
162179

163180
.. _`http://symfony.com/download`: http://symfony.com/download
164-
.. _`Git`: http://git-scm.com/
181+
.. _`Git`: http://git-scm.com/
182+
.. _`GitHub Bootcamp`: http://help.github.com/set-up-git-redirect

0 commit comments

Comments
 (0)