Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

SFC fixes #192

Merged
merged 2 commits into from

3 participants

@peff
Owner

This addresses a few issues with the site content noticed by the Software Freedom Conservancy, of which Git is a member project. While this site is not managed by Git or the SFC, it's status as a de facto official site means that the content here may reflect on the non-profit Git project, and we should avoid doing profit-looking things.

@schacon schacon commented on the diff
app/views/community/index.html.haml
@@ -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 Owner
schacon added a note

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 Owner
peff added a note

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).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@schacon
Owner

Also, will the SFC have it's own affiliate link? I would rather just replace them with that rather than having to do this all over again in a few weeks.

@peff
Owner

Yeah, there will be an SFC affiliate link (earmarked for Git) soon. I'm happy to wait and re-roll the series once we have that.

peff added some commits
@peff peff adjust amazon affiliate links
The Pro Git links to Amazon use Scott's personal affiliate
id, which puts Git the non-profit project in a murky area.
This site is not owned or managed by the Software Freedom
Conservancy's member project Git, but it's de facto status
as the official site makes things awkward. And anyway, it
would be nice to donate the affiliate revenue to the
project.

This patch replaces all of the affiliated Pro Git links with
ones that mention the Git/SFC affiliate id.
f71cfae
@peff peff make irc channel descriptions more neutral
The intent of this site is to be about Git, not GitHub, and
it mostly does a good job of not mentioning GitHub at all.
One exception is the community page, which lists Freenode IRC
channels for #git and #github. Let's be more neutral and
note that #git is the right place for git advice, and
provider-specific channels can be used for advice on those
systems.
8dbe4a0
@peff
Owner

I just pushed a new version with the Git affiliate link.

The amazon links are the messy crap they auto-generate. My understanding
is that we can get by with just http://www.amazon.com/dp/1430218339/?tag=git-sfconservancy-20. But it's probably not worth fooling with.

@bry4n
Owner

@schacon could you look at this PR since you probably know more about it

@schacon schacon merged commit aed0a9e into master
@bry4n bry4n deleted the sfc-fixes branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Oct 30, 2012
  1. @peff

    adjust amazon affiliate links

    peff authored
    The Pro Git links to Amazon use Scott's personal affiliate
    id, which puts Git the non-profit project in a murky area.
    This site is not owned or managed by the Software Freedom
    Conservancy's member project Git, but it's de facto status
    as the official site makes things awkward. And anyway, it
    would be nice to donate the affiliate revenue to the
    project.
    
    This patch replaces all of the affiliated Pro Git links with
    ones that mention the Git/SFC affiliate id.
  2. @peff

    make irc channel descriptions more neutral

    peff authored
    The intent of this site is to be about Git, not GitHub, and
    it mostly does a good job of not mentioning GitHub at all.
    One exception is the community page, which lists Freenode IRC
    channels for #git and #github. Let's be more neutral and
    note that #git is the right place for git advice, and
    provider-specific channels can be used for advice on those
    systems.
This page is out of date. Refresh to see the latest.
View
2  app/views/books/show.html.erb
@@ -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| %>
View
5 app/views/community/index.html.haml
@@ -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 Owner
schacon added a note

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 Owner
peff added a note

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).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
%h2 Contributing to Git
View
2  app/views/doc/book.html.erb
@@ -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| %>
View
2  app/views/doc/index.html.haml
@@ -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
View
2  app/views/shared/_book.html.erb
@@ -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>
View
2  app/views/site/index.html.haml
@@ -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'
Something went wrong with that request. Please try again.