Skip to content

Commit b079be9

Browse files
committed
even more backported errata
1 parent bad9e21 commit b079be9

File tree

4 files changed

+3
-7
lines changed

4 files changed

+3
-7
lines changed

README.asc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ Errata and basic clarifications will be accepted if we agree that they improve t
1818

1919
Please refrain from making sweeping copy edit changes as they tend to not get accepted and we don't want you wasting your time. 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.
2020

21-
You will also need to sign a Contributor License Agreement so if we do a third edition of the book at some point, we won't have to get everyone's permission but instead will simply list you all in an attributions section.
22-
23-
There is a CLA bot that will ask you to e-sign an agreement if you send a Pull Request to this repository before that pull will be accepted. Sorry about that, one of the issues with having a dual-licensed work.
24-
2521
== How To Generate the Book
2622

2723
There are two ways to generate e-book content from this source code.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ If you want to allow anonymous read-only access to your projects and also want t
173173
(((protocols, git)))
174174
Next is the Git protocol.
175175
This is a special daemon that comes packaged with Git; it listens on a dedicated port (9418) that provides a service similar to the SSH protocol, but with absolutely no authentication.
176-
In order for a repository to be served over the Git protocol, you must create the `git-export-daemon-ok` file – the daemon won't serve a repository without that file in it – but other than that there is no security.
176+
In order for a repository to be served over the Git protocol, you must create the `git-daemon-export-ok` file – the daemon won't serve a repository without that file in it – but other than that there is no security.
177177
Either the Git repository is available for everyone to clone or it isn't.
178178
This means that there is generally no pushing over this protocol.
179179
You can enable push access; but given the lack of authentication, if you turn on push access, anyone on the internet who finds your project's URL could push to your project.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ return mark
192192
[NOTE]
193193
====
194194
If you are running on Windows you'll need to make sure that you add one extra step.
195-
As metioned before, Windows uses CRLF for new line characters while git fast-import expects only LF.
195+
As mentioned before, Windows uses CRLF for new line characters while git fast-import expects only LF.
196196
To get around this problem and make git fast-import happy, you need to tell ruby to use LF instead of CRLF:
197197
198198
[source,ruby]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ This makes your `import` command look like this:
3636

3737
[source,console]
3838
----
39-
$ git-svn clone http://my-project.googlecode.com/svn/ \
39+
$ git svn clone http://my-project.googlecode.com/svn/ \
4040
--authors-file=users.txt --no-metadata -s my_project
4141
----
4242

0 commit comments

Comments
 (0)