Merge pull request #374 from makeasnek/master

Various edits to site to update documentation

_includes/_acquire.htm

@@ -66,7 +66,7 @@ <h4 class="text-bold">
                         In Gridcoin's Proof-of-Stake (PoS) system, BOINC rewards are given when a user stakes, along with an additional 10 GRC.
                     </li>
                     <li>
-                        Since Gridcoin 5.4 you don't have to stake on your own to get BOINC rewards. Instead you can get your rewards by clicking a button and paying a small fee to have somebody else stake for you via an MRC request.
+                        <b>Since Gridcoin 5.4 you don't have to stake on your own to get BOINC rewards. Instead you can get your rewards by clicking a button and paying a small fee to have somebody else stake for you via an MRC request.</b> You will need approx 2 GRC to setup your wallet for solo crunching this way.
                         See <a href="https://gridcoin.us/wiki/faq.html#what-is-manual-reward-claim-mrc">this wiki entry</a> for further details.
                     <ul>
                         <li>

_includes/_boinc_1B.htm

@@ -6,7 +6,7 @@
                 <h4 class="text-bold">Adding projects to BOINC</h4>
                 <ul>
                     <li>
-                        Note: If you are an existing BOINC user ane use an account manager such as BAM, you can add projects via your account manager so long as accounts at the projects all use the same e-mail address (BAM's default).
+                        Note: If you are an existing BOINC user and use an account manager such as BAM, you can add projects via your account manager so long as accounts at the projects all use the same e-mail address (BAM's default).
                     </li>
                     <li>
                         After starting BOINC, select the "add a project" button.

_includes/_header.htm

@@ -24,9 +24,9 @@ <h6 class="dropdown-header text-center">Gridcoin Community</h6>
                         <a class="dropdown-item" href="https://twitter.com/GridcoinNetwork">Twitter</a>
                         <div class="dropdown-divider"></div>
                         <h6 class="dropdown-header text-center">Chat</h6>
+                        <a class="dropdown-item" href="https://discord.gg/jf9XX4a">Discord</a>
                         <a class="dropdown-item" href="https://t.me/BOINC_Telegram">BOINC Telegram</a>
                         <a class="dropdown-item" href="https://t.me/gridcoin">Gridcoin Telegram</a>
-                        <a class="dropdown-item" href="https://discord.gg/jf9XX4a">Discord</a>
                         <a class="dropdown-item" href="https://join.slack.com/t/teamgridcoin/shared_invite/enQtMjk2NTI4MzAwMzg0LTE4N2I3ZWZjYWJlZGM1Zjg3MTUyMDhiN2M5NmRmZTA2NDA0ZmY1ZTFmOGM3ZGU2YTBkOTdhNTk2ZjkzMGZkODY">Slack</a>
                         <a class="dropdown-item" href="https://jq.qq.com/?_wv=1027&k=5fDyjCV">Gridcoin 中国 qq 群</a>
                     </div>

_includes/_solo_boinc_intro.htm

@@ -25,13 +25,16 @@ <h4 class="text-bold">Install BOINC</h4>
         <!--Step 1-->
         <div class="row">
             <div class="col-6 col-sm-6 col-md-6 col-lg-6">
-                <p>Go to the <a href="https://boinc.berkeley.edu/download.php">BOINC website</a>, download and install BOINC for any computer you want to run BOINC on. Download the BOINC + Virtualbox option to ensure you can crunch the widest variety of projects possible. <b>Linux users: BOINC install packages are currently broken</b> please use <a href="https://www.reddit.com/r/BOINC4Science/comments/12h0g7v/quick_guide_installing_boinc_on_linux_right_now/" target="_blank">this workaround.</a></p>
+                <p>Go to the <a href="https://boinc.berkeley.edu/download.php">BOINC website</a>, download and install BOINC for any computer you want to run BOINC on. If you'll be crunching with multiple devices, please see <a href="/wiki/faq.html#can-i-crunch-boinc-on-multiple-machines-do-i-need-to-install-the-wallet-on-each-of-them">our FAQ</a>.
+<br><br>Windows users: Download the BOINC + Virtualbox option to ensure you can crunch the widest variety of projects possible. 
+<br><b>Linux users: BOINC install packages are currently broken</b> please use <a href="https://www.reddit.com/r/BOINC4Science/comments/12h0g7v/quick_guide_installing_boinc_on_linux_right_now/" target="_blank">this workaround.</a></p>
                 <a href="https://boinc.berkeley.edu/download.php"><button class="btn btn-round grcbtn">BOINC client downloads</button></a>
             </div>
             <div class="col-6 col-sm-6 col-md-6 col-lg-6">
                 BOINC Installation Video Tutorials:
                     <ul>
-                        <li><a href="https://www.youtube.com/watch?v=3hKUU9YWCKE">Rasim Muratovic: Installing BOINC</a></li>
+                        <li><a href="https://www.youtube.com/watch?v=AK95EvQ9tXA" target="_blank">Installing BOINC on Windows</a></li>
+                        <li><a href="https://www.youtube.com/watch?v=yRIdsorbtWo" target="_blank">Installing BOINC on MacOS</a></li>
                     </ul>
             </div>
         </div>

_includes/_wallet_install.htm

@@ -6,30 +6,15 @@
                 <h4 class="text-bold">
                     Install the Gridcoin client
                 </h4>
-                <h4>Windows & Linux</h4>
+                <h4>Wallet Download</h4>
                 <a id="64-bit-windows" class="btn rounded-pill grcbtn m-1" style="display:none"> 
-                    64-bit Windows
+                    Download Gridcoin wallet
                 </a>
-                <a id="32-bit-windows" class="btn rounded-pill grcbtn m-1" style="display:none">
-                    32-bit Windows
-                </a>
-                <!-- buttons above work by the fetch-release.js script -->
-                <br>
-                <a class="btn rounded-pill grcbtn m-1" href="https://github.com/gridcoin-community/Gridcoin-Research/releases/latest">
-                    Download via GitHub
+                <a class="btn rounded-pill grcbtn m-1" href="/#Downloads">
+                    Download Gridcoin wallet
                 </a><br />
-
-                <h4>MacOS</h4>
-                <a class="btn rounded-pill grcbtn m-1" href="https://github.com/Git-Jiro/homebrew-jiro/releases">
-                  Download via GitHub
-                </a>
-
-                <h4>Other</h4>
-                Don't see what you are looking for? Go to <a href="/#Downloads">the download page</a> and go to
-                one of the alternative download links
-
                 <br />
         </div>
         <!--End of GRC Feature Section-->
     </div>
-</section>
+</section>

contact.htm

@@ -13,13 +13,13 @@ <h3 class="text-bold">How to get in contact with us!</h3>
                 <p>Our large userbase is spread across the following chat platforms:</p>
                 <ul>
                     <li>
-                        <a href="https://t.me/gridcoin">Gridcoin's Telegram channel</a>
+                        <a href="https://discord.gg/jf9XX4a">Gridcoin's Discord channel</a>
                     </li>
                     <li>
-                        <a href="https://join.slack.com/t/teamgridcoin/shared_invite/enQtMjk2NTI4MzAwMzg0LTE4N2I3ZWZjYWJlZGM1Zjg3MTUyMDhiN2M5NmRmZTA2NDA0ZmY1ZTFmOGM3ZGU2YTBkOTdhNTk2ZjkzMGZkODY">Gridcoin's Slack channel</a>
+                        <a href="https://t.me/gridcoin">Gridcoin's Telegram channel</a>
                     </li>
                     <li>
-                        <a href="https://discord.gg/jf9XX4a">Gridcoin's Discord channel</a>
+                        <a href="https://join.slack.com/t/teamgridcoin/shared_invite/enQtMjk2NTI4MzAwMzg0LTE4N2I3ZWZjYWJlZGM1Zjg3MTUyMDhiN2M5NmRmZTA2NDA0ZmY1ZTFmOGM3ZGU2YTBkOTdhNTk2ZjkzMGZkODY">Gridcoin's Slack channel</a>
                     </li>
                     <li>
                         <a href="https://www.reddit.com/r/gridcoin">/r/gridcoin subreddit</a>

guides/earn-grc.htm

@@ -141,6 +141,16 @@ <h5 class="text-center mt-5">2) Running the Wallet to Stake</h5>
                             </figcaption>
                             p) Keep the wallet up to date as updates are released
                         </div>
+<h5 class="text-center mt-5">3) Bonus Step: Sidestake to Help Gridcoin's Development</h5>
+                        <div class="mb-5 pb-2">
+                            <p>Gridcoin has a fun feature called <i>sidestaking</i> which enables you to donate a portion of each stake you make to Gridcoin's development. This isn't required of course, but it helps us add new features and make sure more people can learn about Gridcoin!</p>
+                            <ol>
+                                    <li>Go to the hamburger menu (top left of wallet) and select Help -> Debug window -> Console</li>
+                                    <li>Type in the following two commands followed by enter. Be sure to change 5 to the percent you want to donate</li>
+                                    <li><code>enablesidestaking=1</code></li>
+                                    <li><code>sidestake=bc3NA8e8E3EoTL1qhRmeprbjWcmuoZ26A2,5</code></li>
+                            </ol>
+                        </div>
                 <h4 id="troubleshooting" class="text-center text-bold anchor-adjust">Troubleshooting</h4>
                 <h5 class="text-center">Q: My Wallet Is Not Staking</h5>
                     <li>Hover over the icon with the arrow to see why it is not staking</li>
@@ -155,10 +165,11 @@ <h5 class="text-center mt-5">Q: My Balance is Too Low To Send a Beacon</h5>
                     <li>You can use faucets to get free GRC for sending a Beacon: <a href="https://www.gridcoinstats.eu/faucet">Gridcoinstats.eu</a>, <a href="https://gridcoin.ch/faucet">Gridcoin.ch</a>. Our discord is a great place to ask for a few free GRC to get started</li>
                 <h5 class="text-center mt-5">Q: I See Multiple CPIDs or Receive a CPID Mismatch Error</h5>
                     <li>Make sure all your BOINC projects are attached <b>using the same e-mail address</b>. Remove any that aren't.</li>
-                    <li>It could be that you did components of both the pool and solo mining guide. To detatch pool projects in BOINC go to Tools -> Stop using account manager and then manually remove any projects added by the pool</li>
-                    <li>It can take some time for CPID's to "settle" onto one final CPID. Go to BOINC's advanced view (view -> advanced). Go to projects tab. Select each project and select "update"</li>
+                    <li>If you did components of both the pool and solo mining guide (you should only pick one), detach pool projects in BOINC go to Tools -> Stop using account manager and then manually remove any projects added by the pool</li>
+                    <li>It can take some time for CPID's to "settle" onto one final CPID. You can hurry this process along using <a href="/wiki/faq.html#i-get-an-e-mail-mismatch-or-split-cpid-error-in-the-solo-crunching-wizard-in-the-wallet" target="_blank">these steps</a></li>
                     <li>After these steps, restart the crunching wizard in the wallet. If the problem persists, go to one of our support channels for help.</li>
                 <h5 class="text-center mt-5">Q: My Beacon Isn't Being Verified</h5>
+                    <li>Beacons typically take up to 24 hours to verify</li>
                     <li>Make sure you are crunching under your own account in BOINC and that the project is on the <a href="/guides/whitelist.htm">whitelist</a></li>
                     <li>Make sure you changed your username</li>
                     <li>Check if your project is one that requires you to enable stats export

guides/gridcoin-install.htm

@@ -52,7 +52,7 @@ <h5>Step 4</h5>
         <div class="row">
             <div class="col-12 col-sm-8 col-md-8">
                 <h4 class="text-bold">Gridcoin Introduction</h4>
-                <p>To earn Gridcoin in solo staking mode you need to run the Gridcoin client and continuously stake or use the MRC (manual reward claim) feature to have somebody else stake for you for a small fee.</p>
+                <p>To earn Gridcoin in solo crunching mode you need to run the Gridcoin client and regularly stake or use the MRC (manual reward claim) feature to have somebody else stake for you for a small fee.</p>
                 <p>If you have not yet installed the BOINC client, you should read the <a href="/guides/boinc-install.htm">BOINC installation guide</a> to setup BOINC. The BOINC client has to be installed alongside the Gridcoin client in order to verify BOINC account ownership and to access local BOINC statistics.</p>
 
             </div>
@@ -98,7 +98,7 @@ <h4 class="text-bold">
                             </ul>
                         </li>
                         <li>
-                            Linux:
+                            Linux and MacOS:
                             <ul>
                                 <li>
                                     <code>
@@ -108,7 +108,7 @@ <h4 class="text-bold">
                             </ul>
                         </li>
                         <li>
-                            You need to use the one email for all BOINC projects. Add this to your gridcoinresearch.conf file (unless the Gridcoin wizard has already done this for you):
+                            If you are using the command-line version of Gridcoin wallet, add this to your gridcoinresearch.conf file:
                             <ul>
                                 <li>
                                     <code>

guides/whitelist.htm

@@ -63,7 +63,7 @@ <h2 class="mb-2 anchor-adjust" id="projects">Whitelisted Projects</h2>
                                 CPU
                             </th>
                             <th>
-                                GPU
+                                <dfn data-toggle="tooltip" data-placement="bottom" title="Projects listed here have GPU support, but availability of GPU workunits is not guaranteed">GPU</dfn>
                             </th>
                             <th>
                                 GDPR Stats Export

index.htm

@@ -28,14 +28,14 @@ <h3 class="h2 fw-bold py-3">What is BOINC?</h3>
                 <p>
                     <a href="https://boinc.berkeley.edu/">BOINC</a> is an open source platform for volunteer computing that lets individuals use their computers & phones to help science research. It is free to use and already home to 30+ projects over a range of scientific disciplines. Examples include protein structure prediction (<a href="https://boinc.bakerlab.org/rosetta/">Rosetta@home</a>), mapping the Milky Way galaxy (<a href="https://milkyway.cs.rpi.edu/milkyway/">Milkyway@home</a>), and tackling problems in public health and clean energy (<a href="https://www.worldcommunitygrid.org/discover.action">World Community Grid</a>).
                 </p>
-                <h3 class="h2 fw-bold py-3">How can I participate?</h3>
+                <h3 class="h2 fw-bold py-3">How can I Participate?</h3>
                 <p>
                     <b>Individuals:</b> 
-                    Join BOINC and start earning Gridcoin for your contributions! See the table below for more information
+                   Earn Gridcoin by contributing your computing power to science, or participate in an economy based on science by using Gridcoin for payments like any other cryptocurrency. See the table below for more information.
                 </p>
                 <p>
                    <b>Researchers and institutions:</b> 
-                   Tap into the spare processing power of tens of thousands of volunteers by <a href="https://github.com/marius311/boinc-server-docker/blob/master/docs/cookbook.md">creating your own BOINC project</a> for free! The Gridcoin network can reward your project's userbase to encourage participation and improve user retention.
+                   Tap into the spare processing power of tens of thousands of volunteers by <a href="https://github.com/marius311/boinc-server-docker/blob/master/docs/cookbook.md">creating your own BOINC project</a> for free! The Gridcoin network can reward your project's userbase to encourage participation and improve user retention. Gridcoin provides you turnkey access to petaFLOPS of free computation.
                 </p>
             </div>
         </div>
@@ -98,7 +98,7 @@ <h3 class="h2 fw-bold pt-3">Ways to Participate</h3>
                         </tr>
                         <tr>
                             <td>
-                                <dfn data-toggle="tooltip" data-placement="bottom" title="Earning 10 Gridcoin + research rewards for staking (how new coins are made)">Constant Block/Staking Rewards</dfn>
+                                <dfn data-toggle="tooltip" data-placement="bottom" title="Earning 10 GRC + fees + research rewards for staking (how new coins are made)">Constant Block/Staking Rewards</dfn>
                             </td>
                             <td class="table-color-yes">
                                 ✔️
@@ -131,7 +131,7 @@ <h3 class="h2 fw-bold pt-3">Ways to Participate</h3>
                         </tr>
                         <tr>
                             <td>
-                                Ability to vote
+                                <dfn data-toggle="tooltip" data-placement="bottom" title="Use your GRC to vote on which scientific computing projects are incentivized">Ability to vote</dfn>
                             </td>
                             <td class="table-color-yes">
                                 ✔️