From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Jun 2013 22:07:55 +0000 (-0700)
Subject: Merge branch 'wk/doc-git-has-grown'
X-Git-Tag: v1.8.4-rc0~121
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0784466657d9d728a37c006ee96fac273ef31dbb?hp=-c

Merge branch 'wk/doc-git-has-grown'

* wk/doc-git-has-grown:
user-manual: Update download size for Git and the kernel
---

0784466657d9d728a37c006ee96fac273ef31dbb
diff --combined Documentation/user-manual.txt
index 2436124de2,1cbf5af472..644acce079
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@@ -57,10 -57,10 +57,10 @@@ download a copy of an existing reposito
  project in mind, here are some interesting examples:
  
  ------------------------------------------------
- 	# Git itself (approx. 10MB download):
+ 	# Git itself (approx. 40MB download):
  $ git clone git://git.kernel.org/pub/scm/git/git.git
- 	# the Linux kernel (approx. 150MB download):
- $ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
+ 	# the Linux kernel (approx. 640MB download):
+ $ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
  ------------------------------------------------
  
  The initial clone may be time-consuming for a large project, but you
@@@ -4256,16 -4256,15 +4256,16 @@@ no longer need to call `setup_pager()` 
  Nowadays, `git log` is a builtin, which means that it is _contained_ in the
  command `git`.  The source side of a builtin is
  
 -- a function called `cmd_<bla>`, typically defined in `builtin-<bla>.c`,
 -  and declared in `builtin.h`,
 +- a function called `cmd_<bla>`, typically defined in `builtin/<bla.c>`
 +  (note that older versions of Git used to have it in `builtin-<bla>.c`
 +  instead), and declared in `builtin.h`.
  
  - an entry in the `commands[]` array in `git.c`, and
  
  - an entry in `BUILTIN_OBJECTS` in the `Makefile`.
  
  Sometimes, more than one builtin is contained in one source file.  For
 -example, `cmd_whatchanged()` and `cmd_log()` both reside in `builtin-log.c`,
 +example, `cmd_whatchanged()` and `cmd_log()` both reside in `builtin/log.c`,
  since they share quite a bit of code.  In that case, the commands which are
  _not_ named like the `.c` file in which they live have to be listed in
  `BUILT_INS` in the `Makefile`.
@@@ -4288,10 -4287,10 +4288,10 @@@ For the sake of clarity, let's stay wit
  - is plumbing, and
  
  - was around even in the initial commit (it literally went only through
 -  some 20 revisions as `cat-file.c`, was renamed to `builtin-cat-file.c`
 +  some 20 revisions as `cat-file.c`, was renamed to `builtin/cat-file.c`
    when made a builtin, and then saw less than 10 versions).
  
 -So, look into `builtin-cat-file.c`, search for `cmd_cat_file()` and look what
 +So, look into `builtin/cat-file.c`, search for `cmd_cat_file()` and look what
  it does.
  
  ------------------------------------------------------------------
@@@ -4367,7 -4366,7 +4367,7 @@@ Another example: Find out what to do i
  builtin:
  
  -------------------------------------------------
 -$ git log --no-merges --diff-filter=A builtin-*.c
 +$ git log --no-merges --diff-filter=A builtin/*.c
  -------------------------------------------------
  
  You see, Git is actually the best tool to find out about the source of Git