Merge master

gjtorikian · gjtorikian · commit aa0a97019a43 · 2013-11-09T14:41:12.000-06:00
diff --git a/content/changes/2013-10-18-new-code-search-requirements.md b/content/changes/2013-10-18-new-code-search-requirements.md
@@ -18,17 +18,17 @@ The value must include [at least one user, organization, or repository][search-b
 
 For example, with this query, we're searching for code from [@twitter][] or [@facebook][] that uses an MIT License:
 
-    MIT License @twitter @facebook
+    MIT License user:twitter user:facebook
 
 And here, we're looking for uses of the underscore library in [@mozilla's BrowserQuest][@mozilla/BrowserQuest] repository:
 
-    underscore language:js @mozilla/BrowserQuest
+    underscore language:js repo:mozilla/BrowserQuest
 
 To perform these queries via the API, we would use the following URLs (respectively):
 
-    https://api.github.com/search/code?q=MIT+License+%40twitter+%40facebook
+    https://api.github.com/search/code?q=MIT+License+user%3Atwitter+user%3Afacebook
 
-    https://api.github.com/search/code?q=underscore+language%3Ajs+%40mozilla%2FBrowserQuest
+    https://api.github.com/search/code?q=underscore+language%3Ajs+repo%3Amozilla%2FBrowserQuest
 
 All the various [code search qualifiers][code-search-qualifiers] are still available to you.
 A [user, organization, or repository qualifier][search-by-user-org-repo] is now required.
diff --git a/content/v3/oauth.md b/content/v3/oauth.md
@@ -20,7 +20,7 @@ and Client Secret. The Client Secret should not be shared.
 
 ## Web Application Flow
 
-This is a description of the OAuth flow from 3rd party web sites.
+This is a description of the OAuth2 flow from 3rd party web sites.
 
 ### 1. Redirect users to request GitHub access
 
diff --git a/content/v3/search.md b/content/v3/search.md
@@ -140,11 +140,11 @@ Suppose you want to find the definition of the `addClass` function inside
 [jQuery](https://github.com/jquery/jquery). Your query would look something like
 this:
 
-    https://api.github.com/search/code?q=addClass+in:file+language:js+@jquery/jquery
+    https://api.github.com/search/code?q=addClass+in:file+language:js+repo:jquery/jquery
 
 Here, we're searching for the keyword `addClass` within a file's contents. We're
 making sure that we're only looking in files where the language is JavaScript.
-And we're scoping the search to the `@jquery/jquery` repository.
+And we're scoping the search to the `repo:jquery/jquery` repository.
 
 <%= headers 200 %>
 <%= json(:code_search_v3_results) %>
@@ -158,7 +158,7 @@ media type in your Accept header. For example, via curl, the above query would
 look like this:
 
     curl -H 'Accept: application/vnd.github.v3.text-match+json' \
-      https://api.github.com/search/code?q=addClass+in:file+language:js+@jquery/jquery
+      https://api.github.com/search/code?q=addClass+in:file+language:js+repo:jquery/jquery
 
 This produces the same JSON payload as above, with an extra key called
 `text_matches`, an array of objects. These objects provide information such as
@@ -199,11 +199,10 @@ The `q` search term can also contain any combination of the supported issue sear
  * [`mentions`](https://help.github.com/articles/searching-issues#mentions)
    Finds issues that mention a certain user.
  * [`commenter`](https://help.github.com/articles/searching-issues#commenter)
-   Finds issues with comments by a certain user.
+   Finds issues that a certain user commented on.
  * [`involves`](https://help.github.com/articles/searching-issues#involves)
-   Finds issues with involving a certain user. This qualifier finds issues that were 
-   either created by a certain user, assigned to that user, mention that user, 
-   or were commented on by that user.
+   Finds issues that were either created by a certain user, assigned to that
+     user, mention that user, or were commented on by that user.
  * [`state`](https://help.github.com/articles/searching-issues#state)
    Filter issues based on whether they're open or closed.
  * [`labels`](https://help.github.com/articles/searching-issues#labels)
diff --git a/static/shared/css/documentation.css b/static/shared/css/documentation.css
@@ -196,7 +196,7 @@ a img {
 	background-color: #297fc7;
 	color: #fff;
 	font-size: 16px;
-	padding: 15px 10px;
+	padding: 15px;
 	border-radius: 5px;
 }
 
@@ -208,7 +208,7 @@ a img {
 .button-secondary {
 	background-color: #738797;
 	font-size: 15px;
-	padding: 11px 10px;
+	padding: 12px;
   -webkit-backface-visibility: hidden;
 }
 
@@ -895,6 +895,11 @@ p code {
 
 #markdown-toc li a {
 	color: #333;
+  text-decoration: underline;
+}
+
+#markdown-toc li a:hover {
+  color: #327fc7;
 }
 
 body.api .content table {
