Skip to content

Commit 37ad532

Browse files
author
Vipul Kumar
committed
[Fix] remove period mark from the figure captions
If a paragraph ends with a figure caption, it ends with double period marks. One of them is due to figure caption, which itself ends with a period and other is for end of paragraph. So removing period from figure captions would be a good idea, as Ben has suggested[1]. Due to this commit, now some paragraphs don't have any period mark at end of paragraph. Those period are their because of caption, that's paragraphs itself don't end with any period, see [2]. [1]: #1437 (comment) [2]: #1444 (comment) Resolves: #1437
1 parent 0b37439 commit 37ad532

File tree

28 files changed

+109
-109
lines changed

28 files changed

+109
-109
lines changed

book/01-introduction/sections/about-version-control.asc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ It is easy to forget which directory you're in and accidentally write to the wro
1919

2020
To deal with this issue, programmers long ago developed local VCSs that had a simple database that kept all the changes to files under revision control.
2121

22-
.Local version control.
22+
.Local version control
2323
image::images/local.png[Local version control diagram]
2424

2525
One of the most popular VCS tools was a system called RCS, which is still distributed with many computers today.
@@ -33,7 +33,7 @@ To deal with this problem, Centralized Version Control Systems (CVCSs) were deve
3333
These systems (such as CVS, Subversion, and Perforce) have a single server that contains all the versioned files, and a number of clients that check out files from that central place. (((CVS)))(((Subversion)))(((Perforce)))
3434
For many years, this has been the standard for version control.
3535

36-
.Centralized version control.
36+
.Centralized version control
3737
image::images/centralized.png[Centralized version control diagram]
3838

3939
This setup offers many advantages, especially over local VCSs.
@@ -54,7 +54,7 @@ In a DVCS (such as Git, Mercurial, Bazaar or Darcs), clients don't just check ou
5454
Thus, if any server dies, and these systems were collaborating via that server, any of the client repositories can be copied back up to the server to restore it.
5555
Every clone is really a full backup of all the data.
5656

57-
.Distributed version control.
57+
.Distributed version control
5858
image::images/distributed.png[Distributed version control diagram]
5959

6060
Furthermore, many of these systems deal pretty well with having several remote repositories they can work with, so you can collaborate with different groups of people in different ways simultaneously within the same project.

book/01-introduction/sections/installing.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ If you don't have it installed already, it will prompt you to install it.
4848
If you want a more up to date version, you can also install it via a binary installer.
4949
A macOS Git installer is maintained and available for download at the Git website, at https://git-scm.com/download/mac[].
5050

51-
.Git macOS Installer.
51+
.Git macOS Installer
5252
image::images/git-osx-installer.png[Git macOS installer.]
5353

5454
You can also install it as part of the GitHub for macOS install.

book/01-introduction/sections/what-is-git.asc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The major difference between Git and any other VCS (Subversion and friends inclu
1111
Conceptually, most other systems store information as a list of file-based changes.
1212
These other systems (CVS, Subversion, Perforce, Bazaar, and so on) think of the information they store as a set of files and the changes made to each file over time (this is commonly described as _delta-based_ version control).
1313

14-
.Storing data as changes to a base version of each file.
14+
.Storing data as changes to a base version of each file
1515
image::images/deltas.png[Storing data as changes to a base version of each file.]
1616

1717
Git doesn't think of or store its data this way.
@@ -20,7 +20,7 @@ With Git, every time you commit, or save the state of your project, Git basicall
2020
To be efficient, if files have not changed, Git doesn't store the file again, just a link to the previous identical file it has already stored.
2121
Git thinks about its data more like a *stream of snapshots*.
2222

23-
.Storing data as snapshots of the project over time.
23+
.Storing data as snapshots of the project over time
2424
image::images/snapshots.png[Git stores data as snapshots of the project over time.]
2525

2626
This is an important distinction between Git and nearly all other VCSs.
@@ -84,7 +84,7 @@ Git has three main states that your files can reside in: _modified_, _staged_, a
8484

8585
This leads us to the three main sections of a Git project: the working tree, the staging area, and the Git directory.
8686

87-
.Working tree, staging area, and Git directory.
87+
.Working tree, staging area, and Git directory
8888
image::images/areas.png["Working tree, staging area, and Git directory."]
8989

9090
The working tree is a single checkout of one version of the project.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ When you first clone a repository, all of your files will be tracked and unmodif
1313
As you edit files, Git sees them as modified, because you've changed them since your last commit.
1414
As you work, you selectively stage these modified files and then commit all those staged changes, and the cycle repeats.
1515

16-
.The lifecycle of the status of your files.
16+
.The lifecycle of the status of your files
1717
image::images/lifecycle.png[The lifecycle of the status of your files.]
1818

1919
[[_checking_status]]

book/03-git-branching/sections/rebasing.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ For instance, in the previous scenario, if instead of doing a merge when we're a
198198
So instead of the result we see in <<_merge_rebase_work>>, we would end up with something more like <<_rebase_rebase_work>>.
199199

200200
[[_rebase_rebase_work]]
201-
.Rebase on top of force-pushed rebase work.
201+
.Rebase on top of force-pushed rebase work
202202
image::images/perils-of-rebasing-5.png[Rebase on top of force-pushed rebase work.]
203203

204204
This only works if `C4` and `C4'` that your partner made are almost exactly the same patch.

book/04-git-server/sections/gitlab.asc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ To get something up and running quickly, you can download a virtual machine imag
1616
One nice touch Bitnami has included is the login screen (accessed by typing alt+→); it tells you the IP address and default username and password for the installed GitLab.
1717

1818
[[bitnami]]
19-
.The Bitnami GitLab virtual machine login screen.
19+
.The Bitnami GitLab virtual machine login screen
2020
image::images/bitnami.png[The Bitnami GitLab virtual machine login screen.]
2121

2222
For anything else, follow the guidance in the GitLab Community Edition readme, which can be found at https://gitlab.com/gitlab-org/gitlab-ce/tree/master[].
@@ -31,7 +31,7 @@ The default username is `[email protected]`, and the default password is `5iveL!f
3131
Once logged in, click the ``Admin area'' icon in the menu at the top right.
3232

3333
[[gitlab_menu]]
34-
.The ``Admin area'' item in the GitLab menu.
34+
.The ``Admin area'' item in the GitLab menu
3535
image::images/gitlab-menu.png[The ``Admin area'' item in the GitLab menu.]
3636

3737
===== Users
@@ -42,7 +42,7 @@ Each user account comes with a *namespace*, which is a logical grouping of proje
4242
If the user +jane+ had a project named +project+, that project's url would be `http://server/jane/project`.
4343

4444
[[gitlab_users]]
45-
.The GitLab user administration screen.
45+
.The GitLab user administration screen
4646
image::images/gitlab-users.png[The GitLab user administration screen.]
4747

4848
Removing a user can be done in two ways.
@@ -59,7 +59,7 @@ A GitLab group is an assemblage of projects, along with data about how users can
5959
Each group has a project namespace (the same way that users do), so if the group +training+ has a project +materials+, its url would be `http://server/training/materials`.
6060

6161
[[gitlab_groups]]
62-
.The GitLab group administration screen.
62+
.The GitLab group administration screen
6363
image::images/gitlab-groups.png[The GitLab group administration screen.]
6464

6565
Each group is associated with a number of users, each of which has a level of permissions for the group's projects and the group itself.

book/04-git-server/sections/gitweb.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Now that you have basic read/write and read-only access to your project, you may
55
Git comes with a CGI script called GitWeb that is sometimes used for this.
66

77
[[gitweb]]
8-
.The GitWeb web-based user interface.
8+
.The GitWeb web-based user interface
99
image::images/git-instaweb.png[The GitWeb web-based user interface.]
1010

1111
If you want to check out what GitWeb would look like for your project, Git comes with a command to fire up a temporary instance if you have a lightweight web server on your system like `lighttpd` or `webrick`.

book/05-distributed-git/sections/contributing.asc

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ The Git project provides a document that lays out a number of good tips for crea
4141
First, your submissions should not contain any whitespace errors.
4242
Git provides an easy way to check for this -- before you commit, run `git diff --check`, which identifies possible whitespace errors and lists them for you.
4343

44-
.Output of `git diff --check`.
44+
.Output of `git diff --check`
4545
image::images/git-diff-check.png[Output of `git diff --check`.]
4646

4747
If you run that command before committing, you can tell if you're about to commit whitespace issues that may annoy other developers.
@@ -184,7 +184,7 @@ From john@githost:simplegit
184184

185185
At this point, John's local repository looks something like this:
186186

187-
.John's divergent history.
187+
.John's divergent history
188188
image::images/small-team-1.png[John's divergent history.]
189189

190190
Now John can merge Jessica's work that he fetched into his own local work:
@@ -199,7 +199,7 @@ Merge made by the 'recursive' strategy.
199199

200200
As long as that local merge goes smoothly, John's updated history will now look like this:
201201

202-
.John's repository after merging `origin/master`.
202+
.John's repository after merging `origin/master`
203203
image::images/small-team-2.png[John's repository after merging `origin/master`.]
204204

205205
At this point, John might want to test this new code to make sure none of Jessica's work affects any of his and, as long as everything seems fine, he can finally push the new merged work up to the server:
@@ -214,13 +214,13 @@ To john@githost:simplegit.git
214214

215215
In the end, John's commit history will look like this:
216216

217-
.John's history after pushing to the `origin` server.
217+
.John's history after pushing to the `origin` server
218218
image::images/small-team-3.png[John's history after pushing to the `origin` server.]
219219

220220
In the meantime, Jessica has created a new topic branch called `issue54`, and made three commits to that branch.
221221
She hasn't fetched John's changes yet, so her commit history looks like this:
222222

223-
.Jessica's topic branch.
223+
.Jessica's topic branch
224224
image::images/small-team-4.png[Jessica's topic branch.]
225225

226226
Suddenly, Jessica learns that John has pushed some new work to the server and she wants to take a look at it, so she can fetch all new content from the server that she does not yet have with:
@@ -237,7 +237,7 @@ From jessica@githost:simplegit
237237
That pulls down the work John has pushed up in the meantime.
238238
Jessica's history now looks like this:
239239

240-
.Jessica's history after fetching John's changes.
240+
.Jessica's history after fetching John's changes
241241
image::images/small-team-5.png[Jessica's history after fetching John's changes.]
242242

243243
Jessica thinks her topic branch is ready, but she wants to know what part of John's fetched work she has to merge into her work so that she can push.
@@ -298,7 +298,7 @@ Merge made by the 'recursive' strategy.
298298

299299
Everything merges cleanly, and Jessica's history now looks like this:
300300

301-
.Jessica's history after merging John's changes.
301+
.Jessica's history after merging John's changes
302302
image::images/small-team-6.png[Jessica's history after merging John's changes.]
303303

304304
Now `origin/master` is reachable from Jessica's `master` branch, so she should be able to successfully push (assuming John hasn't pushed even more changes in the meantime):
@@ -313,15 +313,15 @@ To jessica@githost:simplegit.git
313313

314314
Each developer has committed a few times and merged each other's work successfully.
315315

316-
.Jessica's history after pushing all changes back to the server.
316+
.Jessica's history after pushing all changes back to the server
317317
image::images/small-team-7.png[Jessica's history after pushing all changes back to the server.]
318318

319319
That is one of the simplest workflows.
320320
You work for a while (generally in a topic branch), and merge that work into your `master` branch when it's ready to be integrated.
321321
When you want to share that work, you fetch and merge your `master` from `origin/master` if it has changed, and finally push to the `master` branch on the server.
322322
The general sequence is something like this:
323323

324-
.General sequence of events for a simple multiple-developer Git workflow.
324+
.General sequence of events for a simple multiple-developer Git workflow
325325
image::images/small-team-flow.png[General sequence of events for a simple multiple-developer Git workflow.]
326326

327327
==== Private Managed Team
@@ -388,7 +388,7 @@ $ git commit -am 'Add ls-files'
388388

389389
Jessica's repository now looks like this:
390390

391-
.Jessica's initial commit history.
391+
.Jessica's initial commit history
392392
image::images/managed-team-1.png[Jessica's initial commit history.]
393393

394394
She's ready to push her work, but gets an email from Josie that a branch with some initial ``featureB'' work on it was already pushed to the server as the `featureBee` branch.
@@ -480,20 +480,20 @@ To jessica@githost:simplegit.git
480480

481481
Jessica's commit history now looks something like this:
482482

483-
.Jessica's history after committing on a feature branch.
483+
.Jessica's history after committing on a feature branch
484484
image::images/managed-team-2.png[Jessica's history after committing on a feature branch.]
485485

486486
At some point, Jessica, Josie, and John inform the integrators that the `featureA` and `featureBee` branches on the server are ready for integration into the mainline.
487487
After the integrators merge these branches into the mainline, a fetch will bring down the new merge commit, making the history look like this:
488488

489-
.Jessica's history after merging both her topic branches.
489+
.Jessica's history after merging both her topic branches
490490
image::images/managed-team-3.png[Jessica's history after merging both her topic branches.]
491491

492492
Many groups switch to Git because of this ability to have multiple teams working in parallel, merging the different lines of work late in the process.
493493
The ability of smaller subgroups of a team to collaborate via remote branches without necessarily having to involve or impede the entire team is a huge benefit of Git.
494494
The sequence for the workflow you saw here is something like this:
495495

496-
.Basic sequence of this managed-team workflow.
496+
.Basic sequence of this managed-team workflow
497497
image::images/managed-team-flow.png[Basic sequence of this managed-team workflow.]
498498

499499
[[_public_project]]
@@ -590,7 +590,7 @@ $ git fetch origin
590590

591591
Now, each of your topics is contained within a silo -- similar to a patch queue -- that you can rewrite, rebase, and modify without the topics interfering or interdepending on each other, like so:
592592

593-
.Initial commit history with `featureB` work.
593+
.Initial commit history with `featureB` work
594594
image::images/public-small-1.png[Initial commit history with `featureB` work.]
595595

596596
Let's say the project maintainer has pulled in a bunch of other patches and tried your first branch, but it no longer cleanly merges.
@@ -606,7 +606,7 @@ $ git push -f myfork featureA
606606
This rewrites your history to now look like <<psp_b>>.
607607

608608
[[psp_b]]
609-
.Commit history after `featureA` work.
609+
.Commit history after `featureA` work
610610
image::images/public-small-2.png[Commit history after `featureA` work.]
611611

612612
Because you rebased the branch, you have to specify the `-f` to your push command in order to be able to replace the `featureA` branch on the server with a commit that isn't a descendant of it.
@@ -632,7 +632,7 @@ Also the `--no-commit` option can be useful to delay the merge commit in case of
632632

633633
At this point, you can notify the maintainer that you've made the requested changes, and that they can find those changes in your `featureBv2` branch.
634634

635-
.Commit history after `featureBv2` work.
635+
.Commit history after `featureBv2` work
636636
image::images/public-small-3.png[Commit history after `featureBv2` work.]
637637

638638
[[_project_over_email]]

book/05-distributed-git/sections/distributed-workflows.asc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ In centralized systems, there is generally a single collaboration model -- the c
1414
One central hub, or _repository_, can accept code, and everyone synchronizes their work with it.
1515
A number of developers are nodes -- consumers of that hub -- and synchronize with that centralized location.
1616

17-
.Centralized workflow.
17+
.Centralized workflow
1818
image::images/centralized_workflow.png[Centralized workflow.]
1919

2020
This means that if two developers clone from the hub and both make changes, the first developer to push their changes back up can do so with no problems.
@@ -52,7 +52,7 @@ The process works as follows (see <<wfdiag_b>>):
5252
6. The maintainer pushes merged changes to the main repository.
5353

5454
[[wfdiag_b]]
55-
.Integration-manager workflow.
55+
.Integration-manager workflow
5656
image::images/integration-manager.png[Integration-manager workflow.]
5757

5858
(((forking)))
@@ -77,7 +77,7 @@ The process works like this (see <<wfdiag_c>>):
7777
4. Finally, the dictator pushes that `master` branch to the reference repository so the other developers can rebase on it.
7878

7979
[[wfdiag_c]]
80-
.Benevolent dictator workflow.
80+
.Benevolent dictator workflow
8181
image::images/benevolent-dictator.png[Benevolent dictator workflow.]
8282

8383
This kind of workflow isn't common, but can be useful in very big projects, or in highly hierarchical environments.

0 commit comments

Comments
 (0)