summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCameron McEfee <cameron@github.com>2011-02-28 14:33:10 -0800
committerCameron McEfee <cameron@github.com>2011-02-28 14:33:10 -0800
commita01d0402e14f4c760513a97b01a130b8d05550bd (patch)
tree7d345b6914897f7e0b1a35ccbfafb8e796be0304
parent8661410cf2dd7a40364fc0f5291fd25c1b877c16 (diff)
parent0f9052f1ad1ef76e7d682e7061f135277c3bf958 (diff)
Merge branch 'gh-pages' of https://github.com/github/help.github.com into gh-pages
-rwxr-xr-x_posts/2009-06-11-forking.markdown4
-rw-r--r--_posts/2009-06-23-security.markdown2
-rw-r--r--_posts/2009-10-16-post-receive-hooks.markdown2
3 files changed, 4 insertions, 4 deletions
diff --git a/_posts/2009-06-11-forking.markdown b/_posts/2009-06-11-forking.markdown
index dc99a4a..5c472df 100755
--- a/_posts/2009-06-11-forking.markdown
+++ b/_posts/2009-06-11-forking.markdown
@@ -9,7 +9,7 @@ main_category: collaborating
This guide will step you through the process of forking, pushing your changes,
and pulling in changes from the upstream repo.
-We'll use [github-services](http://github.com/pjhyett/github-services) as an
+We'll use [github-services](http://github.com/github/github-services) as an
example to fork, submit a change, and re-sync with the forked repo.
All of the examples on this page assume you're working in the `master` branch.
@@ -35,7 +35,7 @@ not__ point to the original repo you forked from. To help you keep track of
that repo we will add another remote named "upstream":
<pre class="terminal">$ cd github-services
-$ git remote add upstream git://github.com/pjhyett/github-services.git
+$ git remote add upstream git://github.com/github/github-services.git
$ git fetch upstream
</pre>
diff --git a/_posts/2009-06-23-security.markdown b/_posts/2009-06-23-security.markdown
index 656ebae..e87f7e7 100644
--- a/_posts/2009-06-23-security.markdown
+++ b/_posts/2009-06-23-security.markdown
@@ -67,7 +67,7 @@ We protect your login from brute force attacks with rate limiting. All password
We keep a security consultant on retainer to help identify and prevent new attack vectors. We always test new features in order to cut out potential attacks, such as XSS-protecting wikis, and ensuring that Pages cannot access cookies.
-In July 2010 we contracted [nGenuity Information Security](http://www.ngenuity-is.com/), an acclaimed security firm, to perform a week long penetration test of GitHub. We are committed to ongoing audits from reputable third parties such as nGenuity.
+We also maintain relationships with reputable security firms to perform regular penetration tests and ongoing audits of GitHub and its code. These firms include [nGenuity](http://www.ngenuity-is.com) and [Matasano Security](http://www.matasano.com).
We're extremely concerned and active about security, but we're aware that many companies are not comfortable hosting code outside their firewall. For these companies we offer our [Firewall Install](http://fi.github.com/), a version of GitHub that can be installed to a server within the company's network.
diff --git a/_posts/2009-10-16-post-receive-hooks.markdown b/_posts/2009-10-16-post-receive-hooks.markdown
index 25db1e8..80a5d65 100644
--- a/_posts/2009-10-16-post-receive-hooks.markdown
+++ b/_posts/2009-10-16-post-receive-hooks.markdown
@@ -63,7 +63,7 @@ post '/' do
end
{% endhighlight %}
-The `commits` array is ordered with the most recent commit as the first element. The last element, therefor, is the oldest commit.
+The `commits` array is ordered with the oldest commit as the first element. The last element is the newest commit and should match the "after" value for the branch.
Here's an example payload: