Merge remote-tracking branch 'origin/master' into clarify-beta-v3-differences

Author: jasonrudolph

Rakefile

@@ -5,17 +5,18 @@ task :compile do
   `nanoc compile`
 end
 
-# prompt user for a commit message; default: HEAD commit 1-liner
+# Prompt user for a commit message; default: P U B L I S H :emoji:
 def commit_message
-  last_commit = `git log -1 --pretty=format:"%s"`.chomp.strip
-  last_commit = 'Publishing developer content to GitHub pages.' if last_commit == ''
+  publish_emojis = [':boom:', ':rocket:', ':metal:', ':bulb:', ':zap:',
+    ':sailboat:', ':gift:', ':ship:', ':shipit:', ':sparkles:', ':rainbow:']
+  default_message = "P U B L I S H #{publish_emojis.sample}"
 
-  print "Enter a commit message (default: '#{last_commit}'): "
+  print "Enter a commit message (default: '#{default_message}'): "
   STDOUT.flush
   mesg = STDIN.gets.chomp.strip
 
-  mesg = last_commit if mesg == ''
-  mesg.gsub(/'/, '') # to allow this to be handed off via -m '#{message}'
+  mesg = default_message if mesg == ''
+  mesg.gsub(/'/, '') # Allow this to be handed off via -m '#{message}'
 end
 
 desc "Publish to http://developer.github.com"

Rules

@@ -10,6 +10,11 @@
 #   item, use the pattern “/about/*/”; “/about/*” will also select the parent,
 #   because “*” matches zero or more characters.
 
+# Reset search-index by deleting it every time
+preprocess do
+  File.delete("output/search-index.json") if File.exists?("output/search-index.json")
+end
+
 compile '/static/*' do
 end
 
@@ -22,6 +27,7 @@ compile '/feed/' do
 end
 
 compile '/v3/*' do
+  filter :search
   filter :erb
   filter :kramdown, :toc_levels => [2]
   filter :colorize_syntax,

content/index.md

@@ -13,25 +13,21 @@ GitHub in your app</h1>
 
 <div class="full-width-divider">
 	<ul class="wrapper highlights">
-		<li>
-			<h2>Get Started</h2>
+		<li class="highlight-module">
+			<a href="/guides/"><span class="mega-icon octicon-file-text"></span></a>
+			<h2><a href="/guides/">Get Started</a></h2>
 			<p>New to the GitHub API? With these guides you’ll be up and running in a snap.</p>
-			<a href="/guides/" class="button-secondary">View introduction guides</a>
-			<img class="octocat professorcat" src="/shared/images/professorcat.png">
 		</li>
-		<li>
-			<h2>Libraries</h2>
+		<li class="highlight-module">
+			<a href="/libraries/"><span class="mega-icon octicon-code"></span></a>
+			<h2><a href="/libraries/">Libraries</a></h2>
 			<p>We’ve got you covered. Use the GitHub API in your favorite language.</p>
-			<a href="/libraries/" class="button-secondary">Browse libraries</a>
-			<img class="octocat" src="/shared/images/gundamcat-small.png">
 		</li>
-		<li>
-			<h2>Support</h2>
+		<li class="highlight-module">
+			<a href="http://github.com/contact"><span class="mega-icon octicon-mail-read"></span></a>
+			<h2><a href="http://github.com/contact">Support</a></h2>
 			<p>Are you stuck? Already tried our <a href="/v3/troubleshooting/">troubleshooting guide</a>? Talk to a supportocat.</p>
-			<a href="http://github.com/contact" class="button-secondary">Get in touch</a>
-			<img class="octocat" src="/shared/images/supportocat.png">
 		</li>
 		
 	</ul>
 </div>
-

content/v3/activity/notifications.md

@@ -49,6 +49,32 @@ of high server load, the time may increase.  Please obey the header.
     HTTP/1.1 304 Not Modified
     X-Poll-Interval: 60
 
+## Notification Reasons
+
+When retrieving responses from the Notifications API, each payload has a key titled
+`reason`. These correspond to events that trigger a notification.
+
+Here's a list of potential `reason`s for receiving a notification:
+
+Reason Name | Description
+------------|------------
+`subscribed` | The notification arrived because you're watching the repository
+`manual` | The notification arrived because you've specifically decided to watch the item (via an Issue or Pull Request) 
+`author` | The notification arrived because you've created the item 
+`comment` | The notification arrived because you've commented on the item 
+`mention` | The notification arrived because you were specifically **@mentioned** in the content 
+`team_mention` | The notification arrived because you were on a team that was mentioned (like @org/team) 
+`state_change` | The notification arrived because you changed the item state (like closing an Issue or merging a Pull Request) 
+`assign` | The notification arrived because you were assigned to the Issue 
+
+Note that the `reason` is modified on a per-thread basis, and can change, if the
+`reason` on a later notification is different. 
+
+For example, if you are the author of an issue, subsequent notifications on that 
+issue will have a `reason` of `author`. If you're then  **@mentioned** on the same 
+issue, the notifications you fetch thereafter will have a `reason` of `mention`. 
+The `reason` remains as `mention`, regardless of whether you're ever mentioned again.
+
 ## List your notifications
 
 List all notifications for the current user, grouped by repository.

content/v3/auth.md

@@ -1,5 +1,5 @@
 ---
-title: Authentication | GitHub API
+title: Other Authentication Methods | GitHub API
 ---
 
 # Other Authentication Methods

content/v3/git.md

@@ -1,5 +1,5 @@
 ---
-title: Git | GitHub API
+title: Git Data | GitHub API
 ---
 
 # Git Data

content/v3/pulls/comments.md

@@ -1,5 +1,5 @@
 ---
-title: Pull Request Comments | GitHub API
+title: Review Comments | GitHub API
 ---
 
 # Review Comments

content/v3/repos/downloads.md

@@ -7,6 +7,18 @@ title: Downloads | GitHub API
 * TOC
 {:toc}
 
+### Downloads API is Deprecated
+
+<div class="alert">
+  <p>
+    The Downloads API (described below) was
+    <a href="https://github.com/blog/1302-goodbye-uploads">deprecated on December 11, 2012</a>.
+    It will be removed at a future date.
+
+    We recommend using <a href="/v3/repos/releases/">Releases</a> instead.
+  </p>
+</div>
+
 The downloads API is for package downloads only. If you want to get
 source tarballs you should use [this](/v3/repos/contents/#get-archive-link)
 instead.

content/v3/search/legacy.md

@@ -15,7 +15,7 @@ v3. There should be no changes, other than the new URL and JSON output format.
 <div class="alert">
   <p>
     The Legacy Search API (described below) is <a href="/v3/versions/#v3-deprecations">deprecated</a>
-    and is scheduled for removal in the next version of the API.
+    and is scheduled for removal in the next major version of the API.
 
     We recommend using the <a href="/v3/search/">v3 Search API</a> instead.
     It contains new endpoints and much more functionality.
@@ -30,7 +30,7 @@ Find issues by state and keyword.
 
 ### Parameters
 
-Name | Type | Description 
+Name | Type | Description
 -----|------|--------------
 `state`|`string` | Indicates the state of the issues to return. Can be either `open` or `closed`.
 `keyword`|`string`| The search term.
@@ -49,7 +49,7 @@ pages can be fetched using the `start_page` parameter.
 
 ### Parameters
 
-Name | Type | Description 
+Name | Type | Description
 -----|------|--------------
 `keyword`|`string`| The search term|
 `language`|`string` | Filter results by [language](https://github.com/languages)
@@ -69,7 +69,7 @@ Find users by keyword.
 
 ### Parameters
 
-Name | Type | Description 
+Name | Type | Description
 -----|------|--------------
 `keyword`|`string`| The search term
 `start_page`|`string` | The page number to fetch
@@ -91,7 +91,7 @@ address must be left unencoded. Searches only against public email addresses
 
 ### Parameters
 
-Name | Type | Description 
+Name | Type | Description
 -----|------|--------------
 `email`|`string`| The email address
 

layouts/header.html

@@ -7,6 +7,13 @@
         <li><a href="/v3/" class="nav-api">API</a></li>
         <li><a href="/changes/" class="nav-blog">Blog</a></li>
         <li><a href="https://github.com/contact">Support</a></li>
+        <li id="search-container">
+          <input type="text" id="searchfield" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" /><label class="search-placeholder">Search</label>
+          <div class="cancel-search"></div>
+          <ul id="search-results">
+
+          </ul>
+        </li>
       </ul>
     </div>
   </div><!-- #header -->