Skip to content
This repository has been archived by the owner on Jul 30, 2019. It is now read-only.

Deploy #2 9/14/16 #1225

Merged
merged 2 commits into from
Sep 14, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/views/pages/about.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
<p>We invite everyone to take part in this experiment. Vendors need only have
GitHub and SAM.gov accounts to sign up and place a bid. If you work in
government and are interested in running auctions for an open-source project,
<a href="/docs/getting_started/">read our getting started guide</a>, and get
in touch. Were available to scope
features, develop an auction strategy, and run your auctions!</p>
<%= link_to 'read our getting started guide',
page_path('docs/getting_started') %>, and get in touch. We're available to
scope features, develop an auction strategy, and run your auctions!</p>

<p>PS: Although many of the auctions weve run thus far have asked for code, we
<p>PS: Although many of the auctions we've run thus far have asked for code, we
hope that this process can be applied to any kind of contribution to an open
source project, including design, content, etc.</p>

Expand Down
8 changes: 4 additions & 4 deletions app/views/pages/docs/creating_an_auction.html.erb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<div class="usa-grid docs">
<h1>Creating <span class="article">an</span> Auction <span class="preposition">on</span> 18F Micro-purchase</h1>

<p class="usa-font-lead">This guide builds upon our <a
href="/docs/getting_started">getting started</a> guide in order to help
<p class="usa-font-lead">This guide builds upon our <%= link_to 'getting
started', page_path('docs/getting_started') %> guide in order to help
18F's Micro-purchase customers solicit small, measurable contributions to open
source software projects.</p>

Expand Down Expand Up @@ -38,8 +38,8 @@
or agency will be able to accept the content or code that's ultimately
submitted by the vendor.</p>

<p>Before you get too far along, we recommend looking at <a
href="/insights">our insights page</a> and <a
<p>Before you get too far along, we recommend looking at <%= link_to 'our
insights page', insights_path %> and <a
href="https://micropurchase.18f.gov/auctions/21">some</a> <a
href="https://micropurchase.18f.gov/auctions/25">past</a> <a
href="https://micropurchase.18f.gov/auctions/26">auctions</a> to get a sense
Expand Down
15 changes: 7 additions & 8 deletions app/views/pages/docs/getting_started.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,9 @@
yourself (and your team) to manage an open source project, how to get started
with GitHub, and how to sign an interagency agreement (IAA) with 18F. </p>

<p>Once you've read these sections, head on over to <a
href="/micropurchase/docs/creating-an-auction">our guide to creating an
auction</a>. If you're feeling lost at any point in the process, just <a
<p>Once you've read these sections, head on over to <%= link_to 'our guide to
creating an auction', page_path('docs/creating_an_auction')%>. If you're
feeling lost at any point in the process, just <a
href="mailto:micropurchase@gsa.gov">send us an email</a>.</p>

<h3>Prepare yourself (and your team)</h3>
Expand Down Expand Up @@ -212,17 +212,16 @@
so we can work more closely together. If you aren't part of an already
existing interagency agreement (IAA), please <a
href="https://pages.18f.gov/iaa-forms/primer.html">read our primer on
interagency agreements</a> and reach out to <a
href="mailto:micropurchase@gsa.gov">micropurchase@gsa.gov</a>. We'll take it
interagency agreements</a> and reach out to <%= mail_to
'micropurchase@gsa.gov' %>. We'll take it
from there.</p>

<h3>Create your first auction</h3>

<p>By now you're at least somewhat familiar with 18F's Micro-purchase
Platform, open source software, the tenets of product management, and the
basics of GitHub. You've signed an interagency agreement with 18F. Now head on
over to our guide to <a
href="/micropurchase/docs/creating-an-auction">creating your first
auction</a>.</p>
over to our guide to <%= link_to 'creating your first auction',
page_path('docs/creating_an_auction') %>.</p>
</div>

11 changes: 6 additions & 5 deletions app/views/pages/policies.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,12 @@
<h2 id="eligibility-to-bid">Eligibility to bid</h2>

<p>Vendors must have a GitHub account to register and sign into the
Micro-purchase Platform. In order to <a
href="/micropurchase/docs/placing-a-bid">place a bid</a>, vendors must
obtain a DUNS number and register in SAM.gov. Finally, auctions with a
starting bid greater than $3,500 are limited to those vendors whose SAM.gov
profile indicates that they are registered as a small business.</p>
Micro-purchase Platform. In order to <%= link_to 'place a bid',
page_path('docs/placing_a_bid') %>, vendors must obtain a DUNS number and
register in SAM.gov. Finally, auctions with a starting bid greater than
$3,500 are limited to those vendors whose SAM.gov profile indicates that
they are registered as a small business.</p>

<h2 id="source-selection-method">Source-selection method</h2>

<p>18F Micro-purchase uses reverse-auctions to determine the source for any
Expand Down