Skip to content

Commit 522b036

Browse files
authored
Merge pull request #1339 from Morganov/format-note
Make note pretty-formatted
2 parents e9d78c7 + a660ce3 commit 522b036

File tree

2 files changed

+18
-4
lines changed

2 files changed

+18
-4
lines changed

book/01-introduction/sections/installing.asc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,14 +87,19 @@ $ sudo apt-get install dh-autoreconf libcurl4-gnutls-dev libexpat1-dev \
8787
gettext libz-dev libssl-dev
8888
----
8989

90-
In order to be able to add the documentation in various formats (doc, html, info), these additional dependencies are required (Note: users of RHEL and RHEL-derivatives like CentOS and Scientific Linux will have to https://fedoraproject.org/wiki/EPEL#How_can_I_use_these_extra_packages.3F[enable the EPEL repository] to download the `docbook2X` package):
90+
In order to be able to add the documentation in various formats (doc, html, info), these additional dependencies are required:
9191

9292
[source,console]
9393
----
9494
$ sudo dnf install asciidoc xmlto docbook2X
9595
$ sudo apt-get install asciidoc xmlto docbook2x
9696
----
9797

98+
[NOTE]
99+
====
100+
Users of RHEL and RHEL-derivatives like CentOS and Scientific Linux will have to https://fedoraproject.org/wiki/EPEL#How_can_I_use_these_extra_packages.3F[enable the EPEL repository] to download the `docbook2X` package.
101+
====
102+
98103
If you're using a Debian-based distribution (Debian/Ubuntu/Ubuntu-derivatives), you also need the `install-info` package:
99104

100105
[source,console]

book/02-git-basics/sections/recording-changes.asc

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,11 @@ $ git commit
420420
----
421421

422422
Doing so launches your editor of choice.
423-
(This is set by your shell's `EDITOR` environment variable -- usually vim or emacs, although you can configure it with whatever you want using the `git config --global core.editor` command as you saw in <<ch01-getting-started#ch01-getting-started>>).(((editor, changing default)))(((git commands, config)))
423+
424+
[NOTE]
425+
====
426+
This is set by your shell's `EDITOR` environment variable -- usually vim or emacs, although you can configure it with whatever you want using the `git config --global core.editor` command as you saw in <<ch01-getting-started#ch01-getting-started>>.(((editor, changing default)))(((git commands, config)))
427+
====
424428

425429
The editor displays the following text (this example is a Vim screen):
426430

@@ -444,8 +448,13 @@ The editor displays the following text (this example is a Vim screen):
444448

445449
You can see that the default commit message contains the latest output of the `git status` command commented out and one empty line on top.
446450
You can remove these comments and type your commit message, or you can leave them there to help you remember what you're committing.
447-
(For an even more explicit reminder of what you've modified, you can pass the `-v` option to `git commit`.
448-
Doing so also puts the diff of your change in the editor so you can see exactly what changes you're committing.)
451+
452+
[NOTE]
453+
====
454+
For an even more explicit reminder of what you've modified, you can pass the `-v` option to `git commit`.
455+
Doing so also puts the diff of your change in the editor so you can see exactly what changes you're committing.
456+
====
457+
449458
When you exit the editor, Git creates your commit with that commit message (with the comments and diff stripped out).
450459

451460
Alternatively, you can type your commit message inline with the `commit` command by specifying it after a `-m` flag, like this:

0 commit comments

Comments
 (0)