Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

SFC fixes #192

Merged
merged 2 commits into from Nov 6, 2012
Jump to file or symbol
Failed to load files and symbols.
+9 −6
Split
@@ -11,7 +11,7 @@
<h1>Book</h1>
<img style="float:right;margin: -20px 40px 0 40px;" src="/images/pro-git-118x157.jpg" />
<p>
- The entire Pro Git book, written by Scott Chacon and published by Apress, is available here. All content is licensed under the <a href="http://creativecommons.org/licenses/by-nc-sa/3.0/">Creative Commons Attribution Non Commercial Share Alike 3.0 license</a>. Print versions of the book are available on <a href="http://www.amazon.com/gp/product/1430218339?ie=UTF8&tag=prgi-20&linkCode=as2&camp=1789&creative=390957&creativeASIN=1430218339">Amazon.com</a>.</>
+ The entire Pro Git book, written by Scott Chacon and published by Apress, is available here. All content is licensed under the <a href="http://creativecommons.org/licenses/by-nc-sa/3.0/">Creative Commons Attribution Non Commercial Share Alike 3.0 license</a>. Print versions of the book are available on <a href="http://www.amazon.com/gp/product/1430218339?ie=UTF8&camp=1789&creative=9325&creativeASIN=1430218339&linkCode=as2&tag=git-sfconservancy-20">Amazon.com</a>.</>
</p>
<ol class='book-toc'>
<% @book.chapters.each do |chapter| %>
@@ -22,7 +22,10 @@
%h2 IRC Channel
%p
- If the manpages and this book aren’t enough and you need in-person help, you can try the <span class="highlight fixed">#git</span> or <span class="highlight fixed">#github</span> channel on the Freenode IRC server (<strong>irc.freenode.net</strong>). These channels are regularly filled with hundreds of people who are all very knowledgeable about Git and are often willing to help.
+ If the manpages and this book aren’t enough and you need in-person help, you can try the <span class="highlight fixed">#git</span> channel on the Freenode IRC server (<strong>irc.freenode.net</strong>). These channels are regularly filled with hundreds of people who are all very knowledgeable about Git and are often willing to help.
+
+ %p
+ If you need specific help about one of the for-profit Git hosting sites, you might try their own IRC channels (such as <span class="highlight fixed">#github</span> or <span class="highlight fixed">#gitorious</span>) on the same IRC server.
@schacon

schacon Oct 27, 2012

Owner

This is interesting. You probably have more experience with this lately - I haven't been on IRC in ages - but I added the #github channel at the time simply because there were more people willing to help newbies there than the #git channel. It may be that this has changed.

@peff

peff Oct 27, 2012

Contributor

I do not go on the IRC channels that much these days. I couldn't find a log for #github or #gitorious, so I'm not sure how active they are in general or what content is there (I've been idling on them for a few minutes and there are people, but not discussions right now).

I think this is mainly about making the distinction beteween GitHub and Git clear (this was noted to me by Bradley, so my patch is really just relaying his issue).

%h2 Contributing to Git
@@ -11,7 +11,7 @@
<h1>Book</h1>
<img style="float:right;margin: -20px 40px 0 40px;" src="/images/pro-git-118x157.jpg" />
<p>
- The entire Pro Git book, written by Scott Chacon and published by Apress, is available here. All content is licensed under the <a href="http://creativecommons.org/licenses/by-nc-sa/3.0/">Creative Commons Attribution Non Commercial Share Alike 3.0 license</a>. Print versions of the book are available on <a href="http://www.amazon.com/gp/product/1430218339?ie=UTF8&tag=prgi-20&linkCode=as2&camp=1789&creative=390957&creativeASIN=1430218339">Amazon.com</a>.</>
+ The entire Pro Git book, written by Scott Chacon and published by Apress, is available here. All content is licensed under the <a href="http://creativecommons.org/licenses/by-nc-sa/3.0/">Creative Commons Attribution Non Commercial Share Alike 3.0 license</a>. Print versions of the book are available on <a href="http://www.amazon.com/gp/product/1430218339?ie=UTF8&camp=1789&creative=9325&creativeASIN=1430218339&linkCode=as2&tag=git-sfconservancy-20">Amazon.com</a>.</>
</p>
<ol class='book-toc'>
<% @book.chapters.each do |chapter| %>
@@ -29,7 +29,7 @@
Pro Git is written by Scott Chacon and published by Apress.
%p
- Print copies can be purchased from <a href="http://www.amazon.com/gp/product/1430218339?ie=UTF8&tag=prgi-20&linkCode=as2&camp=1789&creative=390957&creativeASIN=1430218339">Amazon</a> and <a href="https://github.s3.amazonaws.com/media/progit.en.pdf">PDF</a>, <a href="https://github.s3.amazonaws.com/media/pro-git.en.mobi">mobi</a>, and <a href="https://github.s3.amazonaws.com/media/progit.epub">ePub</a> versions are available for free.
+ Print copies can be purchased from <a href="http://www.amazon.com/gp/product/1430218339?ie=UTF8&camp=1789&creative=9325&creativeASIN=1430218339&linkCode=as2&tag=git-sfconservancy-20">Amazon</a> and <a href="https://github.s3.amazonaws.com/media/progit.en.pdf">PDF</a>, <a href="https://github.s3.amazonaws.com/media/pro-git.en.mobi">mobi</a>, and <a href="https://github.s3.amazonaws.com/media/progit.epub">ePub</a> versions are available for free.
%p
<a href="#" id="open-book">Back to book →</a>
%p.license
@@ -1,6 +1,6 @@
<div class="callout">
<p>The entire <strong><a href="/book">Pro Git book</a></strong> written
by Scott Chacon is available to <a href="/book">read online for free</a>.
- Dead tree versions are available on <a href="http://www.amazon.com/gp/product/1430218339?ie=UTF8&tag=prgi-20&linkCode=as2&camp=1789&creative=390957&creativeASIN=1430218339">Amazon.com</a>.
+ Dead tree versions are available on <a href="http://www.amazon.com/gp/product/1430218339?ie=UTF8&camp=1789&creative=9325&creativeASIN=1430218339&linkCode=as2&tag=git-sfconservancy-20">Amazon.com</a>.
</p>
</div>
@@ -35,7 +35,7 @@
<strong><a href="/book">Pro Git</a></strong>
by Scott Chacon is available to
<a href="/book">read online for free</a>.
- Dead tree versions are available on <a href="http://www.amazon.com/gp/product/1430218339?ie=UTF8&tag=prgi-20&linkCode=as2&camp=1789&creative=390957&creativeASIN=1430218339">Amazon.com</a>.
+ Dead tree versions are available on <a href="http://www.amazon.com/gp/product/1430218339?ie=UTF8&camp=1789&creative=9325&creativeASIN=1430218339&linkCode=as2&tag=git-sfconservancy-20">Amazon.com</a>.
%section#front-downloads
= partial 'shared/monitor'