public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Merge pull request #2054 from peterkokot/patch-doc 

Doc intro and libraries typos
pull/2063/head
Jordi Boggiano 2013-07-01 00:58:07 -07:00
parent 424407af72 6bbd2b2803
commit 94ff1ed8f7
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/00-intro.md
View File

@ -19,9 +19,9 @@ The problem that Composer solves is this:
a) You have a project that depends on a number of libraries. a) You have a project that depends on a number of libraries.
b) Some of those libraries depend on other libraries . b) Some of those libraries depend on other libraries.
c) You declare the things you depend on c) You declare the things you depend on.
d) Composer finds out which versions of which packages need to be installed, and d) Composer finds out which versions of which packages need to be installed, and
installs them (meaning it downloads them into your project). installs them (meaning it downloads them into your project).
@ -111,7 +111,7 @@ composer.phar:
> **Note:** If the above fails due to file_get_contents, use the `http` url or enable php_openssl.dll in php.ini > **Note:** If the above fails due to file_get_contents, use the `http` url or enable php_openssl.dll in php.ini
Create a new `.bat` file alongside composer: Create a new `composer.bat` file alongside `composer.phar`:
C:\bin>echo @php "%~dp0composer.phar" %*>composer.bat C:\bin>echo @php "%~dp0composer.phar" %*>composer.bat

10
doc/02-libraries.md
View File

@ -1,6 +1,6 @@
# Libraries # Libraries
This chapter will tell you how to make your library installable through composer. This chapter will tell you how to make your library installable through Composer.
## Every project is a package ## Every project is a package
@ -29,7 +29,7 @@ convention is all lowercase and dashes for word separation.
## Platform packages ## Platform packages
Composer has platform packages, which are virtual packages for things that are Composer has platform packages, which are virtual packages for things that are
installed on the system but are not actually installable by composer. This installed on the system but are not actually installable by Composer. This
includes PHP itself, PHP extensions and some system libraries. includes PHP itself, PHP extensions and some system libraries.
* `php` represents the PHP version of the user, allowing you to apply * `php` represents the PHP version of the user, allowing you to apply
@ -161,7 +161,7 @@ We do this by adding a package repository specification to the blog's
For more details on how package repositories work and what other types are For more details on how package repositories work and what other types are
available, see [Repositories](05-repositories.md). available, see [Repositories](05-repositories.md).
That's all. You can now install the dependencies by running composer's That's all. You can now install the dependencies by running Composer's
`install` command! `install` command!
**Recap:** Any git/svn/hg repository containing a `composer.json` can be added **Recap:** Any git/svn/hg repository containing a `composer.json` can be added
@ -177,8 +177,8 @@ The other thing that you may have noticed is that we did not specify a package
repository for `monolog/monolog`. How did that work? The answer is packagist. repository for `monolog/monolog`. How did that work? The answer is packagist.
[Packagist](https://packagist.org/) is the main package repository for [Packagist](https://packagist.org/) is the main package repository for
composer, and it is enabled by default. Anything that is published on Composer, and it is enabled by default. Anything that is published on
packagist is available automatically through composer. Since monolog packagist is available automatically through Composer. Since monolog
[is on packagist](https://packagist.org/packages/monolog/monolog), we can depend [is on packagist](https://packagist.org/packages/monolog/monolog), we can depend
on it without having to specify any additional repositories. on it without having to specify any additional repositories.