469bfc962d · matheusbsbs/matheus-bagliano

Documentation/CodingGuidelines

+1 -1

@@ -157,7 +157,7 @@ Writing Documentation:

157 --sort=<key>

158 --abbrev[=<n>]

159

160 - Possibility of multiple occurences is indicated by three dots:

160 + Possibility of multiple occurrences is indicated by three dots:

161 <file>...

162 (One or more of <file>.)

163

Documentation/RelNotes/1.7.4.txt

+4 -5

@@ -8,12 +8,11 @@ Updates since v1.7.3

8 docbook-xsl >= 1.73. If you have older versions, you can set

9 ASCIIDOC7 and ASCIIDOC_ROFF, respectively.

10

11 - * The option parsers of various commands that create new branch (or

11 + * The option parsers of various commands that create new branches (or

12 rename existing ones to a new name) were too loose and users were

13 - allowed to call a branch with a name that begins with a dash by

14 - creative abuse of their command line options, which only lead to

15 - burn themselves. The name of a branch cannot begin with a dash

16 - now.

13 + allowed to give a branch a name that begins with a dash by creative

14 + abuse of their command line options, which only led to burning

15 + themselves. The name of a branch cannot begin with a dash now.

16

17 * System-wide fallback default attributes can be stored in

18 /etc/gitattributes; core.attributesfile configuration variable can

Documentation/config.txt

+2 -2

@@ -892,7 +892,7 @@ diff.wordRegex::

892

893 fetch.recurseSubmodules::

894 A boolean value which changes the behavior for fetch and pull, the

895 - default is to not recursively fetch populated sumodules unless

895 + default is to not recursively fetch populated submodules unless

896 configured otherwise.

897

898 fetch.unpackLimit::

@@ -1811,7 +1811,7 @@ submodule.<name>.update::

1811

1812 submodule.<name>.fetchRecurseSubmodules::

1813 This option can be used to enable/disable recursive fetching of this

1814 - submodule. It can be overriden by using the --[no-]recurse-submodules

1814 + submodule. It can be overridden by using the --[no-]recurse-submodules

1815 command line option to "git fetch" and "git pull".

1816 This setting will override that from in the linkgit:gitmodules[5]

1817 file.

Documentation/git-add.txt

+1 -1

@@ -333,7 +333,7 @@ likely to introduce confusing changes to the index.

333 There are also more complex operations that can be performed. But beware

334 that because the patch is applied only to the index and not the working

335 tree, the working tree will appear to "undo" the change in the index.

336 -For example, introducing a a new line into the index that is in neither

336 +For example, introducing a new line into the index that is in neither

337 the HEAD nor the working tree will stage the new line for commit, but

338 the line will appear to be reverted in the working tree.

339

Documentation/git-bundle.txt

+1 -1

@@ -59,7 +59,7 @@ unbundle <file>::

59

60 <git-rev-list-args>::

61 A list of arguments, acceptable to 'git rev-parse' and

62 - 'git rev-list' (and containg a named ref, see SPECIFYING REFERENCES

62 + 'git rev-list' (and containing a named ref, see SPECIFYING REFERENCES

63 below), that specifies the specific objects and references

64 to transport. For example, `master{tilde}10..master` causes the

65 current master reference to be packaged along with all objects

Documentation/git-fmt-merge-msg.txt

+1 -1

@@ -57,7 +57,7 @@ merge.log::

57 In addition to branch names, populate the log message with at

58 most the specified number of one-line descriptions from the

59 actual commits that are being merged. Defaults to false, and

60 - true is a synoym for 20.

60 + true is a synonym for 20.

61

62 merge.summary::

63 Synonym to `merge.log`; this is deprecated and will be removed in

Documentation/git-remote-ext.txt

+8 -8

@@ -15,12 +15,12 @@ This remote helper uses the specified 'program' to connect

15 to a remote git server.

16

17 Data written to stdin of this specified 'program' is assumed

18 -to be sent to git:// server, git-upload-pack, git-receive-pack

18 +to be sent to a git:// server, git-upload-pack, git-receive-pack

19 or git-upload-archive (depending on situation), and data read

20 from stdout of this program is assumed to be received from

21 the same service.

22

23 -Command and arguments are separated by unescaped space.

23 +Command and arguments are separated by an unescaped space.

24

25 The following sequences have a special meaning:

26

@@ -39,19 +39,19 @@ The following sequences have a special meaning:

39 git-upload-pack, or git-upload-archive) of the service

40 git wants to invoke.

41

42 -'%G' (must be first characters in argument)::

42 +'%G' (must be the first characters in an argument)::

43 This argument will not be passed to 'program'. Instead, it

44 - will cause helper to start by sending git:// service request to

45 - remote side with service field set to approiate value and

46 - repository field set to rest of the argument. Default is not to send

47 - such request.

44 + will cause the helper to start by sending git:// service requests to

45 + the remote side with the service field set to an appropriate value and

46 + the repository field set to rest of the argument. Default is not to send

47 + such a request.

48 +

49 This is useful if remote side is git:// server accessed over

50 some tunnel.

51

52 '%V' (must be first characters in argument)::

53 This argument will not be passed to 'program'. Instead it sets

54 - the vhost field in git:// service request (to rest of the argument).

54 + the vhost field in the git:// service request (to rest of the argument).

55 Default is not to send vhost in such request (if sent).

56

57 ENVIRONMENT VARIABLES:

Documentation/git-remote-fd.txt

+4 -4

@@ -11,20 +11,20 @@ SYNOPSIS

11

12 DESCRIPTION

13 -----------

14 -This helper uses specified file descriptors to connect to remote git server.

14 +This helper uses specified file descriptors to connect to a remote git server.

15 This is not meant for end users but for programs and scripts calling git

16 fetch, push or archive.

17

18 -If only <infd> is given, it is assumed to be bidirectional socket connected

18 +If only <infd> is given, it is assumed to be a bidirectional socket connected

19 to remote git server (git-upload-pack, git-receive-pack or

20 git-upload-achive). If both <infd> and <outfd> are given, they are assumed

21 -to be pipes connected to remote git server (<infd> being the inbound pipe

21 +to be pipes connected to a remote git server (<infd> being the inbound pipe

22 and <outfd> being the outbound pipe.

23

24 It is assumed that any handshaking procedures have already been completed

25 (such as sending service request for git://) before this helper is started.

26

27 -<anything> can be any string. It is ignored. It is meant for provoding

27 +<anything> can be any string. It is ignored. It is meant for providing

28 information to user in the URL in case that URL is displayed in some

29 context.

30

Documentation/git-svn.txt

+1 -1

@@ -613,7 +613,7 @@ old references to SVN revision numbers in existing documentation, bug

613 reports and archives. If you plan to eventually migrate from SVN to git

614 and are certain about dropping SVN history, consider

615 linkgit:git-filter-branch[1] instead. filter-branch also allows

616 -reformating of metadata for ease-of-reading and rewriting authorship

616 +reformatting of metadata for ease-of-reading and rewriting authorship

617 info for non-"svn.authorsFile" users.

618

619 svn.useSvmProps::

Documentation/gitmodules.txt

+1 -1

@@ -49,7 +49,7 @@ submodule.<name>.fetchRecurseSubmodules::

49 submodule. If this option is also present in the submodules entry in

50 .git/config of the superproject, the setting there will override the

51 one found in .gitmodules.

52 - Both settings can be overriden on the command line by using the

52 + Both settings can be overridden on the command line by using the

53 "--[no-]recurse-submodules" option to "git fetch" and "git pull"..

54

55 submodule.<name>.ignore::

Documentation/merge-config.txt

+1 -1

@@ -10,7 +10,7 @@ merge.log::

10 In addition to branch names, populate the log message with at

11 most the specified number of one-line descriptions from the

12 actual commits that are being merged. Defaults to false, and

13 - true is a synoym for 20.

13 + true is a synonym for 20.

14

15 merge.renameLimit::

16 The number of files to consider when performing rename detection

Documentation/technical/api-sigchain.txt

+1 -1

@@ -32,7 +32,7 @@ and installation code should look something like:

32 }

33 ------------------------------------------

34

35 -Handlers are given the typdef of sigchain_fun. This is the same type

35 +Handlers are given the typedef of sigchain_fun. This is the same type

36 that is given to signal() or sigaction(). It is perfectly reasonable to

37 push SIG_DFL or SIG_IGN onto the stack.

38

Fix typos in the documentation