Skip to content

Commit

Permalink
even more backported errata
Browse files Browse the repository at this point in the history
  • Loading branch information
schacon committed Oct 22, 2014
1 parent bad9e21 commit b079be9
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 7 deletions.
4 changes: 0 additions & 4 deletions README.asc
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ Errata and basic clarifications will be accepted if we agree that they improve t

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.

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.

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.

== How To Generate the Book

There are two ways to generate e-book content from this source code.
Expand Down
2 changes: 1 addition & 1 deletion book/04-git-server/sections/protocols.asc
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ If you want to allow anonymous read-only access to your projects and also want t
(((protocols, git)))
Next is the Git protocol.
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.
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.
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.
Either the Git repository is available for everyone to clone or it isn't.
This means that there is generally no pushing over this protocol.
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.
Expand Down
2 changes: 1 addition & 1 deletion book/09-git-and-other-scms/sections/import-custom.asc
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ return mark
[NOTE]
====
If you are running on Windows you'll need to make sure that you add one extra step.
As metioned before, Windows uses CRLF for new line characters while git fast-import expects only LF.
As mentioned before, Windows uses CRLF for new line characters while git fast-import expects only LF.
To get around this problem and make git fast-import happy, you need to tell ruby to use LF instead of CRLF:
[source,ruby]
Expand Down
2 changes: 1 addition & 1 deletion book/09-git-and-other-scms/sections/import-svn.asc
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ This makes your `import` command look like this:

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

Expand Down

0 comments on commit b079be9

Please sign in to comment.