From 68f5eaa033383f8026cabc2492016007b6fcd393 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=88=90=E6=AD=A6?= Date: Thu, 9 Jan 2014 08:55:50 +0800 Subject: [PATCH] update 05-repositories.md 06-community.md --- cn-introduction/05-repositories.md | 35 +++++++++++++++++++++++++----- cn-introduction/06-community.md | 35 +++++++++++------------------- 2 files changed, 43 insertions(+), 27 deletions(-) diff --git a/cn-introduction/05-repositories.md b/cn-introduction/05-repositories.md index 44a828b..c58696d 100644 --- a/cn-introduction/05-repositories.md +++ b/cn-introduction/05-repositories.md @@ -2,6 +2,34 @@ 本章将解释包和库的概念，什么样的存储库是可用的，以及它们如何工作。 +--- + +- 资源库 + - 概述 + - 包 + - 资源库 + - Types + - Composer + - packages + - notify-batch + - includes + - provider-includes and providers-url + - stream options + - VCS + - 从 VCS 资源库加载一个包 + - 使用私有资源库 + - Git 的备选方案 + - Subversion 选项 + - PEAR + - 自定义供应商别名 + - Package + - Hosting your own + - Packagist + - Satis + - Artifact + - 禁用 Packagist + +--- ## 概述 在此之前，我们看到存在不同类型的资源库，我们需要了解一些基本概念，以理解 Composer 是如何构建于其上的。 @@ -400,12 +428,9 @@ Satis 是一个静态的 `composer` 资源库生成器。它像是一个超轻 composer.json ... -If there are two archives with different versions of a package, they are both -imported. When an archive with a newer version is added in the artifact folder -and you run `update`, that version will be imported as well and Composer will -update to the latest version. +如果有两个不同版本的资源包，它们都会被导入。当有一个新版本的存档被添加到 artifact 文件夹，并且你运行了 `update` 命令，该版本就会被导入，并且 Composer 将更新到最新版本。 -## Disabling Packagist +## 禁用 Packagist 你可以在 `composer.json` 中禁用默认的 Packagist 资源库。 diff --git a/cn-introduction/06-community.md b/cn-introduction/06-community.md index 10ef31b..e5ccb81 100644 --- a/cn-introduction/06-community.md +++ b/cn-introduction/06-community.md @@ -1,34 +1,25 @@ -# Community +# 社区 -There are many people using composer already, and quite a few of them are -contributing. +已经后很多人在使用 composer，也有很多人为它做出了贡献。 -## Contributing +## 贡献 -If you would like to contribute to composer, please read the -[README](https://github.com/composer/composer). +如果你想为 composer 做出自己的贡献，请阅读 [README](https://github.com/composer/composer). -The most important guidelines are described as follows: +最重要的原则介绍如下： -> All code contributions - including those of people having commit access - must -> go through a pull request and approved by a core developer before being -> merged. This is to ensure proper review of all the code. +> 所有贡献的代码 - 包括那些具有提交权限的人 - 必须通过一个 pull request 提交，并在合并前由核心开发人员的核准。 > -> Fork the project, create a feature branch, and send us a pull request. +> Fork 这个项目名称，创建一个特性分支，并给我们发送 pull request。 > -> To ensure a consistent code base, you should make sure the code follows -> the [Coding Standards](http://symfony.com/doc/2.0/contributing/code/standards.html) -> which we borrowed from Symfony. +> 为了与基础代码保持一致，你应该确保代码遵循 [编码规范](http://symfony.com/doc/2.0/contributing/code/standards.html)。 -## IRC / mailing list +## IRC频道 / 邮件列表 -Mailing lists for [user support](http://groups.google.com/group/composer-users) and -[development](http://groups.google.com/group/composer-dev). +邮件列表：[用户支持](http://groups.google.com/group/composer-users) / [开发者](http://groups.google.com/group/composer-dev)。 -IRC channels are on irc.freenode.org: [#composer](irc://irc.freenode.org/composer) -for users and [#composer-dev](irc://irc.freenode.org/composer-dev) for development. +irc.freenode.org 上的 IRC 频道：[#composer](irc://irc.freenode.org/composer) （用户）/ [#composer-dev](irc://irc.freenode.org/composer-dev)（开发者）。 -Stack Overflow has a growing collection of -[Composer related questions](http://stackoverflow.com/questions/tagged/composer-php). +Stack Overflow 上有越来越多 [Composer 相关问题](http://stackoverflow.com/questions/tagged/composer-php)的收藏。 -← [Repositories](05-repositories.md) +← [资源库](05-repositories.md)