瀏覽代碼

Merge pull request #1222 from compwright/patch-3

Minor English and readability improvements
Jordi Boggiano 12 年之前
父節點
當前提交
6cd838a0d7
共有 1 個文件被更改,包括 8 次插入7 次删除
  1. 8 7
      doc/articles/troubleshooting.md

+ 8 - 7
doc/articles/troubleshooting.md

@@ -38,22 +38,23 @@ If composer shows memory errors on some commands:
 
     PHP Fatal error:  Allowed memory size of XXXXXX bytes exhausted <...>
 
-The `memory_limit` ini value should be increased.
+The PHP `memory_limit` should be increased.
 
-> **Note:** Composer internally increases the memory_limit to 512M.
-> It is a good idea to create an issue for composer if you get memory errors.
+> **Note:** Composer internally increases the `memory_limit` to `512M`.
+> If you have memory issues when using composer, please consider [creating
+> an issue ticket](https://github.com/composer/composer/issues) so we can look into it.
 
-Get current value:
+To get the current `memory_limit` value, run:
 
     php -r "echo ini_get('memory_limit').PHP_EOL;"
 
-Increase limit with `php.ini` for a `CLI SAPI` (ex. `/etc/php5/cli/php.ini` for
+Try increasing the limit in your `php.ini` file (ex. `/etc/php5/cli/php.ini` for
 Debian-like systems):
 
-    ; Use -1 for unlimited or define explicit value like 512M
+    ; Use -1 for unlimited or define an explicit value like 512M
     memory_limit = -1
 
-Or with command line arguments:
+Or, you can increase the limit with a command-line argument:
 
     php -d memory_limit=-1 composer.phar <...>