Skip to content

Commit a412790

Browse files
committed
include CITATION.cff file - update CONTRIBUTING.md file - update files in callouts/ directory - update progit.sketch in diagram-source/ directory
1 parent efac9d5 commit a412790

File tree

24 files changed

+54
-21
lines changed

24 files changed

+54
-21
lines changed

CITATION.cff

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# This CITATION.cff file was generated with cffinit.
2+
# Visit https://bit.ly/cffinit to generate yours today!
3+
4+
cff-version: 1.2.0
5+
title: Pro Git
6+
message: >-
7+
If you use this software, please cite it using the
8+
metadata from this file.
9+
type: software
10+
authors:
11+
- given-names: Scott
12+
family-names: Chacon
13+
14+
- given-names: Ben
15+
family-names: Straub
16+
17+
identifiers:
18+
- type: url
19+
value: 'https://git-scm.com/book/en/v2'
20+
description: Pro Git website
21+
repository-code: 'https://github.com/progit/progit2'
22+
url: 'https://git-scm.com/book/en/v2'
23+
keywords:
24+
- git
25+
- book
26+
- asciidoc
27+
- pro-git
28+
license: CC-BY-NC-SA-3.0
29+
version: '2'

CONTRIBUTING.md

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,44 @@
11
# Contributing to Pro Git (2nd Edition)
22

3+
## Licensing your work to us
34

4-
## Licensing
5-
6-
By opening a pull request to this repository, you agree to provide your work under the [project license](LICENSE.asc).
5+
When you open a pull request, you agree to provide your work under the [project license](LICENSE.asc).
76
Also, you agree to grant such license of your work as is required for the purposes of future print editions to @ben and @schacon.
87
Should your changes appear in a printed edition, you'll be included in the [contributors list](book/contributors.asc).
98

9+
## Signaling an Issue
10+
11+
Search for similar issues, before creating a new issue.
12+
13+
Also, if this issue has been spotted on the git-scm.com site, cross-check that the issue is present in the pdf version.
14+
The issue may have already been corrected in the source files, but not yet deployed to the git-scm.com site.
15+
1016
## Small Corrections
1117

12-
Errata and basic clarifications will be accepted if we agree that they improve the content. You can also open an issue so we can figure out how or if it needs to be addressed.
18+
Errata and basic clarifications will be accepted if we agree that they improve the content.
19+
You can also open an issue so that we can discuss how or if the issue needs to be addressed.
1320

14-
If you've never done this before, the [flow guide](https://guides.github.com/introduction/flow/) might be useful.
21+
If you've never done this before, the [flow guide](https://docs.github.com/en/get-started/quickstart/github-flow) might be useful.
1522

1623
## Large Rewrites
1724

18-
Open an issue for discussion before you start. These changes tend to be very subjective, often only clarifying things for some small percentage of people and it's rarely worth the time to accept them. Professional copy editors have already reviewed this content multiple times so while you may have somewhat better taste and grammar than we do it's unlikely that your prose is going to be *so* much better that it's worth changing vast swaths of text.
25+
Open an issue for discussion before you start.
26+
A large rewrite tends to be very subjective, often only clarifying things for a small amount of readers.
27+
Professional copy editors have already reviewed this content multiple times.
28+
It's unlikely that your prose is going to be *so* much better that it's worth changing large portions of text.
1929

2030
## Figures
2131

22-
The images in this book were generated using [Sketch 3](http://bohemiancoding.com/sketch/), with the [included sketchbook file](diagram-source/progit.sketch).
32+
The images in this book are generated using [Sketch 3](https://www.sketch.com/), with the [included sketchbook file](diagram-source/progit.sketch).
2333

24-
To add a figure:
25-
26-
1. Add a page to the sketchbook. Try to use the included symbols wherever possible.
27-
1. Add a "slice" to your page. Give it a name that matches the destination PNG filename, relative from the root of the source directory.
28-
1. Make sure your slice is set to export at "800w".
34+
To create a figure:
2935

36+
1. Add a page to the sketchbook.
37+
Use the included symbols wherever possible.
38+
2. Add a "slice" to your page.
39+
Name the slice so that it matches the destination PNG filename, relative from the root of the source directory.
40+
3. Set your slice to export at "800w".
3041

3142
## Translations
3243

33-
Translations to other languages are highly encouraged but handled a little differently than the first edition. We now keep each translation in a separate repository and automatically build the output files through Atlas. This was something that was really difficult in the last edition.
34-
35-
Since each translation is a different repository, we can also have different maintainers for each project. The Pro Git team simply pulls them in and builds them for the translation teams. To get automatic builds, translations repositories will have to be under the [`progit` organization on GitHub](https://github.com/progit).
36-
37-
You can find out information on all the current translations and information on how to start your own at http://progit.org/translations.
44+
If you want to contribute to translating Pro Git into your language, take a look at [TRANSLATING.md](TRANSLATING.md).

Gemfile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
# frozen_string_literal: true
2-
3-
source "https://rubygems.org"
1+
source 'https://rubygems.org'
42

53
gem 'rake', '13.2.1'
64
gem 'asciidoctor', '2.0.23'
@@ -18,4 +16,3 @@ gem 'thread_safe', '0.3.6'
1816
gem 'epubcheck-ruby', '5.2.1.0'
1917
gem 'html-proofer', '5.0.10'
2018
gem 'kindlegen', '3.1.1'
21-

callouts/1.pdf

100755100644
File mode changed.

callouts/1.png

100755100644
File mode changed.

callouts/10.pdf

100755100644
File mode changed.

callouts/10.png

100755100644
File mode changed.

callouts/2.pdf

100755100644
File mode changed.

callouts/2.png

100755100644
File mode changed.

callouts/3.pdf

100755100644
File mode changed.

0 commit comments

Comments
 (0)