Skip to content
This repository was archived by the owner on Jun 18, 2024. It is now read-only.

Commit 8bdd0ce

Browse files
author
James McKinney
committed
fix merge
2 parents 5fc7379 + c9aefbe commit 8bdd0ce

20 files changed

+800
-526
lines changed

Diff for: ‎CONTRIBUTING.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## How to Contribute
44

5-
This project constitutes a collaborative work ("open source"). Federal employees and members of the public are encouraged to improve the project by contributing. For more information, please see [the FAQ](faq.md)
5+
This project constitutes a collaborative work ("open source"). Federal employees and members of the public are encouraged to improve the project by contributing. For more information, please see [the FAQ](/faq/)
66

77
Contributions can be made, primarily in two ways:
88

@@ -30,7 +30,7 @@ Contributions can be made, primarily in two ways:
3030

3131
Project Open Data runs on GitHub pages and automatically regenerates as a static site after every change. To duplicate this process and preview changes locally:
3232

33-
1. `git clone https://github.com/project-open-data/project-open-data.github.com.git && cd project-open-data.github`
33+
1. `git clone https://github.com/project-open-data/project-open-data.github.io.git && cd project-open-data.github.io`
3434
2. `script/bootstrap`
3535
3. (Make your changes)
3636
4. `script/server`
@@ -40,8 +40,8 @@ Project Open Data runs on GitHub pages and automatically regenerates as a static
4040

4141
## Licensing
4242

43-
By contributing to this project, you grant a world-wide, royalty-free, perpetual, irrevocable, non-exclusive, transferable license to all users under [the same terms under which the project is licensed](readme.md#licensing).
43+
By contributing to this project, you grant a world-wide, royalty-free, perpetual, irrevocable, non-exclusive, transferable license to all users under [the same terms under which the project is licensed](README.md#licensing).
4444

4545
## Privacy
4646

47-
All comments, messages, pull requests, and other submissions received through official White House pages including this GitHub page may be subject to archiving requirements. See the [readme](readme.md#privacy) for more information.
47+
All comments, messages, pull requests, and other submissions received through official White House pages including this GitHub page may be subject to archiving requirements. See the [readme](README.md#privacy) for more information.

Diff for: ‎_includes/footer.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="container-fluid" id="footer">
33
<div class="row-fluid">
44
<div class="span12">
5-
<a class="btn-primary" href="{{ edit_url }}">Help Improve this Content</a>
5+
<a class="btn btn-primary" href="{{ edit_url }}">Help Improve this Content</a>
66
<div class="pull-right">
77
<iframe src="http://ghbtns.com/github-btn.html?user={{ site.org_name }}&repo={{ site.repo_name }}&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="95" height="20"></iframe>
88
</div>

Diff for: ‎_includes/header.html

+21-18
Original file line numberDiff line numberDiff line change
@@ -26,24 +26,27 @@
2626
</div>
2727
</div>
2828
<![endif]-->
29-
<div class="navbar navbar-inverse navbar-fixed-top">
30-
<div class="navbar-inner">
31-
<div class="container-fluid">
32-
<div class="row-fluid">
33-
<div class="span12">
34-
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
35-
<span class="icon-bar"></span>
36-
<span class="icon-bar"></span>
37-
<span class="icon-bar"></span>
38-
</a>
39-
<a class="brand" href="{{ site.root_url }}/">Project Open Data</a>
40-
<div class="nav-collapse collapse">
41-
<ul class="nav pull-right">
42-
<li><a href="{{ edit_url }}">Help Improve this Content</a></li>
43-
<li><a href="http://github.com/{{ site.org_name }}/{{ site.repo_name }}/commits/{{ site.branch }}">View Revision History</a></li>
44-
<li><a href="{{ site.url }}/faq">FAQ</a></li>
45-
</ul>
46-
</div><!--/.nav-collapse -->
29+
30+
<div id="header">
31+
<div class="container-fluid">
32+
<div class="row-fluid">
33+
<div class="span12">
34+
<div class="navbar navbar-inverse">
35+
<div class="navbar-inner">
36+
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
37+
<span class="icon-bar"></span>
38+
<span class="icon-bar"></span>
39+
<span class="icon-bar"></span>
40+
</a>
41+
<a class="brand" href="{{ site.root_url }}/">Project Open Data</a>
42+
<div class="nav-collapse collapse">
43+
<ul class="nav pull-right">
44+
<li><a href="{{ edit_url }}">Help Improve this Content</a></li>
45+
<li><a href="http://github.com/{{ site.org_name }}/{{ site.repo_name }}/commits/{{ site.branch }}">View Revision History</a></li>
46+
<li><a href="{{ site.url }}/faq">FAQ</a></li>
47+
</ul>
48+
</div><!--/.nav-collapse -->
49+
</div>
4750
</div>
4851
</div>
4952
</div>

Diff for: ‎api-basics.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,10 @@ APIs are driven by a set of specific technologies, making them easily understood
6464

6565
Since REST takes advantage of the same Internet mechanisms that are used to view regular web pages it has many advantages, resulting in faster implementations and easier for developers to understand. REST APIs allow you to take data and functionality available on your website and make these resources available through a Web API. Then, instead of returning HTML to represent these resources, the API returns data in one of two possible formats:
6666

67-
* [Extensible Markup Language (XML)](http://apievangelist.com/buildingblocks/extensible_markup_language_(xml)
68-
* [JavaScript Object Notation (JSON)](http://apievangelist.com/buildingblocks/javascript_object_notation_(json)
67+
<ul>
68+
<li><a href="http://apievangelist.com/buildingblocks/extensible_markup_language_(xml).php">Extensible Markup Language (XML)</a></li>
69+
<li><a href="http://apievangelist.com/buildingblocks/javascript_object_notation_(json).php">JavaScript Object Notation (JSON)</a></li>
70+
</ul>
6971

7072
Developers can then take this data and use in web and mobile applications. However XML and JSON are easily consumed by spreadsheets and other tools non-developers can use as well, making APIs accessible by anyone.
7173

Diff for: ‎api-sandbox.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ permalink: /api-sandbox/
55
filename: api-sandbox.md
66
---
77

8-
By providing rich and interactive documentation, API producers strongly enhance functionality and ease-of-use for potential developers. This speeds early adoption and rewards users with a more fluid experience.Greater adoption then results in a higher return on investment, a more vibrant developer community and greater momentum for the API program.
8+
By providing rich and interactive documentation which also includes the ability for developers to explore and execute live calls against the API, use of API sandboxes can allow API producers to strongly enhance functionality and ease-of-use for potential developers. This speeds early adoption and rewards users with a more fluid experience. Greater adoption then results in a higher return on investment, a more vibrant developer community and greater momentum for the API program.
99

1010
Two free, open source options include:
1111

0 commit comments

Comments
 (0)