Merge pull request #1418 from Morganov/small-fixes

Fix formatting

Author: ben

book/07-git-tools/sections/credentials.asc

@@ -164,9 +164,9 @@ Once again, we'll write this extension in Ruby, but any language will work so lo
 Here's the full source code of our new credential helper:
 
 [source,ruby]
---------
+----
 include::../git-credential-read-only[]
---------
+----
 
 <1> Here we parse the command-line options, allowing the user to specify the input file.
     The default is `~/.git-credentials`.

book/07-git-tools/sections/signing.asc

@@ -51,7 +51,7 @@ user: "Ben Straub <[email protected]>"
 If you run `git show` on that tag, you can see your GPG signature attached to it:
 
 [source,console]
---------
+----
 $ git show v1.5
 tag v1.5
 Tagger: Ben Straub <[email protected]>
@@ -75,7 +75,7 @@ Author: Scott Chacon <[email protected]>
 Date:   Mon Mar 17 21:52:11 2008 -0700
 
     Change version number
---------
+----
 
 ==== Verifying Tags
 

book/09-git-and-other-scms/sections/client-bzr.asc

@@ -10,6 +10,7 @@ Nevertheless, it is possible to work on a Bazaar repository from a Git one.
 There are many projects that allow you to use Git as a Bazaar client.
 Here we'll use Felipe Contreras' project that you may find at https://github.com/felipec/git-remote-bzr[].
 To install it, you just have to download the file git-remote-bzr in a folder contained in your `$PATH`:
+
 [source,console]
 ----
 $ wget https://raw.github.com/felipec/git-remote-bzr/master/git-remote-bzr -O ~/bin/git-remote-bzr
@@ -24,10 +25,11 @@ That's all!
 It is simple to use.
 It is enough to clone a Bazaar repository prefixing it by `bzr::`.
 Since Git and Bazaar both do full clones to your machine, it's possible to attach a Git clone to your local Bazaar clone, but it isn't recommended.
-It's much easier to attach your Git clone directly to the same place your Bazaar clone is attached to ‒ the central repository.
+It's much easier to attach your Git clone directly to the same place your Bazaar clone is attached to -- the central repository.
 
 Let's suppose that you worked with a remote repository which is at address `bzr+ssh://developer@mybazaarserver:myproject`.
 Then you must clone it in the following way:
+
 [source,console]
 ----
 $ git clone bzr::bzr+ssh://developer@mybazaarserver:myproject myProject-Git
@@ -36,6 +38,7 @@ $ cd myProject-Git
 
 At this point, your Git repository is created but it is not compacted for optimal disk use.
 That's why you should also clean and compact your Git repository, especially if it is a big one:
+
 [source,console]
 ----
 $ git gc --aggressive
@@ -45,18 +48,21 @@ $ git gc --aggressive
 
 Bazaar only allows you to clone branches, but a repository may contain several branches, and `git-remote-bzr` can clone both.
 For example, to clone a branch:
+
 [source,console]
 ----
 $ git clone bzr::bzr://bzr.savannah.gnu.org/emacs/trunk emacs-trunk
 ----
 
 And to clone the whole repository:
+
 [source,console]
 ----
 $ git clone bzr::bzr://bzr.savannah.gnu.org/emacs emacs
 ----
 
 The second command clones all the branches contained in the emacs repository; nevertheless, it is possible to point out some branches:
+
 [source,console]
 ----
 $ git config remote-bzr.branches 'trunk, xwindow'
@@ -99,6 +105,7 @@ However, be careful with its creation because with Git it is impossible to re-in
 
 To fetch the changes of the remote, you pull changes as usually, using Git commands.
 Supposing that your changes are on the `master` branch, you merge or rebase your work on the `origin/master` branch:
+
 [source,console]
 ----
 $ git pull --rebase origin
@@ -110,6 +117,7 @@ Because Bazaar also has the concept of merge commits, there will be no problem i
 So you can work on a branch, merge the changes into `master` and push your work.
 Then, you create your branches, you test and commit your work as usual.
 You finally push your work to the Bazaar repository:
+
 [source,console]
 ----
 $ git push origin master

book/09-git-and-other-scms/sections/import-bzr.asc

@@ -52,6 +52,7 @@ Traceback (most recent call last):
 ImportError: No module named fastimport
 $ pip install fastimport
 ----
+
 If it is not available, you can download it at address https://pypi.python.org/pypi/fastimport/.
 
 In the second case (on Windows), `bzr-fastimport` is automatically installed with the standalone version and the default installation (let all the checkboxes checked).

book/A-git-in-other-environments/sections/bash.asc

@@ -8,9 +8,9 @@ First, you need to get a copy of the `contrib/completion/git-completion.bash` fi
 Copy it somewhere handy, like your home directory, and add this to your `.bashrc`:
 
 [source,console]
------
+----
 . ~/git-completion.bash
------
+----
 
 Once that's done, change your directory to a Git repository, and type:
 
@@ -27,11 +27,11 @@ This can be as simple or complex as you want, but there are generally a few key
 To add these to your prompt, just copy the `contrib/completion/git-prompt.sh` file from Git's source repository to your home directory, add something like this to your `.bashrc`:
 
 [source,console]
------
+----
 . ~/git-prompt.sh
 export GIT_PS1_SHOWDIRTYSTATE=1
 export PS1='\w$(__git_ps1 " (%s)")\$ '
------
+----
 
 The `\w` means print the current working directory, the `\$` prints the `$` part of the prompt, and `__git_ps1 " (%s)"` calls the function provided by `git-prompt.sh` with a formatting argument.
 Now your bash prompt will look like this when you're anywhere inside a Git-controlled project:

book/A-git-in-other-environments/sections/guis.asc

@@ -43,9 +43,9 @@ In between is a collection of controls used for searching history.
 It, too, is easiest to invoke from the command line:
 
 [source,console]
------
+----
 $ git gui
------
+----
 
 And it looks something like this:
 

book/A-git-in-other-environments/sections/powershell.asc

@@ -12,32 +12,39 @@ It looks like this:
 image::images/posh-git.png[PowerShell with Posh-git.]
 
 ==== Installation
+
 ===== Prerequisites (Windows only)
-Before you're able to run PowerShell scripts on your machine, you need to set your local ExecutionPolicy to RemoteSigned (Basically anything except Undefined and Restricted).
-If you choose AllSigned instead of RemoteSigned, also local scripts (your own) need to be digitally signed in order to be executed.
-With RemoteSigned, only Scripts having the "ZoneIdentifier" set to Internet (were downloaded from the web) need to be signed, others not.
-If you're an administrator and want to set it for all Users on that machine, use "-Scope LocalMachine".
-If you're a normal user, without administrative rights, you can use "-Scope CurrentUser" to set it only for you.
+
+Before you're able to run PowerShell scripts on your machine, you need to set your local `ExecutionPolicy` to `RemoteSigned` (basically, anything except `Undefined` and `Restricted`).
+If you choose `AllSigned` instead of `RemoteSigned`, also local scripts (your own) need to be digitally signed in order to be executed.
+With `RemoteSigned`, only scripts having the `ZoneIdentifier` set to `Internet` (were downloaded from the web) need to be signed, others not.
+If you're an administrator and want to set it for all users on that machine, use `-Scope LocalMachine`.
+If you're a normal user, without administrative rights, you can use `-Scope CurrentUser` to set it only for you.
 
 More about PowerShell Scopes: https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_scopes[]
 
 More about PowerShell ExecutionPolicy: https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.security/set-executionpolicy[]
 
+To set the value of `ExecutionPolicy` to `RemoteSigned` for all users use the next command:
+
 [source,powershell]
------
+----
 > Set-ExecutionPolicy -Scope LocalMachine -ExecutionPolicy RemoteSigned -Force
------
+----
 
 ===== PowerShell Gallery
+
 If you have at least PowerShell 5 or PowerShell 4 with PackageManagement installed, you can use the package manager to install posh-git for you.
 
 More information about PowerShell Gallery: https://docs.microsoft.com/en-us/powershell/scripting/gallery/overview[]
+
 [source,powershell]
------
+----
 > Install-Module posh-git -Scope CurrentUser -Force
 > Install-Module posh-git -Scope CurrentUser -AllowPrerelease -Force # Newer beta version with PowerShell Core support
------
-If you want to install posh-git for all users, use "-Scope AllUsers" instead and execute the command from an elevated PowerShell console.
+----
+
+If you want to install posh-git for all users, use `-Scope AllUsers` instead and execute the command from an elevated PowerShell console.
 If the second command fails with an error like `Module 'PowerShellGet' was not installed by using Install-Module`, you'll need to run another command first:
 
 [source,powershell]
@@ -49,26 +56,31 @@ Then you can go back and try again.
 This happens, because the modules that ship with Windows PowerShell are signed with a different publishment certificate.
 
 ===== Update PowerShell Prompt
+
 To include git information in your prompt, the posh-git module needs to be imported.
-To have posh-git imported every time PowerShell starts, execute the Add-PoshGitToProfile command which will add the import statement into you $profile script.
+To have posh-git imported every time PowerShell starts, execute the `Add-PoshGitToProfile` command which will add the import statement into your `$profile` script.
 This script is executed everytime you open a new PowerShell console.
-Keep in mind, that there are multiple $profile scripts.
+Keep in mind, that there are multiple `$profile` scripts.
 E. g. one for the console and a separate one for the ISE.
+
 [source,powershell]
------
+----
 > Import-Module posh-git
 > Add-PoshGitToProfile -AllHosts
------
+----
 
 ===== From Source
-Just download a posh-git release from (https://github.com/dahlbyk/posh-git[]), and uncompress it.
-Then import the module using the full path to the posh-git.psd1 file:
+
+Just download a posh-git release from https://github.com/dahlbyk/posh-git/releases[], and uncompress it.
+Then import the module using the full path to the `posh-git.psd1` file:
+
 [source,powershell]
------
+----
 > Import-Module <path-to-uncompress-folder>\src\posh-git.psd1
 > Add-PoshGitToProfile -AllHosts
------
+----
 
 This will add the proper line to your `profile.ps1` file, and posh-git will be active the next time you open PowerShell.
+
 For a description of the Git status summary information displayed in the prompt see: https://github.com/dahlbyk/posh-git/blob/master/README.md#git-status-summary-information[]
 For more details on how to customize your posh-git prompt see: https://github.com/dahlbyk/posh-git/blob/master/README.md#customization-variables[]

book/A-git-in-other-environments/sections/zsh.asc

@@ -37,14 +37,12 @@ This results in a display of the current branch on the right-hand side of the te
 (The left side is supported as well, of course; just uncomment the assignment to PROMPT.)
 It looks a bit like this:
 
-.Customized `zsh` prompt.
+.Customized `zsh` prompt
 image::images/zsh-prompt.png[Customized `zsh` prompt.]
 
-For more information on vcs_info, check out its documentation
-        in the `zshcontrib(1)` manual page,
-        or online at http://zsh.sourceforge.net/Doc/Release/User-Contributions.html#Version-Control-Information[].
+For more information on `vcs_info`, check out its documentation in the `zshcontrib(1)` manual page, or online at http://zsh.sourceforge.net/Doc/Release/User-Contributions.html#Version-Control-Information[].
 
-Instead of vcs_info, you might prefer the prompt customization script that ships with Git, called `git-prompt.sh`; see https://github.com/git/git/blob/master/contrib/completion/git-prompt.sh[] for details.
+Instead of `vcs_info`, you might prefer the prompt customization script that ships with Git, called `git-prompt.sh`; see https://github.com/git/git/blob/master/contrib/completion/git-prompt.sh[] for details.
 `git-prompt.sh` is compatible with both Bash and Zsh.
 
 Zsh is powerful enough that there are entire frameworks dedicated to making it better.
@@ -53,5 +51,5 @@ oh-my-zsh's plugin system comes with powerful git tab-completion, and it has a v
 <<oh_my_zsh_git>> is just one example of what can be done with this system.
 
 [[oh_my_zsh_git]]
-.An example of an oh-my-zsh theme.
+.An example of an oh-my-zsh theme
 image::images/zsh-oh-my.png[An example of an oh-my-zsh theme.]

book/B-embedding-git/sections/dulwich.asc

@@ -11,7 +11,7 @@ Dulwich follows git design and separate two basic levels of API: plumbing and po
 Here is an example of using the lower level API to access the commit message of the last commit:
 
 [source, python]
------
+----
 from dulwich.repo import Repo
 r = Repo('.')
 r.head()
@@ -23,19 +23,19 @@ c
 
 c.message
 # 'Add note about encoding.\n'
------
+----
 
 To print a commit log using high-level porcelain API, one can use:
 
 [source, python]
------
+----
 from dulwich import porcelain
 porcelain.log('.', max_entries=1)
 
 #commit: 57fbe010446356833a6ad1600059d80b1e731e15
 #Author: Jelmer Vernooij <[email protected]>
 #Date:   Sat Apr 29 2017 23:57:34 +0000
------
+----
 
 
 ==== Further Reading

book/B-embedding-git/sections/go-git.asc

@@ -10,20 +10,19 @@ go-git is focused on extensibility, compatibility and supports most of the plumb
 Here is a basic example of using Go APIs:
 
 [source, go]
------
+----
 import "github.com/go-git/go-git/v5"
 
 r, err := git.PlainClone("/tmp/foo", false, &git.CloneOptions{
     URL:      "https://github.com/go-git/go-git",
     Progress: os.Stdout,
 })
------
+----
 
 As soon as you have a `Repository` instance, you can access information and perform mutations on it:
 
-
 [source, go]
------
+----
 // retrieves the branch pointed by HEAD
 ref, err := r.Head()
 
@@ -37,20 +36,19 @@ history, err := commit.History()
 for _, c := range history {
     fmt.Println(c)
 }
------
-
+----
 
 ==== Advanced Functionality
 
 go-git has few notable advanced features, one of which is a pluggable storage system, which is similar to Libgit2 backends.
 The default implementation is in-memory storage, which is very fast.
 
 [source, go]
------
+----
 r, err := git.Clone(memory.NewStorage(), nil, &git.CloneOptions{
     URL: "https://github.com/go-git/go-git",
 })
------
+----
 
 Pluggable storage provides many interesting options.
 For instance, https://github.com/go-git/go-git/tree/master/_examples/storage[] allows you to store references, objects, and configuration in an Aerospike database.
@@ -61,24 +59,23 @@ Using https://pkg.go.dev/github.com/go-git/go-billy/v5?tab=doc#Filesystem[] it i
 Another advanced use-case includes a fine-tunable HTTP client, such as the one found at https://github.com/go-git/go-git/blob/master/_examples/custom_http/main.go[].
 
 [source, go]
------
+----
 customClient := &http.Client{
-	Transport: &http.Transport{ // accept any certificate (might be useful for testing)
-		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-	},
-	Timeout: 15 * time.Second,  // 15 second timeout
-		CheckRedirect: func(req *http.Request, via []*http.Request) error {
-		return http.ErrUseLastResponse // don't follow redirect
-	},
+    Transport: &http.Transport{ // accept any certificate (might be useful for testing)
+        TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+    },
+    Timeout: 15 * time.Second,  // 15 second timeout
+        CheckRedirect: func(req *http.Request, via []*http.Request) error {
+        return http.ErrUseLastResponse // don't follow redirect
+    },
 }
 
 // Override http(s) default protocol to use our custom client
 client.InstallProtocol("https", githttp.NewClient(customClient))
 
 // Clone repository using the new client if the protocol is https://
 r, err := git.Clone(memory.NewStorage(), nil, &git.CloneOptions{URL: url})
------
-
+----
 
 ==== Further Reading