Merge branch 'maint'

* maint:
  user-manual: Rewrite git-gc section for automatic packing
  user-manual: Fix 'you - Git' -> 'you--Git' typo
  user-manual: Fix 'http' -> 'HTTP' typos
  user-manual: Fix 'both: so' -> 'both; so' typo

diff --cc Documentation/user-manual.txt
index 5077e7cd2017454bb50b120354d27c9716dad7a0,4cb8325260652c7561a77aede0648e5b21b00508..32cadc3f73efdabcebd4d3e49b5597e5a5dbd504
--- 1/Documentation/user-manual.txt
--- 2/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@@ -1562,17 -1562,11 +1562,11 @@@ Ensuring good performanc
  -------------------------
  
  On large repositories, Git depends on compression to keep the history
- information from taking up too much space on disk or in memory.
- 
- This compression is not performed automatically.  Therefore you
- should occasionally run linkgit:git-gc[1]:
- 
- -------------------------------------------------
- $ git gc
- -------------------------------------------------
- 
- to recompress the archive.  This can be very time-consuming, so
- you may prefer to run `git gc` when you are not doing other work.
+ information from taking up too much space on disk or in memory.  Some
 -git commands may automatically run linkgit:git-gc[1], so you don't
++Git commands may automatically run linkgit:git-gc[1], so you don't
+ have to worry about running it manually.  However, compressing a large
+ repository may take a while, so you may want to call `gc` explicitly
+ to avoid automatic compression kicking in when it is not convenient.
  
  
  [[ensuring-reliability]]
@@@ -1931,13 -1925,13 +1925,13 @@@ linkgit:git-daemon[1] man page for deta
  examples section.)
  
  [[exporting-via-http]]
- Exporting a Git repository via http
+ Exporting a git repository via HTTP
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  
 -The git protocol gives better performance and reliability, but on a
 +The Git protocol gives better performance and reliability, but on a
- host with a web server set up, http exports may be simpler to set up.
+ host with a web server set up, HTTP exports may be simpler to set up.
  
 -All you need to do is place the newly created bare git repository in
 +All you need to do is place the newly created bare Git repository in
  a directory that is exported by the web server, and make some
  adjustments to give web clients some extra information they need: