Merge branch 'master' into text-revisions-0

.gitignore

@@ -1,3 +1,5 @@
 ietemplates/
 _site/*
 .idea/
+*.swp
+tags

.ruby-version

@@ -0,0 +1 @@
+2.4.1

Gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'jekyll'
+gem 'jekyll-paginate'
+gem 'builder'
+gem 'rubysl-rexml'
+gem 'wdm', '>= 0.1.0' if Gem.win_platform?

Gemfile.lock

@@ -0,0 +1,57 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.5.1)
+      public_suffix (~> 2.0, >= 2.0.2)
+    builder (3.2.3)
+    colorator (1.1.0)
+    ffi (1.9.18)
+    forwardable-extended (2.6.0)
+    jekyll (3.5.2)
+      addressable (~> 2.4)
+      colorator (~> 1.0)
+      jekyll-sass-converter (~> 1.0)
+      jekyll-watch (~> 1.1)
+      kramdown (~> 1.3)
+      liquid (~> 4.0)
+      mercenary (~> 0.3.3)
+      pathutil (~> 0.9)
+      rouge (~> 1.7)
+      safe_yaml (~> 1.0)
+    jekyll-paginate (1.1.0)
+    jekyll-sass-converter (1.5.0)
+      sass (~> 3.4)
+    jekyll-watch (1.5.0)
+      listen (~> 3.0, < 3.1)
+    kramdown (1.14.0)
+    liquid (4.0.0)
+    listen (3.0.8)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    mercenary (0.3.6)
+    pathutil (0.14.0)
+      forwardable-extended (~> 2.6)
+    public_suffix (2.0.5)
+    rb-fsevent (0.10.2)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    rouge (1.11.1)
+    rubysl-rexml (2.0.4)
+    safe_yaml (1.0.4)
+    sass (3.5.1)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  builder
+  jekyll
+  jekyll-paginate
+  rubysl-rexml
+
+BUNDLED WITH
+   1.15.4

README.md

@@ -40,25 +40,20 @@ If for any reason you have questions or need to contact us, you can find us on t
 
 ## 2.0 What you'll need
 
-* Jekyll: Getmonero.org is made using a simple, static website generator called [Jekyll](https://jekyllrb.com/). You will need it installed on your system to test any changes that you made. If you're using a Linux-based system you can just follow the instructions on the website to get up and going. If you're using Windows, you will want to check out [this site](http://jekyll-windows.juthilo.com/) for instructions on how to get Jekyll working on your system.
+* Jekyll: Getmonero.org is made using a simple, static website generator called [Jekyll](https://jekyllrb.com/). You will need it installed on your system to test any changes that you made. If you're using Windows, you will want to check out [this site](http://jekyll-windows.juthilo.com/) for instructions on how to get Jekyll working on your system. If you're using a Linux-based system you can just follow the instructions on the website to get up and going:
+  * Install Ruby
+  * Install Bundler: `gem install bundler`
+  * Install Jekyll with all dependencies (run from the project directory): `bundle`
 
 * GitHub: Pretty much everything in Monero is hosted on [GitHub](https://github.com) and uses Git as the primary version control system. If you're not familiar with how to use Git, you can check out [this tutorial](https://guides.github.com/activities/hello-world/) for a good overview. It will take you through pretty much everything you'll need to know to edit the website. If you haven't already, register for GitHub and fork the [Monero Website repository](https://github.com/monero-project/monero-site).
 
-* Markdown experience: To write pages, you're going to need to know how to use Markdown. It's basically a in-between language that enables people who don't know HTML to just write, and it will be compiled into HTML for you. You can find a great Markdown cheat sheet with examples [here](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet). IF you need more help, Google and YouTube are great resources.
+* Markdown experience: To write pages, you're going to need to know how to use Markdown. It's basically an in-between language that enables people who don't know HTML to just write, and it will be compiled into HTML for you. You can find a great Markdown cheat sheet with examples [here](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet). IF you need more help, Google and YouTube are great resources.
 
 *Note: If you're confused, feel free to click other files in the same directory (folder) that you are in for the step that you are on to see some working examples. Compare them to the instructions and you should understand better.*
 
-* Jekyll Gems: The current iteration of the getmonero.org website uses the following plugins:
-  * [jekyll-paginate](https://jekyllrb.com/docs/pagination/)
-  * builder
-  * rubysl-rexml
-  * In the event that more gems are added, this documentation will be updated to reflect the changes needed to build the site.
-
-*Note:* To install them all at once, use the command: `gem install builder rubysl-rexml jekyll-paginate`
-
 Once you have the above list of things, it's typically a good idea to build the website from your local computer to make sure it works before you make any changes. To do this, complete the following steps:
 
-1. Navigate to the your local `monero-site` repository.
+1. Navigate to your local `monero-site` repository.
 2. Serve the website: `jekyll serve`
 3. Open a browser and go to [http://127.0.0.1:4000](http://127.0.0.1:4000).
 4. If all went well, you should see the Monero website and you're ready to make changes.
@@ -69,12 +64,21 @@ The average Monero user that will want to contribute to the website should proba
 
 If you are a web developer and would like to make large macro-level changes, it would be best to get in contact with rehrar. The HTML/CSS framework is custom, though quite easy to use for a seasoned developer. Still, there are some pages that are more complicated than others and would require fair amounts of styling changes should the structure change significantly.
 
-This website is completely open-source however, and anything and everything is available for changing should the community deem it necessary.
+This website is completely open-source however and anything and everything is available for changing should the community deem it necessary.
 
 Every section from here on out will talk about how to make a specific type of web page. It will start with a bullet point list of what to do for the advanced among you that just want a quick overview. For those who are still learning this list is followed by a detailed explanation, starting with example front matter. Any variable in the front matter written in all caps you are expected to change (make sure your changes are not all caps though). It will then lead you through the rest of the process until it's time to type your content.
 
 All external links must have http:// or https:// in front of them or they will not redirect properly.
 
+### 3.1 Housekeeping
+#### GitHub Issues
+We ask that if you open an issue on the site that you remain available for clarifying questions or corrections. We do our best to close issues that are resolved when we make changes to the site, but If your issue is resolved by a contributer and the issue is not closed we ask that you close it in a timely manner. A contributer (rerhar, SamsungGalaxyPlayer, or other community members, etc) may ask you to close an issue after it's confirmed fixed. Please review the changes to the site and close your issue if you can verify that it's fixed.
+
+#### Pull Requests
+Contributers should use [issue keywords](https://help.github.com/articles/closing-issues-using-keywords/) to make it easier for maintainers to close issues when they merge. Include close, closes, closed, fix, fixes, fixed, resolve, resolves, resolved, etc in the commit message or pull request description, so that the correct issue can be closed if your PR is merged. (Example: 'fixes #1234' could close Issue 1234 when merged.)
+
+Pull requests allow others to make comments or review your changes to the site. We ask that you remain available to comment or make changes to your PR. Pull requests with pending changes for more than 30 days will be closed and need to be resubmitted in the future. Sometimes someone else's changes might make your changes conflict with the current site. If that happens you may need to rebase your PR. (If you're unsure about how to do so, you can reach out to other contributers on IRC (freenode #monero) and someone should be able to walk you through it.
+
 ## 4.0 How to make a blog post
 
 ### 4.1 Quick Start
@@ -111,7 +115,7 @@ You're all done. Submit a PR and wait for it to be reviewed and merged. Be sure
 
 ### 5.1 Quick Start
 
-* Make file in /resources/user-guides with a .md ending and no spaces in filename.
+* Make file in /resources/user-guides with an .md ending and no spaces in filename.
 * Front Matter as in 5.3
 * Write User Guide
 * Add guide using markdown in the correct category in /resources/user-guides/index.md being careful not to mess with any indentation
@@ -139,7 +143,7 @@ DO NOT CHANGE ANYTHING IN THIS DOCUMENT BESIDES WHAT YOU ARE INSTRUCTED TO.
 
 This file will look quite different because it's HTML. Don't panic. Simply Ctrl + F (i.e. the find feature) and search for the category that you want to put your User Guide in. You will see there are some sections that are not indented like the others. They are flush with the left side of the screen. **Do not change the indentation.** You can put markdown in these areas.
 
-Once you've identified the non-indented area under the category you would like your User Guide to be under, you can use markdown to insert your link underneath the others. `[TITLE OF USER GUIDE](LINK-TO-USER-GUIDE.html)`. Please note that the file name in between the paranthases must be EXACTLY the same name as the file name you made in step 5.2, but with a `.html` at the end instead of `.md`.
+Once you've identified the non-indented area under the category you would like your User Guide to be under, you can use markdown to insert your link underneath the others. `[TITLE OF USER GUIDE](LINK-TO-USER-GUIDE.html)`. Please note that the file name in between the parentheses must be EXACTLY the same name as the file name you made in step 5.2, but with a `.html` at the end instead of `.md`.
 
 In the event that you think your User Guide should be in a new Category that doesn't exist yet, contact rehrar to make one for you.
 
@@ -151,12 +155,10 @@ You're all done. Submit a PR and wait for it to be reviewed and merged. Be sure
 
 ## 6.0 How to make a Moneropedia Entry
 
-### 6.1 Quick Start
+### 6.1 Make a file
-
-### 6.2 Make a file
 Navigate to the /resources/moneropedia folder and make a new file. Be sure the file name has no spaces and the ending is .md
 
-### 6.3 Front Matter
+### 6.2 Front Matter
 ```
 ---
 layout: moneropedia
@@ -168,13 +170,13 @@ summary: "PUT SUMMARY OF YOUR ENTRY HERE IN QUOTES"
 
 There is one thing to highlight. The `terms:` section of the front matter can be filled with as many terms as you would like. This is how other Moneropedia entries will link to this page. You can link to other Moneropedia entries as well in your page by putting an ampersand before the term used, i.e. `@THE-TERM-USED`. This will make an automatic link in the Moneropedia entry to the referred term, replace the @term with the word used in that terms `entry:` area of the front matter, and on hover it will show the summary. How cool is that?
 
-### 6.4 Write
+### 6.3 Write
 Write your Moneropedia entry. Remember that you can link to other Moneropedia entries using `@term-used-in-entry` as described above. Just go to the .md file of the Moneropedia entry you want to link to and use any of the terms in the `terms:` field of the front matter. Be sure to write whichever one you choose EXACTLY as shown and preceded by an ampersand.
 
-### 6.5 Build/Test
+### 6.4 Build/Test
 Build your website using `jekyll serve` if it's not rebuilding automatically and test check the link to your entry is appearing on the alphabetical list of Moneropedia entries and that it leads to your entry when clicked. Test your Moneropedia entry in the browser and contact rehrar if there are any bugs.
 
-### 6.6 Submit Pull Request
+### 6.5 Submit Pull Request
 You're all done. Submit a PR and wait for it to be reviewed and merged. Be sure to make any changes if requested.
 
 ## 7.0 How to make a FFS Proposal
@@ -296,9 +298,9 @@ and paste it IN THE CHRONOLOGICAL ORDER that it will be in. So if there is an ev
 
 Fill in the data as follows:
 * `event:` The name of the event goes here as well as the date. The recommended format is: `Event Name - January 1st, 2000`
-* `where:` Where the event will take place. Vanue name and address are recommended.
+* `where:` Where the event will take place. Venue name and address are recommended.
 * `when:` Date and time
-* `description:` Descriptoin of the happenings of your event
+* `description:` Description of the happenings of your event
 * `link:` The website of your event (if applicable, this can be left blank and everything will be ok). This link must have http:// at the beginning if it is an external link.
 
 **Make sure the indentation is EXACTLY the same as the other proposals in the area. If it's not the jekyll build WILL fail.**
@@ -326,7 +328,7 @@ Find the year that you want to update and copy the code below:
   date:
   status:
 ```
-and paste it in the correct years `accomplishments:` section IN THE CHRONOLOGICAL ORDER that it will be in. So if there is a accomplishment that happened/is happening before the one you are inputting, make sure it is higher up than yours. If there is an accomplishment that happened/is happening AFTER yours, make sure it is after yours. If you don't have exact dates, just do your best to estimate.
+and paste it in the correct year's `accomplishments:` section IN THE CHRONOLOGICAL ORDER that it will be in. So if there is a accomplishment that happened/is happening before the one you are inputting, make sure it is higher up than yours. If there is an accomplishment that happened/is happening AFTER yours, make sure it is after yours. If you don't have exact dates, just do your best to estimate.
 
 Fill in the data as follows:
 * `name:` The name of the accomplishment. Try to keep it short, a sentence or two at most.
@@ -360,7 +362,7 @@ Find the category that best describes your business/service and copy the code be
 and paste it in the correct category under the `merchants:` section.
 
 Fill in the data as follows:
-* `name:` The name of the the business/service.
+* `name:` The name of the business/service.
 * `url:` The external url of the business/service. This link must have http:// (or https://) at the beginning if it is an external link.
 
 **Make sure the indentation is EXACTLY the same as the other proposals in the area. If it's not the jekyll build WILL fail.**
@@ -378,7 +380,7 @@ You're all done. Submit a PR and wait for it to be reviewed and merged. Be sure
 ## 12.0 How to add a question to the FAQ
 
 ### 12.1 Copy/Paste Code
-Navigate to the `/get-started/faq` folder and open the `index.md` file. Inside you will see HTML code, but you will see it is very repetetive.
+Navigate to the `/get-started/faq` folder and open the `index.md` file. Inside you will see HTML code, but you will see it is very repetitive.
 
 Copy the code below:
 ```
@@ -394,7 +396,7 @@ CHANGE ANSWER
 
 </div>
 ```
-And paste it at the very bottom of the file. Literally underneath everything else.
+And paste it at the very bottom of the file (literally underneath everything else).
 
 Now we're going to change just a couple of things. Find the section with:
 ```
@@ -430,4 +432,4 @@ Redistribution and use in source and binary forms, with or without modification,
 
 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

_data/downloads.yml

@@ -75,6 +75,15 @@
   tag: Wolfram Warptangent
   blockchain: freebsd
 
+- platform: DragonflyBSD, 64-bit
+  id: bsd
+  icon: icon-dragonflybsd
+  cli_url: dragonflybsd64
+  cli_hash: c25c0f603ca5c96cb5963aaa2905edff390b7a97f654106911ffad8639deee7c
+  version: 0.10.3.1
+  tag: Wolfram Warptangent
+  blockchain: freebsd
+
 - platform: Source Code & Blockchain
   id: source
   icon: icon-github
@@ -86,4 +95,4 @@
   id: mobilelight
   
 - platform: Hardware Wallets
-  id: hardware
+  id: hardware

_data/irc.yml

@@ -0,0 +1,22 @@
+- channel: monero
+  description: This channel is used to discuss all things Monero related.
+- channel: monero-community
+  description: This channel is for the Monero community to congretate and discuss ideas.
+- channel: monero-dev
+  description: The many contributors and developers come here to discuss dev-y things.
+- channel: monero-ffs
+  description: Regarding the Monero forum funding system.
+- channel: monero-markets
+  description: We use this channel to talk about the price of Monero and other coins.
+- channel: monero-offtopic
+  description: Chatting with other Monero users about things not related to Monero.
+- channel: monero-otc
+  description: Over the counter Monero. Come here to purchase XMR from your fellow Moneron.
+- channel: monero-pools
+  description: This is the place for mining questions and discussion.
+- channel: monero-research-lab
+  description: Research into financial privacy with cryptocurrency.
+- channel: monero-translations
+  description: Localizing Monero into other languages
+- channel: monero-website
+  description: For the development of the Monero website

_data/merchants.yml

@@ -2,10 +2,14 @@
   merchants:
     - name: "#monero-otc (OTC)"
       url: https://webchat.freenode.net?channels=%23monero-otc
-    - name: Bitsquare (decentralized)
+    - name: Alfacashier
-      url: https://bitsquare.io/
+      url: https://www.alfacashier.com/
+    - name: Bitfinex (XMRUSD, XMRBTC)
+      url: https://www.bitfinex.com/
+    - name: Bisq; decentralized exchange (previously Bitsquare)
+      url: https://bisq.io/
     - name: BitMEX
-      url: https://www.bitmex.com/app/trade/XMR7D 
+      url: https://www.bitmex.com/app/trade/XMR7D
     - name: Bittrex
       url: https://www.bittrex.com/Market/Index?MarketName=BTC-XMR
     - name: Bter
@@ -14,10 +18,18 @@
       url: https://www.coincut.com
     - name: Cryptopia
       url: https://www.cryptopia.co.nz/Exchange?market=XMR_BTC
+    - name: Kaiserex
+      url: https://www.kaiserex.com/
+    - name: Kraken (XMRUSD, XMREUR, XMRBTC)
+      url: https://www.kraken.com/
+    - name: Liberalcoins
+      url: https://liberalcoins.com/
     - name: Livecoin (BTC and USD trading pairs)
       url: https://www.livecoin.net
     - name: LiteBit (Bankwire/GiroPay/iDeal/SOFORT)
       url: https://www.litebit.eu/en/buy/monero
+    - name: Magnetic Exchange
+      url: https://magneticexchange.com
     - name: MoneroDirect (Euro only)
       url: https://monerodirect.com
     - name: Poloniex
@@ -26,20 +38,6 @@
       url: https://shapeshift.io/
     - name: Tux Exchange
       url: https://www.tuxexchange.com/trade?coin=XMR&market=BTC
-    - name: Bitfinex (XMRUSD, XMRBTC)
-      url: https://www.bitfinex.com/
-    - name: Alfacashier
-      url: https://www.alfacashier.com/
-    - name: Kraken (XMRUSD, XMREUR, XMRBTC)
-      url: https://www.kraken.com/
-    - name: BIT.AC
-      url: https://bit.ac/
-    - name: Kaiserex
-      url: https://www.kaiserex.com/
-    - name: Magnetic Exchange
-      url: https://magneticexchange.com
-    - name: ArbitrCoin
-      url: https://arbitrcoin.com      
 - category: Block Explorers
   merchants:
     - name: ChainRadar
@@ -53,122 +51,132 @@
     - name: xmrchain.net
       url: https://xmrchain.net/
 - category: Payment Gateways
-  merchants:  
+  merchants:
+    - name: GloBee
+      url: https://globee.com/
     - name: Living Room of Satoshi
-      url: https://www.livingroomofsatoshi.com/?sc=xmr  
+      url: https://www.livingroomofsatoshi.com/?sc=xmr
     - name: Monero Merchants
       url: https://monero-merchants.com
-    - name: Paybee (Private Beta)
-      url: https://payb.ee/
     - name: Monero WooCommerce Extension (PHP)
       url: https://github.com/monero-integrations/monerowp
 - category: Libraries and Helpers
   merchants:
+    - name: Monero Integrations (eCommerce plugins)
+      url: http://monerointegrations.com/
     - name: monero-nodejs (Node.js)
       url: https://github.com/PsychicCat/monero-nodejs
-    - name: python-monero (Python)
-      url: https://github.com/tippero/python-monero
-    - name: MoneroPy (Python)
-      url: https://github.com/bigreddmachine/MoneroPy
-    - name: moneronjs (NodeJS)
-      url: https://github.com/netmonk/moneronjs
     - name: MoneroApi.Net (.NET)
       url: https://github.com/Jojatekok/MoneroApi.Net
-    - name: xmr-integration (PHP)
+    - name: moneronjs (NodeJS)
-      url: https://github.com/TheKoziTwo/xmr-integration
+      url: https://github.com/netmonk/moneronjs
-    - name: PHP-Monero (PHP)
-      url: https://github.com/MalMen/PHP-Monero
-    - name: Monero-PHP (PHP)
-      url: https://github.com/PsychicCat/monero-php
     - name: Monero Payments Library (PHP)
       url: https://github.com/monero-integrations/monerophp
+    - name: Monero-PHP (PHP)
+      url: https://github.com/PsychicCat/monero-php
+    - name: MoneroPy (Python)
+      url: https://github.com/bigreddmachine/MoneroPy
+    - name: PHP-Monero (PHP)
+      url: https://github.com/MalMen/PHP-Monero
+    - name: python-monero (Python)
+      url: https://github.com/tippero/python-monero
+    - name: xmr-integration (PHP)
+      url: https://github.com/TheKoziTwo/xmr-integration
 - category: Tools
   merchants:
-    - name: nestorgames
-      url: http://www.nestorgames.com
     - name: ForkGuard Network Monitoring
       url: http://forkguard.com
     - name: MoneroBase Price Charts and Tools
       url: http://monerobase.com
+    - name: Monero Monitor for Chrome
+      url: https://chrome.google.com/webstore/detail/monero-monitor/ojekadcfnkkihlleaafggfgbggdckpgo
     - name: MoneroPric.es Price Converter
       url: https://moneropric.es
     - name: MoneroPrice.com Price Converter
       url: http://moneroprice.com/
+    - name: nestorgames
+      url: http://www.nestorgames.com
     - name: Offline Monero address generator
       url: https://moneroaddress.org/
-    - name: Monero Monitor for Chrome
-      url: https://chrome.google.com/webstore/detail/monero-monitor/ojekadcfnkkihlleaafggfgbggdckpgo
 - category: Services
   merchants:
+    - name: algoStrategic - Internet Marketing and Web Development
+      url: https://algostrategic.com
     - name: Azur Samui - Luxury Apartment and Villa Development, Koh, Samui, Thailand
       url: http://www.azursamui.com
     - name: California Fintech Network
       url: https://www.californiafintech.org/plans/
-    - name: Infield Loan Services - Atlanta, Construction Consulting, Contract review, Feasibility, Funds Escrow
+      name: Computer Lab - React, Django, Security Consultancy in NYC
-      url: mailto:info@loandraw.com
+      url: https://computerlab.io
     - name: cloakVPN.com
       url: https://cloakVPN.com
     - name: Cryptostorm VPN
       url: https://cryptostorm.is/
+    - name: Elise Hawkins Nutritional Therapy
+      url: www.elisehawkinsnutritionaltherapy.com
+    - name: Emmanuel Galang, Canada Immigration and Refugee Lawyer
+      url: https://galanglaw.com/
     - name: Esperanto lessons from Kaja
       url: mailto:kiah.morante@gmail.com
     - name: Farmer ALP, LLC, Arizona
       url: mailto:farmeralp@gmail.com
+    - name: Flokinet.is
+      url: https://flokinet.is
     - name: Guitar Music Theory course w/ 30% XMR discount
       url: http://www.guitartheoryrevolution.info/blog/guitar-theory-revolution-store/
+    - name: Infield Loan Services - Atlanta, Construction Consulting, Contract review, Feasibility, Funds Escrow
+      url: mailto:info@loandraw.com
+    - name: MSvB Hardware Design (using a secure element)
+      url: mailto:monerodev+sitesvcs@encambio.com?subject=Monero%20Services%20Hardware%20Design%20Request
     - name: MyMonero Web-based Wallet
       url: https://mymonero.com
+    - name: Nerdzy Lawn Care
+      url: http://www.nerdzy.net
+    - name: NiceVPS - VPS and web hosting
+      url: https://nicevps.net/
+    - name: Njalla - privacy-aware domain registration
+      url: https://njal.la/
     - name: Pradeep Atluri, Psychiatrist, New York
       url: http://dr.mindsci.com/
-    - name: Simple, no non-sense hosting
+    - name: Rootbox; Simple, no non-sense hosting
       url: https://rootbox.host/
+    - name: Web Developer - Python with Django web framework
+      url: http://www.voteforrodneylewis.com
     - name: Web Developer - Stefanos
       url: http://www.stefanosioannou.com/web-development-monero-accepted
     - name: XMR.to Monero to Bitcoin Payment Service
-      url: https://xmr.to
+      url: https://xmr.to/
-    - name: algoStrategic - Internet Marketing and Web Development
-      url: https://algostrategic.com
-    - name: Emmanuel Galang, Canada Immigration and Refugee Lawyer
-      url: https://galanglaw.com/
-    - name: Web Developer - Python with Django web framework
-      url: http://www.voteforrodneylewis.com
-    - name: FlokiNET
-      url: https://flokinet.is
-    - name: Nerdzy Lawn Care
-      url: http://www.nerdzy.net
-    - name: Njalla - privacy-aware domain registration
-      url: https://njal.la/
 - category: Goods
   merchants:
+    - name: Cellphone and laptop repair online store in Sweden
+      url: http://www.LagaiPhone.se
     - name: CryptoMercado - coffee and snacks
       url: https://www.cryptomercado.com/
     - name: Cryptonic Physical Monero & Bitcoin coins
       url: https://cryptonic.net
-    - name: Fine Art from Jeanine King ~ Artwork of Home/Archtecture, Pets, Potraits, Caricatures ~ International Shipping
-      url: http://art2unlimited.webs.com/
     - name: Digital gift cards
       url: https://giftoff.com/
-    - name: Mushroom cultures, mushroom growing supplies, seeds
-      url: https://www.vesp.co/Fungible
-    - name: Handcrafted goods
-      url: https://mychain.store/
-    - name: Cellphone and laptop repair online store in Sweden
-      url: http://www.LagaiPhone.se
-    - name: InvestmentArt
-      url: http://investmentart.org/
     - name: Directvoltage
       url: http://directvoltage.com
-    - name: Synntech Gaming
+    - name: Fine Art from Jeanine King ~ Artwork of Home/Archtecture, Pets, Potraits, Caricatures ~ International Shipping
-      url: https://synntechgaming.com
+      url: http://art2unlimited.webs.com/
-    - name: Elise Hawkins Nutritional Therapy  
+    - name: Handcrafted goods
-      url: www.elisehawkinsnutritionaltherapy.com
+      url: https://mychain.store/
+    - name: InvestmentArt
+      url: http://investmentart.org/
+    - name: Mushroom cultures, mushroom growing supplies, seeds
+      url: https://www.vesp.co/Fungible
     - name: SilverRound.com - Gold and Silver Dealer
       url: https://silverround.com/
+    - name: Synntech Gaming
+      url: https://synntechgaming.com
 - category: Entertainment
   merchants:
+    - name: Crypto Games
+      url: https://www.crypto-games.net/
     - name: MoneroDice
       url: https://monerodice.net
     - name: SafeDice
       url: https://safedice.com
-    - name: Crypto Games
+    - name: XMRLotto.com
-      url: https://www.crypto-games.net/
+      url: https://xmrlotto.com

_includes/footer.html

@@ -47,7 +47,7 @@
                         <ul class="list-unstyled list-inline">
                             <li><a href="/legal/" class="white footer-link">Legal</a></li>
                             <li><a href="https://github.com/monero-project" class="white footer-link">Source Code</a></li>
-                            <li><a href="#" class="white footer-link">Coin Specs</a></li>
+                            <li><a href="/resources/technical-specs/" class="white footer-link">Technical Specs</a></li>
                         </ul>
                     </div>
                 </div>
@@ -58,4 +58,4 @@
     <!-- JS -->
     <script src="//static.getmonero.org/scripts.js"></script>
     
-    {% include hostflag.html %}
+    {% include hostflag.html %}

_includes/header.html

@@ -60,6 +60,8 @@
                             <a href="/resources/moneropedia/">Moneropedia</a>
                             <a href="/resources/user-guides/">User Guides</a>
                             <a href="/resources/developer-guides/">Developer Guides</a>
+                            <a href="/resources/vrp/">Vulnerability Response</a>
+                            <a href="/resources/technical-specs/">Technical Specs</a>
                           </div>
                      </div>
                  </div>
@@ -147,6 +149,8 @@
                             <a href="/resources/moneropedia/">Moneropedia</a>
                             <a href="/resources/user-guides/">User Guides</a>
                             <a href="/resources/developer-guides/">Developer Guides</a>
+                            <a href="/resources/technical-specs/">Technical Specs</a>
+                            <a href="/resources/vrp/">Vulnerability Response</a>
                           </div>
                     </div>
                   </div>

_layouts/ffs-cp.html

@@ -9,14 +9,58 @@ layout: base
 </div>
     <!-- FULL WIDTH BLOCK -->
         <section class="container full">
+                <div class="info-block text-adapt complete">
+                   <div class="row center">
+                       <div class="col-xs-12">
+                           <h2>Progress</h2>
+                       </div>
+                   </div>
+                   <div class="row center-xs">
+                       <div class="col-xs-12 progress-numbers">
+                           <p class="progress-number-funded">100 XMR </p><span> /</span>
+                           <p class="progress-number-goal">100 XMR</p>
+                       </div>
+                   </div>
+                   <div class="row">
+                       <div class="col-xs-12">
+                           <div class="progress-bar">
+                               <span style="width: 100%"></span>
+                           </div>
+                       </div>
+                       <div class="col-xs-12 ffs-status">
+                            <p>This project has been completed. The proposal is kept here both to celebrate the achievements of the Monero community, and for historical accuracy about what was accomplished.</p>
+                       </div>
+                   </div>
+                   {% if page.milestones != nil %}
+                   <div class="row center-xs milestones">
+                       <div class="tab col-xs-12">
+                            <input id="tab-one" type="checkbox" name="tabs" class="accordion">
+                            <label for="tab-one" class="accordion">Milestones</label>
+                            <div class="tab-content">
+                                    {% for milestones in page.milestones %}
+                                <div class="row start-xs roadmap">
+                                    <div class="col-xs-1">
+                                        <span class="{{milestones.status}} ms-{{milestones.status}}"></span>
+                                    </div>
+                                    <div class="col-xs-11">
+                                        <p>{{milestones.name}}</p>
+                                        <p><span class="bold">Funds Awarded:</span> {{milestones.funds}}</p>
+                                        {% if milestones.done != nil %}
+                                            <p><span class="bold">Completion date:</span> {{milestones.done}}</p>
+                                        {%endif%}
+                                    </div>
+                                </div>
+                                    {%endfor%}
+                           </div>
+                        </div>
+                </div>
+                {%endif%}
+                </div>
                 <div class="info-block text-adapt">
                    <div class="row center-xs">
                         <div class="col">
                             <h2>{{page.title}}</h2>
                             <p>by {{page.author}}</p>
-                             <div class="ffs-status complete">
-                                <p>This project has been completed. The proposal is kept here both to celebrate the achievements of the Monero community, and for historical accuracy about what was accomplished.</p>
-                            </div>
                         </div>
                     </div>
                     <div>
@@ -25,6 +69,18 @@ layout: base
                 </div>
         </section>
     <!-- END FULL WIDTH BLOCK -->
-    </div>
+    <section class="container full comments">
-    
+        <div class="info-block">
-    <!-- JAVASCRIPT FOR DISQUS -->
+          <div class="row center">
+             <div class="col-xs-12">
+               <h2>Comments</h2>
+             </div>
+          </div>
+           <div class="row">
+               <div class="col-xs-12">
+                   <!-- SPACE RESERVED FOR COMMENT SYSTEM -->
+               </div>
+           </div>
+        </div>
+    </section>
+    </div>

_layouts/ffs-fr.html

@@ -9,8 +9,44 @@ layout: base
 
 </div>
        <!-- FULL WIDTH BLOCK -->
-        <section class="container full">
+        <section class="container full fr-contribute">
                 <div class="info-block text-adapt">
+                   <div class="row center">
+                       <div class="col-xs-12">
+                           <h2>Funding Progress</h2>
+                       </div>
+                   </div>
+                   <div class="row center-xs">
+                       <div class="col-xs-12 progress-numbers">
+                           <p class="progress-number-funded">10 XMR </p><span> /</span>
+                           <p class="progress-number-goal">100 XMR</p>
+                       </div>
+                   </div>
+                   <div class="row">
+                       <div class="col-xs-12">
+                           <div class="progress-bar">
+                               <span style="width: 75%"></span>
+                           </div>
+                       </div>
+                   </div>
+                   <div class="row center-xs">
+                       <div class="tab col-xs-12">
+                            <input id="tab-one" type="checkbox" name="tabs" class="accordion">
+                            <label for="tab-one" class="accordion">Contribute</label>
+                            <div class="tab-content">
+                                <div class="row start-xs">
+                                    <div class="col-xs-12">
+                                        <p>In order to contribute to the cause of <strong>{{page.title}}</strong> all you have to do is the following:</p>
+                                        <p>Have a valid Monero address. If you don't have one, you can read on getting started!</p>
+                                        <p>Send the amount of XMR that you wish to contribute to the address: <strong>{{page.address}}</strong></p>
+                                        <p>Make sure that you enter a payment ID of <strong>{{page.paymentid}}</strong> in order for us to be able to assign your contribution to this specific project!</p>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>   
+                   </div>
+                </div>
+                <!--div class="info-block text-adapt">
                     <div class="row center-xs">
                         <div class="col">
                             <h2>How to Contribute</h2>
@@ -24,7 +60,7 @@ layout: base
                             <p>Make sure that you enter a payment ID of <strong>{{page.paymentid}}</strong> in order for us to be able to assign your contribution to this specific project!</p>
                         </div>
                     </div>
-                </div>
+                </div-->
         </section>
     <!-- END FULL WIDTH BLOCK -->
    
@@ -43,6 +79,18 @@ layout: base
                 </div>
         </section>
     <!-- END FULL WIDTH BLOCK -->
-    </div>
+    <section class="container full comments">
-    
+        <div class="info-block">
-    <!-- JAVASCRIPT FOR DISQUS -->
+          <div class="row center">
+             <div class="col-xs-12">
+               <h2>Comments</h2>
+             </div>
+          </div>
+           <div class="row">
+               <div class="col-xs-12">
+                   <!-- SPACE RESERVED FOR COMMENT SYSTEM -->
+               </div>
+           </div>
+        </div>
+    </section>
+    </div>

_layouts/ffs-ideas.html

@@ -22,6 +22,18 @@ layout: base
                 </div>
         </section>
     <!-- END FULL WIDTH BLOCK -->
-    </div>
+        <section class="container full comments">
-    
+        <div class="info-block">
-    <!-- JAVASCRIPT FOR DISQUS -->
+          <div class="row center">
+             <div class="col-xs-12">
+               <h2>Comments</h2>
+             </div>
+          </div>
+           <div class="row">
+               <div class="col-xs-12">
+                   <!-- SPACE RESERVED FOR COMMENT SYSTEM -->
+               </div>
+           </div>
+        </div>
+    </section>
+    </div>

_layouts/ffs-ot.html

@@ -23,6 +23,18 @@ layout: base
                 </div>
         </section>
     <!-- END FULL WIDTH BLOCK -->
-    </div>
+    <section class="container full comments">
-    
+        <div class="info-block">
-    <!-- JAVASCRIPT FOR DISQUS -->
+          <div class="row center">
+             <div class="col-xs-12">
+               <h2>Comments</h2>
+             </div>
+          </div>
+           <div class="row">
+               <div class="col-xs-12">
+                   <!-- SPACE RESERVED FOR COMMENT SYSTEM -->
+               </div>
+           </div>
+        </div>
+    </section>
+    </div>

_layouts/ffs-wip.html

@@ -11,14 +11,58 @@ layout: base
 
     <!-- FULL WIDTH BLOCK -->
         <section class="container full">
+                <div class="info-block text-adapt inprogress">
+                   <div class="row center">
+                       <div class="col-xs-12">
+                           <h2>Progress</h2>
+                       </div>
+                   </div>
+                   <div class="row center-xs">
+                       <div class="col-xs-12 progress-numbers">
+                           <p class="progress-number-funded">100 XMR </p><span> /</span>
+                           <p class="progress-number-goal">100 XMR</p>
+                       </div>
+                   </div>
+                   <div class="row">
+                       <div class="col-xs-12">
+                           <div class="progress-bar">
+                               <span style="width: 100%"></span>
+                           </div>
+                       </div>
+                       <div class="col-xs-12 ffs-status">
+                            <p>This project has been funded and is being worked on. Keep an eye out here at the bottom of the proposal for updates.</p>
+                       </div>
+                   </div>
+                   {% if page.milestones != nil %}
+                   <div class="row center-xs milestones">
+                       <div class="tab col-xs-12">
+                            <input id="tab-one" type="checkbox" name="tabs" class="accordion">
+                            <label for="tab-one" class="accordion">Milestones</label>
+                            <div class="tab-content">
+                                    {% for milestones in page.milestones %}
+                                <div class="row start-xs roadmap">
+                                    <div class="col-xs-1">
+                                        <span class="{{milestones.status}} ms-{{milestones.status}}"></span>
+                                    </div>
+                                    <div class="col-xs-11">
+                                        <p>{{milestones.name}}</p>
+                                        <p><span class="bold">Funds Awarded:</span> {{milestones.funds}}</p>
+                                        {% if milestones.done != nil %}
+                                            <p><span class="bold">Completion date:</span> {{milestones.done}}</p>
+                                        {%endif%}
+                                    </div>
+                                </div>
+                                    {%endfor%}
+                           </div>
+                        </div>
+                </div>
+                {%endif%}
+            </div>
                 <div class="info-block text-adapt">
                    <div class="row center-xs">
                         <div class="col">
                             <h2>{{page.title}}</h2>
                             <p>by {{page.author}}</p>
-                            <div class="ffs-status inprogress">
-                                <p>This project has been funded and is being worked on. Keep an eye out here at the bottom of the proposal for updates.</p>
-                            </div>
                         </div>
                     </div>
                     <div>
@@ -27,6 +71,22 @@ layout: base
                 </div>
         </section>
     <!-- END FULL WIDTH BLOCK -->
+    
+    <section class="container full comments">
+        <div class="info-block">
+          <div class="row center">
+             <div class="col-xs-12">
+               <h2>Comments</h2>
+             </div>
+          </div>
+           <div class="row">
+               <div class="col-xs-12">
+                   <!-- SPACE RESERVED FOR COMMENT SYSTEM -->
+               </div>
+           </div>
+        </div>
+    </section>
+    
     </div>
     
-    <!-- JAVASCRIPT FOR DISQUS -->
+    

_layouts/post.html

@@ -28,7 +28,9 @@ layout: base
                     <div class="info-block">
                         <div class="row">
                         <div class="col"><h2>{{ page.title }}</h2>
-                        <p class="author">{% t blog.author %}: {% if page.author %}{{page.author}}{% else %}{{site.author}}{% endif%}</p></div>
+                          <p class="author">{% t blog.author %}: {% if page.author %}{{page.author}}{% else %}{{site.author}}{% endif%}</p>
+                          <p id="post-meta">{% t blog.date %} : {{ page.date }}</p>
+                        </div>
                     </div>
                     <div>
                         {{content}}
@@ -75,4 +77,4 @@ layout: base
                 <!-- end right one-third block-->
             </div>
         </section>
-    </div>        
+    </div>

_posts/2016-03-05-overview-and-logs-for-the-dev-meeting-held-on-2016-03-05.md

@@ -0,0 +1,29 @@
+---
+layout: post
+title: Overview for the Dev Meeting Held on 2016-03-05
+summary: 0.9.2 Discussion, db fixes, unit test fixes, threading fixes, RingCT development discussion.
+tags: [dev diaries, core, crypto]
+author: gingeropolous
+---
+
+*March 5th, 2016*
+
+# Overview
+
+Open pull requests mostly just DB stuff by warptangent and hyc, and will be merged within next couple of hours. In the last couple of weeks, unit test fixes, threading fixes, "lots of little things". Hyc had some readtxn changes. Hyc's performance changes need to wait until some kind of migration system is implemented / developed.
+
+Fees are fine. Too soon for adjustment. Talk of "magic number automation" - fees will autoadjust one day! ArcticMine takes on researching / developing a proposal for automatically adjusting fees.
+
+Dev Branch - the buck stops here. Moneromoo is waiting for 0.9.2 to be tagged "so that no new patches go there". So once we have 0.9.2, dev branch goes upstream (to master).
+
+We need a library that plays well with HTTPS and support authentication and is compatible with our license.
+
+RingCT - WarpTangent becoming familiar with what needs to be done, and RingCT development will go on newer database branch. There's some "floating point or fixed" issue that needs to be decided. Forum threads will be opened for that. Warptanget steps up to the plate to make the thread.
+
+Changing mixin to something else is a thing that might happen, but "its a community thing, not a dev thing"
+
+Everybody shakes hands, gives themselves pats on the back and "attaboys", and venture off into the night to go meditate on the metaphysics of mixin 0 transactions.
+
+# Logs
+
+Logs for this dev meeting no longer exist or were lost.

_posts/2017-05-17-disclosure-of-a-major-bug-in-cryptonote-based-currencies.md

@@ -47,3 +47,60 @@ Identity element = "010000000000000000000000000000000000000000000000000000000000
 Curve order (little endian) = "edd3f55c1a631258d69cf7a2def9de1400000000000000000000000000000010"
 
 For each transaction key image, check ((key image * curve order) == (identity element)); reject transaction if false.
+
+### Appendix: Commitment Text \#1
+
+As committed via the payment ID in Monero transaction ID dff7a79e44f9392e19fe5205c389d3e799f89c62d90d624219618d754b806e04, the text below has a sha3-256 (ie. keccak-256) hash of 21f0216fbbdc3dc590903b579282878705ed2adab7d8213328d962c76e806d84:
+
+~~~
+Problem:
+The so-called "key image" as used in Cryptonote coins utilizing elliptic curve ed25519 can be modified in a special way, allowing double-spends. I leave out exact details in this draft to give some time for mitigation.
+
+Hash (keccak-256) of details, to be released later: <4402e902f1ac8cec96a17453dcae307d21a7995a94b76e9c3eb7ca7baeffb8c8> 
+
+
+Mitigation:
+Several options exist for mitigation; I include the simplest, least invasive here.
+
+To mitigate, check key images for correctness by multiplying by the curve order l. Check that the result is the identity element.
+
+I include hexadecimal values of each:
+Identity element = "0100000000000000000000000000000000000000000000000000000000000000"
+Curve order (little endian) = "edd3f55c1a631258d69cf7a2def9de1400000000000000000000000000000010"
+
+For each transaction key image, check ((key image * curve order) == (identity element)); reject transaction if false.
+~~~
+
+### Appendix: Commitment Text \#2
+
+As noted in the previous commitment, the text below has a sha3-256 (ie. keccak-256) hash of 4402e902f1ac8cec96a17453dcae307d21a7995a94b76e9c3eb7ca7baeffb8c8:
+
+~~~
+Dirty Details:
+Adding one of the (non-idenitity) "torsion", or small subgroup, points to a key image allows up to 7 double spends to be performed per output (8 total spends). The reason this is possible is that multiplying any of these small subgroup
+points by 8 returns the identity element (a kind of zero point). This means that multiplying the sum of a "normal" point and a torsion point by 8 (or a multiple of 8) will return the same point as multiplying the normal point by 8;
+the small subgroup point is "factored out". This allows a signature to verify on an alternate key image *so long as* the relevant scalars are multiples of 8. Cryptonote does not use scalars that are automatically multiples of 8 (whereas
+vanilla EdDSA does), but this is only a slight hurdle. An attacker need only choose the relevant scalars to be a multiple of 8 (in certain cases he cannot choose, and must instead create trial scalars until getting the desired result).
+
+Alternate mitigations:
+1. Multiply each key image by 8, then the result by 8^-1 (mod l), to get the proper key image in the correct subgroup. Reject double spends, or if the result is not the same as the input. Unwieldy.
+2. Mutliply each key image by 8 before storing in the key image list/checking for double spends. Quite invasive, as it requires redoing the existing key image list.
+
+
+Extra details:
+Monero's (and all CryptoNote coins') elliptic curve, ed25519, has a basepoint group cofactor of 8. There are 8 subgroups in ed25519, of the following sizes:
+1 ----|
+2     | --- small subgroups
+4     |
+8 ----|
+l (basepoint subgroup) ---|
+2*l                       | --- large subgroups
+4*l                       |
+8*l (all curve points) ---|
+
+Each small subgroup point is contained in the next larger small subgroup, and also in the corresponding large subgroup (superimpose small/large). Each large subgroup is contained in the next larger one as well. The only small subgroup
+point contained in subgroup 1 and l (basepoint subgroup) is the identity element, which works as a kind of zero (no effect on point addition). Mutliplying any point by its subgroup order will return the idenitity element (same as multiplying
+by 0). Mutliplying any point by 2, 4, or 8 will move it to the corresponding most exclusive subgroup (e.g., a point in 8*l subgroup multiplied by 4 would move to the 2*l subgroup, a point in the 8 subgroup multiplied by 2 would move the 4
+subgroup, and so on). Adding a small subgroup (non idenitity) point to a key image in the basepoint subgroup "knocks" it out of that subgroup and into one of the larger ones. Since the order of that subgroup is not l but some multiple,
+multiplying as in the proposed mitigation above does not return the identity element.
+~~~

_posts/2017-08-20-logs-for-the-Kovri-dev-meeting-held-on-2017-08-20.md

@@ -0,0 +1,172 @@
+---
+layout: post
+title: Logs for the Kovri Dev Meeting Held on 2017-08-20
+summary: Brief review of what has been completed since last meeting, discussion of meta issues, and code & open tickets discussion
+tags: [dev diaries, i2p, crypto]
+author: dEBRUYNE / fluffypony
+---
+
+*August 20th, 2017*  
+
+# Logs  
+
+**\<anonimal>** 1. Greetings  
+**\<anonimal>** 2. Brief review of what's been completed since the previous meeting  
+**\<anonimal>** 3. Contributor FFS check-in / status  
+**\<anonimal>** 4. Code + ticket discussion / Q & A  
+**\<anonimal>** 5. Any additional meeting items  
+**\<anonimal>** 6. Confirm next meeting date/time  
+**\<anonimal>** Well hello  
+**\<MoroccanMalinois>** hi  
+**\<anonimal>** Just you and me, eh MoroccanMalinois?  
+**\<moneromooo>** I'm here too, but I'm just reading.  
+**\<rehrar>** I'm here  
+**\<ajs>** here  
+**\<rehrar>** bam, attendance more than doubled  
+**\<anonimal>** Well there you go  
+**\<anonimal>** 2. Brief review of what's been completed since the previous meeting  
+**\<anonimal>** We had the 96boards webcast this past Thursday, so that was certainly a highlight.  
+**\<anonimal>** It was nice to have that done since I had started coordinating it toward the beginning of this year.  
+**\<rehrar>** I continued work on the new Kovri logo, but that has been put on hold indefinitely. I switched gears and started working on the Reddits. Got good amounts of work done and we are fixing to release the Monero subreddit new CSS here pretty soon. Kovri isn't far behind it. Then recently I'm also working on redoing the website a bit. Just a small restructure. Putting together some new wires for the pages.  
+**\<anonimal>** I've finally back to NTCP work (yay). Various fixes and rewriting. Now working on a phaser implementation and separating messaging from session code.  
+**\<ajs>** I passed along information to Pigeons about the irc server set up. He is looking into putting it up on a vps.  
+**\<anonimal>** I've noticed various little issues along the way that will be fixed along the way  
+**\<anonimal>** rehrar ajs: awesome  
+**\<pigeons1[m]>** No not a vps a vm on a dedicated machine we just got  
+**\<anonimal>** Oh even better  
+**\<ajs>** cool  
+**\<rehrar>** pigeons1[m]: fluffypony, any update on the infrastructure? :)  
+**\<rehrar>** oh, maybe that was just the update :P sorry  
+**\<pigeons1[m]>** rehrar: we got the machines and are moving things and configuring things. You can send me config info  
+**\<rehrar>** I'll talk to Snipa and get them. He did the setting up and debugging.  
+**\<rehrar>** I'm assuming it'd be too big a breach to have him help out?  
+**\<anonimal>** Let's stay on track here  
+**\<rehrar>** k sorry  
+**\<anonimal>** re: brief review, I've been playing PM tag with sarang but finally have began email comms  
+**\<anonimal>** I had sent him/her/it (assuming him) a list of various research related issues  
+**\<anonimal>** but will now work him to hone in on specific areas of research.  
+**\<anonimal>** I'm looking forward to this very much +1  
+**\<anonimal>** Anything else for brief review?  
+**\<anonimal>** Alrighty, 3. Contributor FFS check-in / status  
+**\<anonimal>** I'm here. Busy as usual.  
+**\<MoroccanMalinois>** nothing for this time  
+**\<MoroccanMalinois>** (was mostly on vacation)  
+**\<anonimal>** A well-deserved one too, I'm sure.  
+**\<rehrar>** Back in full swing. Wife healed nicely.  
+**\<MoroccanMalinois>** :)  
+**\<anonimal>** MoroccanMalinois: was milestone 2 settled (payment, etc.)?  
+**\<MoroccanMalinois>** nope  
+**\<anonimal>** rehrar: good to hear  
+**\<anonimal>** Uh oh, why not MoroccanMalinois?  
+**\<MoroccanMalinois>** Not enough work :)  
+**\<endogenic>** anonimal: re sarang i'm pleased to hear that  
+**\<anonimal>** Oh, when I say milestone 2 I mean *your* milestone 1.  
+**\<anonimal>** Because the FFS proposal is in 3 tranches, you took up the 2nd one (though it was your first).  
+**\<anonimal>** \*2nd one and 3rd one (because 1st one was completed)  
+**\<MoroccanMalinois>** ah  
+**\<MoroccanMalinois>** i thought u were talking about the 3rd milestone  
+**\<MoroccanMalinois>** that will be done tomorrow  
+**\<anonimal>** re: sarang, my thanks to endogenic for coordinating our first connection  
+**\<endogenic>** didn't do anything :P  
+**\<anonimal>** MoroccanMalinois: ok so 2nd is all settled?  
+**\<MoroccanMalinois>** No i have not contacted luigi yet (will do it tonight)  
+**\<anonimal>** ok  
+**\<anonimal>** Anything else on FFS check-in/status?  
+**\<bigreddmachine>** (I'm here, nothing to report on the ff extension side, been very busy IRL)  
+**\<anonimal>** I haven't read sarang's FFS (I hear he put out a new prorposal?)  
+**\<anonimal>** Hi bigreddmachine, good to hear from you  
+**\<anonimal>** re: FFS topic, does anyone have any specific input on what they'd want sarang to work on/look at re: kovri?  
+**\<anonimal>** I had a healthy list for him but I think he'll want me to narrow down things.  
+**\<rehrar>** I don't see a new one.  
+**\* anonimal** has no idea, I probably shouldn't assume that  
+**\<endogenic>** he's a network + crypto dude so i figured it might be possible to collaborate with him to produce a more elegant and simple form of i2p  
+**\<bigreddmachine>** You talked on Thursday about simplifying the crypto smorgasbord in kovri... That might be a good place for sarang to focus at some point  
+**\<anonimal>** Well when I was playing tag with him, I did ask him if he wanted to work on the anonymity system aspect or crypto; and he did say crypto.  
+**\<anonimal>** But he's also more of a math guy, and the reduction of kovri crypto is almost entirely implementation defined (so he wouldn't need to do any work on that).  
+**\<anonimal>** The cryptosystems we use could be looked at though, yes, for sure.  
+**\<endogenic>** yeah i bet he could help vet the water tightness of existing or new schemes  
+**\<endogenic>** and probably suggest alternate techniques for elements  
+**\<endogenic>** just guessing  
+**\<anonimal>** We'll see. Maybe he'll work on something before the next meeting.  
+**\<anonimal>** I'd like him to look at our DSA prime for example. I'm sure that's something he could do.  
+**\<anonimal>** But since we use libraries for most of our crypto, he may end up reviewing them.  
+**\* anonimal** shrugs, we'll see  
+**\<anonimal>** Anything else on FFS check-in?  
+**\<anonimal>** k, 4. Code + ticket discussion / Q & A  
+**\<MoroccanMalinois>** i have almost finished fixing #684. Will push later today  
+**\<anonimal>** Cool +1  
+**\<anonimal>** I'll merge #690. re: #690, I asked surae to look at my algo for aes-256 expanded key size but he didn't have time to look too deeply  
+**\<anonimal>** The constant doesn't change, so it's not a huge deal, but things like this would be nice for sarang to review/chime-in with from time-to-time.  
+**\<anonimal>** (yes, I said surae for first sentence and sarang for second)  
+**\<anonimal>** (so confusing!)  
+**\<anonimal>** Anything else on point 4.? I want to get to other points that rehrar and bigreddmachine were talking about.  
+**\<anonimal>** MoroccanMalinois: \^  
+**\<MoroccanMalinois>** nope  
+**\<anonimal>** k  
+**\<anonimal>** 5. Any additional meeting items  
+**\<anonimal>** bigreddmachine: are you still planning on doing a podcast?  
+**\<bigreddmachine>** Yes. I've had a busy summer so had to tick off some low hanging fruit with episodes. But I really think a talk with you (and any other key contribs) would be super.  
+**\<bigreddmachine>** Maybe time it to be right around alpha release date?  
+**\<anonimal>** Ok sure. Do you have a link to previous episodes (I didn't know you did them regularly/semi-regularly)?  
+**\<bigreddmachine>** MoneroMonitor.com  
+**\<i2p-relay> {-pigeons}** cool I didn't know about that one.  
+**\<bigreddmachine>** Some probably more interesting that others to this crowd :)  
+**\<anonimal>** Wow cool!  
+**\<anonimal>** Do we have a podcast section on the monero site?  
+**\<bigreddmachine>** Not sure. The Monero Missives were once the pseudo-official podcast  
+**\<bigreddmachine>** But that's at least a year defunct now.  
+**\<anonimal>** It would be nice to have links to things like this so they don't get flushed down the memory hole.  
+**\<anonimal>** I'm not sure where they'd go though. Somewhere in the community section I imagine.  
+**\<anonimal>** rehrar \^  
+**\<bigreddmachine>** Yes I agree. But haven't been sure where either so haven't done a PR.  
+**\<anonimal>** bigreddmachine: what's the best way to get in contact with you?  
+**\<rehrar>** I'll think about it and see if we can't squeeze you into a place. :)  
+**\<bigreddmachine>** In the near future I was to do episodrs on Love, Mimblewimble, with Surae, and probably Zooko on Zcash. And rehrar and I had discussed one too  
+**\<rehrar>** Indeed.  
+**\<bigreddmachine>** Anonimal, Securely or no?  
+**\<anonimal>** Either or is fine. Secure by default? Over the months I've tried pinging you on IRC but you weren't around (I just wanted to ask about the podcast).  
+**\<bigreddmachine>** moneromonitor@tutanota.com is a good email  
+**\<bigreddmachine>** Yeah I can't log into irc at work... Got in trouble for that hah  
+**\<anonimal>** oops!  
+**\<anonimal>** Ok, will email you there when needed.  
+**\<bigreddmachine>** If you ping me on irc with an "@" in front then slack should notify me though on my phone.  
+**\<rehrar>** Imma hafta split here pretty soon. What do we need from me? :)  
+**\<anonimal>** @bigreddmachine alright  
+**\<bigreddmachine>** Yeah that worked perfect  
+**\<anonimal>** rehrar: meeting ends in 4 minutes. You started talking infrastructure so if you had any more comments/questions?  
+**\<bigreddmachine>** And then I can log into irc with encryption on that you taught me.  
+**\<rehrar>** Oh, no. Not unless pigeons has anything more for me.  
+**\<anonimal>** bigreddmachine: that fantabulous cryptos!  
+**\<rehrar>** Oh, my question regarding Snipa. I'm assuming you'd just rather us shoot you config thingies? :)  
+**\<anonimal>** (you \=\= pigeons?)  
+**\<rehrar>** Oh, yes. Sorry for the confusion.  
+**\<Snipa>** There's not much config needed for mattermost.  I pretty well did a basic clean install, then setup matterbridge with the guides on the site.  
+**\<Snipa>** Hardest part was getting the webhooks to play nicely with each other, and seeing how they integrated.  
+**\<rehrar>** The man himself, ladies and gentlemen!  
+**\<anonimal>** Hi Snipa  
+**\<rehrar>** And the Taiga? And then the Taiga  / MatterMost connection?  
+**\<anonimal>** So we're 100% doing mattermost? I saw a few comments from people questioning/complaining.  
+**\<Snipa>** That's the webhooks.  If there's a specific question, I'll be glad to answer it of course, but a direct copy of the configs won't be useful, as I very much deployed them quick and dirty.  
+**\<rehrar>** As far as I know, yes. We got a second successful test and everything worked perfectly.  
+**\<anonimal>** k  
+**\<rehrar>** And we'll make a push to get people away from Slack  
+**\<anonimal>** +1  
+**\<anonimal>** Any other additional meeting items?  
+**\<rehrar>** Not from me for the time being.  
+**\<bigreddmachine>** Nope  
+**\<MoroccanMalinois>** nope  
+**\<hyc>** hey anonimal  
+**\<anonimal>** Hi hyc  
+**\<hyc>** on the 96boards mtg you suggested that only rsa4096 was needed  
+**\<hyc>** why that instead of one of the EC mechs?  
+**\<anonimal>** For reseed, yes.  
+**\<anonimal>** I'll need to see what the reseed servers are capable of / require.  
+**\<hyc>** afaik EC is smaller/faster/better  
+**\* anonimal** agrees  
+**\<hyc>** ok, just wondered and wanted to make sure  
+**\<anonimal>** Awesome, thanks for the question :) I'll put on my TODO list  
+**\<anonimal>** 6. Confirm next meeting date/time  
+**\<anonimal>** Same time, two weeks from now?  
+**\<bigreddmachine>** Sure I won't be there but thats not a big deal. I'll catch up with the minutes.  
+**\<anonimal>** Ok  
+**\<anonimal>** Thank you again everyone!  

_posts/2017-08-20-overview-and-logs-for-the-dev-meeting-held-on-2017-08-20.md

@@ -0,0 +1,502 @@
+---
+layout: post
+title: Overview and Logs for the Dev Meeting Held on 2017-08-20
+summary: Discussion of open PRs and issues, RuffCT, mobile wallets, upcoming release + scheduled protocol upgrade, dedicated hardware wallet, and miscellaneous
+tags: [dev diaries, core, crypto]
+author: dEBRUYNE / fluffypony
+---
+
+*August 20th, 2017*  
+
+# Overview  
+
+An overview can be found on [MoneroBase](https://monerobase.com/wiki/DevMeeting_2017-08-20).  
+
+# Logs  
+
+**\<fluffypony>** 1. Greetings  
+**\<fluffypony>** 2. Brief review of what's been completed since the previous meeting  
+**\<fluffypony>** 3. Code + ticket discussion / Q & A  
+**\<fluffypony>** 4. Any additional meeting items  
+**\<fluffypony>** 5. Confirm next meeting date/time  
+**\<fluffypony>** rehrar can do it next time :)  
+**\<rehrar>** I can, sorry for the confusion  
+**\<fluffypony>** 1. Greetings  
+**\<fluffypony>** can all the people who aren't here just say nay  
+**\<fluffypony>** :-P  
+**\<hyc>** neigh  
+**\<surae>** we never get past this part :  
+**\<fluffypony>** it's a fun part  
+**\<fluffypony>** we can move on to 2  
+**\<fluffypony>** 2. Brief review of what's been completed since the previous meeting  
+**\<fluffypony>** I guess the big thing is that we've branched  
+**\<surae>** well  
+**\<surae>** from MRL  
+**\<surae>** we got contacted by RingCT2.0 people, and we got contacted by a rsearcher named Tim Ruffing, each of them presenting improved set-ups for our current implementations  
+**\<surae>** not sure if I should just jump in or what..  
+**\<dEBRUYNE>** Yeah go ahead  
+**\<hyc>** sure, go  
+**\<surae>** ok so  
+**\<surae>** I have a .txt file describing the pseudocode of Ruffing's sublinear ring sig + CT set-up  
+**\<surae>** knaccc has been going through it and implementing it in Java  
+**\<surae>** we have a surprising amount of it debugged  
+**\<hyc>** \^ note, we're walking away from the RingCT2.0 stuff because it requires a trusted setup  
+**\<surae>** Ah, I didn't look into it because Ruffing's doesn't have a trusted set-up or any "new" crytpo. it just doubles all our key lengths  
+**\<iDunk>** surae: fpaste.org or pastebin.mozilla.org  
+**\<sn0wmonster>** has the meeting started?  
+**\<endogenic>** yes  
+**\<sn0wmonster>** where does it say it started? jesus  
+**\<surae>** iDunk is 0bin not good enough? :P  
+**\<iDunk>** It requires java.  
+**\<iDunk>** js actually  
+**\<moneromooo>** I think it needs to be encrypted due to agreement with Tim Ruffing.  
+**\<surae>** oh i didn't realize that  
+**\<DaveyJones>** surae ... the mooo wants javaless paste  
+**\<surae>** moneromooo no, just habit  
+**\<surae>** ok one sec  
+**\<moneromooo>** Oh, ok. I'm dying to see it then :D  
+**\<moneromooo>** ty  
+**\<surae>** we are in the midst of debugging knaccc's java code  
+**\<dEBRUYNE>** surae: Could you perhaps give an ELI5 (for anyone that reads the logs later) how RuffCT will improve our protocol?  
+**\<surae>** well, roughly, (ruffly)  
+**\<knaccc>** lol  
+**\<surae>** signature sizes are O(N) right now. So signature sizes take up "as much space" as the number of public keys implicated in the signature  
+**\<surae>** Ruffing's set-up, for N=n\^m, has signature sizes O(n\*m). Verification and computation *it appears* to be on the same order. so, for example, to sign a ring signature with N=10\^17 signers, which is freaking absurd, you would need "as much space" as 10*17 = 170  public keys  
+**\<surae>** there are constants and stuff, so it's not exact, but at the very least, Ruffing's set-up is looking at really absurdly large ring signatures  
+**\<hyc>** ... without taking absurdly large amount of space  
+**\<surae>** with a set-up like this, there should be no good reason to not simply sign every transaction with the top half of the blockchain every time  
+**\<surae>** or taking absurdly large amounts of time to verify or compute  
+**\<dEBRUYNE>** So we can easily use ring size 100k for instance?  
+**\<dEBRUYNE>** Or even higher  
+**\<hyc>** even higher  
+**\<fluffypony>** EVEN HIGHER  
+**\<surae>** assuming his set-up actually works (the math seems tight) and assuming his security proofs hold up (I am going to try to make independent security proofs and then later compare them), and after six months to a year of testing, etc etc  
+**\<surae>** i mean  
+**\<JollyMort[m]>** UNLIMITED RINGSIZE  
+**\<endogenic>** fluffypony: what does the scouter say about monero's ringsize level?  
+**\<moneromooo>** log(infinity) is infinity...  
+**\<surae>** in a certain sense, this is like an alien came down and gifted us faster than light travel. yeah, we can go out there and start traveling around, but we have to consider consequences for the timeline. :P haha  
+**\<fluffypony>** endogenic: I give up?  
+**\<endogenic>** it's over 9000  
+**\<fluffypony>** lol  
+**\<DaveyJones>** the puns are ruff today  
+**\<fluffypony>** also to add to what surae's said  
+**\<moneromooo>** Would be need (pretty much) all pubkeys/commitments in RAM all the time, in order to verify such sigs ?  
+**\<moneromooo>** Or can some precomp be done ?  
+**\<fluffypony>** multisig isn't baked in right now, it would need to be re-done from scratch  
+**\<rehrar>** the room fell silent  
+**\<hyc>** I'll precompute it all for ya. trust me.  
+**\<dEBRUYNE>** fluffypony: Are we certain it has to be re-done from scratch or would it possible to just tweak the current implementation?  
+**\<surae>** moneromooo the signature itself only uses the commitments from the column of the signer  
+**\<fluffypony>** dEBRUYNE: we're certain  
+**\<dEBRUYNE>** k  
+**\<DaveyJones>** fluffypony - can it be dual run like pre-ct and ring-ct till the fork?  
+**\<dEBRUYNE>** I think we shouldn't forego the current implementation, because we're already quite far in  
+**\<surae>** debruyne the shen-luigi multisig set-up which is a version of the schnorr multisig, might lead us to a similar set-up for RuffCT, but it's not a simple gluing like one would hope  
+**\<dEBRUYNE>** In addition, it may take a year before RuffCT is actually implemented  
+**\<DaveyJones>** so that we could keep luigi ms till ruff ms is done ?  
+**\<dEBRUYNE>** And even longer before we have a multisig that is compatible with ruffct  
+**\<JollyMort[m]>** you can always convert later  
+**\<fluffypony>** DaveyJones: I don't think so, at least not trivially  
+**\<JollyMort[m]>** i mean if we have to do RCT->RuffCT  
+**\<surae>** dEBRUYNE I'm actually with you on that. chances are good RuffCT is about 1 year out from being live, and I wouldn't be *shocked* if we could make a threshold scheme out of it before that year is up  
+**\<JollyMort[m]>** same can be done for wallets  
+**\<JollyMort[m]>** RCT multisig -> RuffCT multisig  
+**\<fluffypony>** well, basically this isn't going in to a hardfork until we have multisig  
+**\<msvb-lab>** JollyMort[m]: hardware or software wallets?  
+**\<tyrionmcmmaster>** i agree with the majority, that multisig pre-ruffct should be implemented for the time being  
+**\<JollyMort[m]>** and shen/luigi multisig can work regardless of consensus rules  
+**\<dEBRUYNE>** \<msvb-lab> JollyMort[m]: hardware or software wallets? \<= Doesn't matter  
+**\<JollyMort[m]>** by means of one-time multisig wallets  
+**\<surae>** so i'm happy finsihing up the shen-luigi multisig scheme, letting wallets use it until RuffCT goes live, they'll still be able to use it for whatever RCT outputs are still floating around if they like... and maybe users may miss out on threshold signatures for one hardfork, but probably not two.  
+**\<hyc>** that sounds decent  
+**\<fluffypony>** ok  
+**\<DaveyJones>** \^+1  
+**\<fluffypony>** guys let's move on  
+**\<surae>** excellente  
+**\<fluffypony>** 3. Code + ticket discussion / Q & A  
+**\<DaveyJones>** can i chime in for the AFK devs?  
+**\<fluffypony>** before we discuss any specific PRs / issues  
+**\<fluffypony>** I wanted to get a feel as to how we should handle the branch wrt PRs  
+**\<fluffypony>** ie. do we want people to push PRs to both branches where relevant  
+**\<fluffypony>** or must I just cherry-pick commits?  
+**\<moneromooo>** Push to both, or the GPG signature drops.  
+**\<fluffypony>** moneromooo: I meant cherry-pick to my fork and then PR it  
+**\<hyc>** ok. but tat this pre-release time, how are we deciding which PRs are eligible for the release branch?  
+**\<moneromooo>** fluffypony: I don't understand that.  
+**\<moneromooo>** If someone wants a patch to the release branch, they PR it to that branch too.  
+**\<vtnerd>** bug fixes should automatically be considered ... everything else is subjective  
+**\<fluffypony>** vtnerd: it's bug fixes only  
+**\<moneromooo>** I guess you can cherry-pick if the commit isn't signed in the first place.  
+**\<fluffypony>** nothing else goes in, we're in code freeze on the branch  
+**\<fluffypony>** moneromooo: if I cherry-pick and I sign it then it's still signed?  
+**\<vtnerd>** ok good, at least we are in agreement on that  
+**\<moneromooo>** Well, it's signed by you, yes...  
+**\<moneromooo>** But you're kinda not the author ? :)  
+**\<fluffypony>** moneromooo: with cherry-pick it lists both myself and the aithor iirc  
+**\<fluffypony>** \*author  
+**\<moneromooo>** I guess nobody really cares anyway.  
+**\<moneromooo>** Yes, but the author's signature drops AFAIK.  
+**\<moneromooo>** So you could modify a large patch, sign it, and nobody would notice.  
+**\<iDunk>** I agree with moneromooo, that's not the way to do it.  
+**\<hyc>** ok, so PR directly to release branch  
+**\<fluffypony>** moneromooo: https://i.imgur.com/PG0YmsF.png \<- like that  
+**\<hyc>** there's 22 open PRs at the moment. only a few seem to be current bugfixes  
+**\<moneromooo>** Most people will just PR to master anyway, so not much trouble.  
+**\<moneromooo>** I'm not sure I get the point.  
+**\<fluffypony>** ok this is more about the fallback if the contributor doesn't PR to the branch in a timeous fashion  
+**\<moneromooo>** In that case, if it's really needed for the branch, cherry-pick is OK I suppose.  
+**\<fluffypony>** ok cool  
+**\<hyc>** but re: the branch, I'd like #2313 and #2314 to go into the release. should help further reduce chance of corruption on powerfail.  
+**\<moneromooo>** Agreed.  
+**\<moneromooo>** I'll just fixup the target thing too.  
+**\<hyc>** cool  
+**\<moneromooo>** I think just removing the state check will be fine.  
+**\<fluffypony>** yes  
+**\<fluffypony>** if those can be PRd to the branch that would be great  
+**\<hyc>** willdo  
+**\<fluffypony>** ok - anything else?  
+**\<JollyMort[m]>** about GUI cold signing  
+**\<JollyMort[m]>** any plans to add import/export outputs&keyimage stuffs  
+**\<msvb-lab>** fluffypony: Not sure when it's appropriate to ask for consensus on (yes) increase efforts towards a hardware wallet or (no) maintain status quo.  
+**\<fluffypony>** what's everyone's feelings on merging 0MQ into master?  
+**\<DaveyJones>** so tewinget only said that he just wants further feedback  
+**\<dEBRUYNE>** JollyMort[m]: Jaquee isn't here afaik  
+**\<DaveyJones>** and jaquee asked this  
+**\<Jaquee>** i'm here now  
+**\<hyc>** I thought merging 0MQ is slated for after the release  
+**\<DaveyJones>** \<Jaquee> not sure if i can make it to the meeting. have two questions. 1. updates on disk space on build machines (when can we have an android apk available for download?) 2. updates on app store and transifex accounts?  
+**\<Jaquee>** reading backlog  
+**\<moneromooo>** After the release is done, yes.  
+**\<DaveyJones>** oh your here :D  
+**\<fluffypony>** we've already branched, tho, so surely we can merge to master?  
+**\<moneromooo>** his here.  
+**\<fluffypony>** msvb-lab: the dev working group don't really control external manufacturers  
+**\<dEBRUYNE>** fluffypony: moneromooo wants to put in an additional review afaik  
+**\<moneromooo>** I've not looked at the latest changes yet.  
+**\<dEBRUYNE>** And tewinget is waiting for further feedback  
+**\<fluffypony>** ok  
+**\<Jaquee>** but maybe lightwallets PR can be merged? (in masteR)  
+**\<pigeons1[m]>** Jaquee we got the build machine so early this week on the android jobs  
+**\<rehrar>** regarding the transifex account, I've found an open-source, self-hosted alternative in weblate.org  
+**\<medusa>** i dont think the fact if we branched mathers too much regradiing 0mq  
+**\<Jaquee>** pigeons1[m]: Great!  
+**\<rehrar>** just waiting on the new server infrastructure :)  
+**\<medusa>** we should play it safe  
+**\<moneromooo>** If the lightwallet stuff is the same I reviewed already, it was OK to merge IIRC.  
+**\<Jaquee>** it's the same  
+**\<fluffypony>** kk  
+**\<dEBRUYNE>** \^ Not sure we should put that up on SE already  
+**\<sn0wmonster>** i have a suggestion for future meetings, let me know when i can make it.  
+**\<JollyMort[m]>** yeah i thought that too dEBRUYNE  
+**\<JollyMort[m]>** surae what do you think?  
+**\<fluffypony>** yeah I think some of this is confidential-ish  
+**\<hyc>** are we still on ticket discussion?  
+**\<DaveyJones>** aye  
+**\<JollyMort[m]>** i mean, putting it in the meeting logs also makes it public  
+**\<JollyMort[m]>** the genie is out of the bottle  
+**\<dEBRUYNE>** I can just remove it from the logs  
+**\<fluffypony>** hyc: about to move on, but you can still bring stuff up  
+**\<hyc>** no that's fine  
+**\<dEBRUYNE>** JollyMort[m] \^  
+**\<hyc>** let's move on  
+**\<dEBRUYNE>** fluffypony: Jaquee wanted to know about the appstore accounts btw  
+**\<fluffypony>** surae should weigh in on that  
+**\<dEBRUYNE>** If you have any update on that  
+**\<Jaquee>** ^^  
+**\<fluffypony>** app store accounts are waiting on the D-U-N-S number to be sent to Apple, I've sent scans of docs to Google and M$  
+**\<fluffypony>** so Two Weeks™ ?  
+**\<fluffypony>** 4. Any additional meeting items \<- moving on to that  
+**\<fluffypony>** since it's part of it anyway  
+**\<sn0wmonster>** is this where i can make a suggestion?  
+**\<fluffypony>** sn0wmonster wanted to make a suggestion  
+**\<sn0wmonster>** yay  
+**\<sn0wmonster>** so, i noticed the meeting started only after it was obvious it was a meeting  
+**\<sn0wmonster>** i don't see a Meetbot (which apparently is a package in Debian),  
+**\<sn0wmonster>** so if you must do it this way, i was wondering if you wouldn't make it painfully obvious to everyone with a header of some kind, like this:  
+**\<othe>** msvb-lab asked a question but got overrun, i am willing to help sponsor his hw wallet stufdlf  
+**\<fluffypony>** also the time is set two weeks in advance  
+**\<sn0wmonster>** \/flushq  
+**\<pigeons1[m]>** Sn0wmonster makes a great meeting bot  
+**\<hyc>** it's also announced on reddit and github  
+**\<sn0wmonster>** beep bop boop  
+**\<othe>** Ffs sake, there are 2 hw wallet proposals. Feedback appreciated.  
+**\<msvb-lab>** othe: If anyone has advice on what to change in those FFS, the URLs are:  
+**\<msvb-lab>** https://forum.getmonero.org/7/open-tasks/88149/dedicated-monero-hardware-wallet/  
+**\<hyc>** and was announced here a few hours earlier  
+**\<msvb-lab>** https://forum.getmonero.org/7/open-tasks/88160/monero-firmware-for-ledger-wallet/  
+**\<endogenic>** sn0wmonster: https://github.com/monero-project/meta/issues  
+**\<fluffypony>** sn0wmonster: https://www.reddit.com/r/Monero/comments/6uvu94/dev_kovri_meetings_later_today_1700_1800_utc/  
+**\<DaveyJones>** shhh listen to othe and msvb-lab  
+**\<sn0wmonster>** i didn't say it wasn't known, i said the *chatlog* had no introduction that the meeting had started really  
+**\<endogenic>** sn0wmonster: it did though ?  
+**\<JollyMort[m]>** i'm saying it had :) first post by fluffypony with the agenda 0. .. 1. .. 2.. ...  
+**\<JollyMort[m]>** maybe you missed it  
+**\<msvb-lab>** DaveyJones: Rather than listen, please speak whoever is interested in hardware crypto and border searches.  
+**\<rehrar>** but it didn't have the Monero symbol  
+**\<endogenic>** msvb-lab: doesn't quite seem like a dev item tho  
+**\<hyc>** yeah, I think we can put that meeting announcement topic to rest.  
+**\<DaveyJones>** msvb-lab they cannot speak if they don`t listen :D  
+**\<moneromooo>** In other code news: I'm still debugging sync niggles with iDunk's help (who's been doing a LOT of testing, so many thanks). It'll be ready soon (both branch and master).  
+**\<rehrar>** msvb-lab: we can talk about it in Community meeting next week?  
+**\<msvb-lab>** endogenic: Okay, let's postpone. Good idea rehrar.  
+**\<JollyMort[m]>** about the gui cold signing  
+**\<iDunk>** Yw :)  
+**\<JollyMort[m]>** it's still missing features  
+**\<moneromooo>** If someone feels like syncing, please try the sync-standby3 branch :)  
+**\<endogenic>** msvb-lab: no need to post-pone. maybe bring it up in #Monero ?  
+**\<dEBRUYNE>** rehrar, endogenic: If there's room left, why not give msvb-lab the floor for a few minutes?  
+**\<moneromooo>** It may not be code per se, but it's tech. I think it's fine here. Still 10 minutes.  
+**\<othe>** I'll just sponsor it, its hilarious that there's no secure way to store xmr.  
+**\<endogenic>** kk  
+**\<fluffypony>** msvb-lab: a dedicated wallet would be cool  
+**\<rehrar>** well that's decided then isn't it?  
+**\<msvb-lab>** So the question is if we can achieve consensus on how to lower risk of another year with no wallet.  
+**\<hyc>** there are two proposals tho, do we have to pick one, or do both?  
+**\<msvb-lab>** hw wallet, i mean.  
+**\<fluffypony>** Ledger are already working on it, not sure if we need to double up efforts there  
+**\<dEBRUYNE>** Perhaps it'd be more beneficial if we have some general firmware that hw wallets could implement  
+**\<surae>** gosh, sorry, i got distracted. no, please don't put up a stackexchange yet. a few weeks, no problem, but right now we should maybe keep it a little quieter~  
+**\<surae>** if possible  
+**\<surae>** cat's out of the bag, but i mean  
+**\<msvb-lab>** hyc: One deals with dedicated hardware design, the other with porting to existing hardware.  
+**\<fluffypony>** msvb-lab: https://www.reddit.com/r/Monero/comments/6thv8j/ledger_hardware_wallet_monero_integration/ \<- this is from 6 days ago  
+**\<endogenic>** 2quick4u fyi  
+**\<msvb-lab>** fluffypony: That's probably Cedric's document Blue-something, quite good.  
+**\<dEBRUYNE>** \<msvb-lab> hyc: One deals with dedicated hardware design, the other with porting to existing hardware. \<= Even though the former would be pretty cool, the latter is probably more beneficial  
+**\<JollyMort[m]>** and debruyne out the link then; i feel like simply removing stuff from the logs goes against some principle on transparency  
+**\<hyc>** looks to me like Ledger has done the hard part of figuring out the division of labor between hw wallet and Monero libraries  
+**\<Jaquee>** ledger said alpha around end of september iirc.  
+**\<fluffypony>** I don't think there's value in doubling up on the Ledger effort  
+**\<hyc>** ^^ agreed  
+**\<dEBRUYNE>** What about porting to Trezor and Keepkey though?  
+**\<Jaquee>** +1  
+**\<msvb-lab>** There have been firmware ports (to Trezor) before that have not met Monero's feature set (RingCT) or unmaintained.  
+**\<dEBRUYNE>** Perhaps msvb-lab is interested in finishing noodle's code?  
+**\<fluffypony>** msvb-lab: Trezor was more complicated than that  
+**\<msvb-lab>** I just hope if Cedric completes the port, that there is maintenance after that.  
+**\<fluffypony>** NoodleDoodle did the Trezor firmware  
+**\<JollyMort[m]>** Cedric is the Ledger crypto-guy  
+**\<ferretinjapan>** fluffypony, choice is always a good thing WRT HWE wallets, otherwise we may get centralisation of support/development/monopoly of service, etc.  
+**\<hyc>** I'd say we pick up whatever changes ledger comes up with and use that as a basis for other hw projects  
+**\<fluffypony>** then there was a bit of a disagreement between Trezor and us  
+**\<JollyMort[m]>** afaik  
+**\<fwrttrukjwtrijdh>** sorry, noticed objections above to SE questions. Will delete for now. Does same objection apply to both Ruffling and RingCT2.0 paper?  
+**\<fluffypony>** and then I met up with them 33c3, and they said that it's not worth us moving forward on it till Trezor 2.0  
+**\<hyc>** if all the wallets use the same handshakes that saves everyone effort  
+**\<fluffypony>** which was Coming Soon™  
+**\<moneromooo>** Tim Ruffing requested keeping is internal as a courtesy. I don't think anhything like that applies to Ringct 2.0.  
+**\<dEBRUYNE>** The 2.0 paper was posted on reddit too :P  
+**\<hyc>** that's as close as we'll get to a "common firmware" - other hw wallets will be based on different chips anyway  
+**\<msvb-lab>** Not sure how stable (management or technically) Trezor is, hoping Cedric follows through on the Ledger work is a possibility. We then do little or nothing and wait for results.  
+**\<fluffypony>** msvb-lab: I'd support effort on a dedicated HW wallet  
+**\<JollyMort[m]>** chip design etc? that sounds good  
+**\<JollyMort[m]>** especially if all the schematics are published  
+**\<msvb-lab>** Something that interests me is adding Monero specific features to a dedicated wallet, and make it as border search proof as possible (not supported by Ledger.)  
+**\<JollyMort[m]>** so anyone can buy the parts and build it  
+**\<hyc>** lol. I'm not soldering surface-mount chips by myself.  
+**\<msvb-lab>** JollyMort[m]: Everything would be designed with KiCad and published in a github or similar.  
+**\<sn0wmonster>** what is not border-proof about ledger?  
+**\<msvb-lab>** hyc: I have a SMD lab, reflow and all.  
+**\<ferretinjapan>** hyc, what's the problem? All you do is put it in the oven ;)  
+**\<msvb-lab>** sn0wmonster: No ability to destroy the private key without battery.  
+**\<fluffypony>** avoiding the glitching attacks just demonstrated against Trezor will be fun  
+**\<hyc>** let's just say I've overcooked a few microcontrollers in my day...  
+**\<endogenic>** hyc: you need an intern or two  
+**\<JollyMort[m]>** hyc baking bad :)  
+**\<msvb-lab>** fluffypony: Yes, glitch defense is part of the design. I'm not sure it's possible at all, but there will be research.  
+**\<fluffypony>** cool beans  
+**\<dEBRUYNE>** fluffypony: Do we still have time, I wanted to suggest something more generally?  
+**\<msvb-lab>** fluffypony: Randomness probably plays an important role, so we have chips like ATSHA240A.  
+**\<DaveyJones>** so dedicated hw of the two it will be ? so we can come to a conclusion before the end of meeting  
+**\<JollyMort[m]>** Jaquee: would it be too much effort to add the import/export stuffs into gui  
+**\<msvb-lab>** dEBRUYNE: Let's close off hw wallets now, but everyone please add a post to the FFS if you have a strong opinion.  
+**\<msvb-lab>** Thanks for the floor folks!  
+**\<JollyMort[m]>** would be nice to avoid depending on the CLI to fix cold signing glitches  
+**\<dEBRUYNE>** All right, I'll leave a comment later msvb-lab :)  
+**\<JollyMort[m]>** and some use cases require import/export stuffs  
+**\<dEBRUYNE>** I personally wanted to raise the idea to release more often (e.g. a new release every quarter) to (i) tighten and improve the feedback loop and (ii) decrease time spend on helping out people that incur issues that are already long fixed in master  
+**\<Jaquee>** JollyMort[m]: not that much effort. problem is that code is frozen in monero. so wont make into this coming release  
+**\<dEBRUYNE>** I spoke with fluffypony about this in private and he was concerned it would put too much pressure on contributors  
+**\<JollyMort[m]>** :(  
+**\<dEBRUYNE>** So I'd like to hear their opinion about it  
+**\<Jaquee>** i added some improvements yesterday  
+**\<dEBRUYNE>** I guess I should mainly page Jaquee, moneromooo, hyc, iDunk  
+**\<JollyMort[m]>** i saw, haven't tested it yet  
+**\<dEBRUYNE>** \^ apologies if I forgot someone :P  
+**\<hyc>** "release early, release often"  
+**\<JollyMort[m]>** i'll check it out  
+**\<moneromooo>** I think it'd put too much pressure on the pony.  
+**\<dEBRUYNE>** hyc: Right, that was kind of my basis for the idea  
+**\<Jaquee>** i'd love to release more often  
+**\<hyc>** I think having another interim release would be nice  
+**\<moneromooo>** He barely has the time to do anything AIUI.  
+**\<dEBRUYNE>** moneromooo: Could this be mitigated if we had an additional maintainer?  
+**\<endogenic>** i think it's funny when people say "fail fast"  
+**\<fluffypony>** we need to bear in mind that this is security software  
+**\<dEBRUYNE>** I think luigi wanted to do an FFS soon for it  
+**\<moneromooo>** Who would you trust which can do it ?  
+**\<moneromooo>** hyc!  
+**\* moneromooo** flees  
+**\<hyc>** :P  
+**\<dEBRUYNE>** Well luigi could merge stuff and FP release?  
+**\<fluffypony>** I don't think we should be pushing to release unstable software :-P  
+**\<DaveyJones>** hyc or the luigi1115  
+**\<fluffypony>** an additional maintainer won't make software magically stable :-P  
+**\<hyc>** true  
+**\<dEBRUYNE>** fluffypony: No, but it would take time away that you have to spend on merging and reviewing stuff  
+**\<ferretinjapan>** I'd just like to say that a backup maintainer should be seriously considered, even if the release schedule stays the same, there's nothing like redundancy...  
+**\<fluffypony>** we need way more eyes on PRs than that  
+**\<fluffypony>** ferretinjapan: we already have backups  
+**\<dEBRUYNE>** Also, those large merging waves inhibit the momentum of the project imo  
+**\<ferretinjapan>** ah, goodo  
+**\<medusa>** the lack of follow up bugfix releases causes huuge amunt of support work  
+**\<fluffypony>** the Core Team have access, and luigi1115 is my direct backup  
+**\<fluffypony>** medusa: we've already solved that  
+**\<medusa>** how?  
+**\<rehrar>** What if one release added content, and the intermin is just bug fixes?  
+**\<fluffypony>** with the branch  
+**\<dEBRUYNE>** \<fluffypony> I don't think we should be pushing to release unstable software :-P \<= Not saying we should, but if master is deemed stable we could put out a release with a few new features right?  
+**\<medusa>** so this time we going to have a follow up release 100% ?  
+**\<medusa>** like 2 weeks later  
+**\<fluffypony>** medusa: it depends on if there are bug fixes  
+**\<dEBRUYNE>** There are always bug fixes  
+**\<dEBRUYNE>** :P  
+**\<medusa>** well depends on severity i agree  
+**\<medusa>** of the bug  
+**\<ferretinjapan>** dEBRUYNE, what about early beta releases? Say just before the freeze?  
+**\<JollyMort[m]>** for one thing, i would love to see cold signing stuffs added asap; feel like it's an important feature to those who don't want to use CLI for the same thing  
+**\<JollyMort[m]>** and be able to resolve any problem people may have by using GUI functions  
+**\<ferretinjapan>** or an "experimental" release?  
+**\<hyc>** can we just get people to use a nightly build, for bugfix verification?  
+**\<dEBRUYNE>** ferretinjapan: That seems suboptimal, as there would be new binaries a few weeks later  
+**\<bigreddmachine>** Isn't that what the nightly builds are?  
+**\<hyc>** and then at some point we can decide if we have something stable enough for another release  
+**\<medusa>** if we potentially want to keep the branch that long, we should also slow down with merging stuff in trunk (especially 0mg)  
+**\<medusa>** until we can estimate the quality of the branch somehow  
+**\<fluffypony>** just looking at the recent releases, I don't think there have been a lack of them  
+**\<fluffypony>** Sep 19, 2016: 0.10.0  
+**\<fluffypony>** Dec 13, 2016: 0.10.1  
+**\<fluffypony>** Feb 23, 2017: 0.10.2  
+**\<fluffypony>** Feb 24, 2017: 0.10.2.1  
+**\<fluffypony>** Mar 26, 2017: 0.10.3  
+**\<fluffypony>** Mar 26, 2017: 0.10.3.1  
+**\<medusa>** otherwise we risk, dpeending on buigs we have after release, to end up in a hairy position  
+**\<hyc>** so it sounds like release-as-needed is working  
+**\<fluffypony>** yeah, I'm not really seeing a lack of releases there  
+**\<moneromooo>** especially on march the 26th.  
+**\<hyc>** heh  
+**\<JollyMort[m]>** release density == nan  
+**\<ferretinjapan>** The last 5 months have been rather quiet, but I don't think it's all bad.  
+**\<medusa>** those 1d releases dont yount  
+**\<medusa>** they fix emergency stuff  
+**\<ferretinjapan>** You guys were busy with making sure ringct was solid after all...  
+**\<medusa>** we talk about follow up releases, with 2 weeks in between  
+**\<medusa>** we enever do that  
+**\<ferretinjapan>** and then there was that bug...  
+**\<hyc>** 2 weeks seems too soon for a scheduled followup  
+**\<bigreddmachine>** Q before meeting is over. What kinds of things need to be studied on the PoW change proposal? I'm happy to dig into that but would like some direction if possible.  
+**\<hyc>** and 5 months since the last release seems too long  
+**\<endogenic>** bidreddmachine: what problem necessitates that?  
+**\<dEBRUYNE>** hyc: If the release merely intends to fix bugs of the latest release, is two weeks too soon?  
+**\<endogenic>** the PoW change  
+**\<hyc>** dEBRUYNE: I presume bug fix releases go out as soon as available  
+**\<dEBRUYNE>** But we haven't done that in the past  
+**\<hyc>** e.g., for emergency fixes  
+**\<dEBRUYNE>** That's the issue medusa is raising  
+**\<hyc>** otherwise, if it's not urgent, 2 weeks seems short.  
+**\<msvb-lab>** has the meeting officially ended, one hour right?  
+**\<fluffypony>** well in the past 5 months we haven't really been able to release stable + bug fixes  
+**\<DaveyJones>** afaik the GUI had/has a bug that freeze's the wallet on some system thats already fixed but never got released ... thats what your talking about medusa?  
+**\<bigreddmachine>** endogenic: some things were raised in the thread on GitHub. I wouldn't be going into it saying "this needs to happen" but rather trying to dissect the potential issues and see if there is anything to be gained.  
+**\<fluffypony>** because we didn't branch  
+**\<fluffypony>** now we branch  
+**\<fluffypony>** so it seems like we're discussing something we've already fixed...?  
+**\<dEBRUYNE>** DaveyJones: Yes, which causes a lot of support issues  
+**\<medusa>** well we expect you to be around and build a bin  
+**\<medusa>** if thats all fine that its all good  
+**\<hyc>** yeah sounds like it's fixed already  
+**\<dEBRUYNE>** fluffypony: For the GUI, for example, we're still helping people that incur bugs from GUI beta 2  
+**\<dEBRUYNE>** That were fixed a week after the release  
+**\<hyc>** 3 months from now we can raise the question of an interim release if there haven't already been a slew of releases  
+**\<fluffypony>** dEBRUYNE: I know what the issue was, hence the branching thing  
+**\<medusa>** its also a time and tacting thing  
+**\<medusa>** if we plan to let the branch live that long you will need to thread the trunk differently  
+**\<dEBRUYNE>** fluffypony: So if I understand the branching correctly, we'll release from the branch and if too much annoying bugs are found in the release version, we'll do a follow up point release to include fixes?  
+**\<medusa>** it has a lof of effects  
+**\<msvb-lab>** netsplit for me i guess...  
+**\<bigreddmachine>** With branching now, couldn't we just have monthly  release candidates or something?  
+**\<fluffypony>** dEBRUYNE: yes - follow-up releases are based off the branch  
+**\<rehrar>** I know we're already over, but can we get a brief update regarding Sarang's FFS?  
+**\<moneromooo>** How about we don't spam the pony yet ? Let's wait, and maybe do a release from the branch if there are bugs we want fixed.  
+**\<fluffypony>** @bigreddmachine no need to timeframe it, we'll release when there are bug fixes part of the branch that make it worth releasing  
+**\<fluffypony>** ie. major bug fixes  
+**\<hyc>** agreed  
+**\<bigreddmachine>** Fluffy, I just meant a pseudostable branch that's a bit more tested than the nightlies.  
+**\<dEBRUYNE>** \<fluffypony> dEBRUYNE: yes - follow-up releases are based off the branch \<= All right, well, let's see how that will go then  
+**\<fluffypony>** not spelling errors or whatevs  
+**\<bigreddmachine>** But not an actual release.  
+**\<bigreddmachine>** Maybe that's a "2 years down the road" thing  
+**\<fluffypony>** @bigreddmachine you mean off the main branch or the release branch?  
+**\<moneromooo>** We tried that before, it was a massive pita.  
+**\<hyc>** can the build system do nightlies of the release branch too?  
+**\<fluffypony>** hyc: pretty sure, yeah  
+**\<bigreddmachine>** I meant as its own branch... Commits get tested, when somewhat sure moved to release candidates, which is still unstable, and then when that's tested moves to the actual release. Probably a pita like mooo said  
+**\<fluffypony>** pigeons1[m]: ^^  
+**\<fluffypony>** yeah complete PITA  
+**\<bigreddmachine>** Okay just brainstorming  
+**\<pigeons>** yes, i'll setup jobs for the release branch  
+**\<hyc>** that ought to be good enough then as far as release candidates go  
+**\<fluffypony>** re: sarang, pero were your questions satisfied?  
+**\<pizzasushibeer>** As a supporter of Ledger see nothing wrong with the community funding a 2nd hw wallet initiative. More options are beneficial and im sure many of us already own multiple Bitcoin hw wallet types for a variety of reasons  
+**\<DaveyJones>** pero is rarely available this week @ fluffypony  
+**\<dEBRUYNE>** fluffypony: I think sarang was rewriting the proposal, but I am not sure if he has finished yet  
+**\<fluffypony>** ok  
+**\<pizzasushibeer>** If the community is willing to fund, it I see nothing wrong with moving proposal to funding required (after any more required clarifications are made)  
+**\<sn0wmonster>** i think i'm gonna bother these guys to make a patch for their box for Monero http://bitseed.org/  
+**\<sn0wmonster>** wrong channel  
+**\<pizzasushibeer>** I would help contribute to the hardware wallet proposal. Im sure others agree  
+**\<pigeons>** if pero's questions aren't answered maybe post a forum reply reminding him that so sarang can see clearly its outstanding still  
+**\<hyc>** yeah I recall pero was going to be unavailable for the next week or two  
+**\<ferretinjapan>** pizzasushibeer, I'm another person and I agree.  
+**\<scoobybejesus>** sarang was about to post clarifications to his ffs a couple times recently.  it's been mentioned more than once on #mrl  
+**\<hyc>** ok, we're 25minutes over. any more stuff?  
+**\<dEBRUYNE>** Guess not :-P  
+**\<DaveyJones>** would it be possible that -site maybe gets an additional maintainer ?  
+**\<DaveyJones>** afaik it less to no coding stuff and maybe people like dEBRUYNE or rehrar would be able to maintain it... so no need to bother you fluffypony ^ ^  
+**\<fluffypony>** DaveyJones: we're working on alternatives, probably doing something based off issue helper  
+**\<DaveyJones>** fine :)  
+**\<JollyMort[m]>** binaries and .raw downloads are high-sec  
+**\<fluffypony>** ^^  
+**\<rehrar>** Ye. Responsibility is scary.  
+**\<fluffypony>** so issue helper could be used to trigger merges where it doesn't touch sensitive parts of the site  
+**\<rehrar>** Dude, that's awesome.  
+**\<rehrar>** For all those little merchant merges  
+**\<DaveyJones>** yeah i had things like merchants in mind  
+**\<dEBRUYNE>** And then we could give the issue helper trusted community members access to the issue helper right?  
+**\<dEBRUYNE>** \^ fluffypony  
+**\<rehrar>** We eventually should drop support for Merchants on the site tbh imo  
+**\<fluffypony>** dEBRUYNE: yes  
+**\<fluffypony>** rehrar: why?  
+**\<moneromooo>** It's a good, if small, incentive for people to support monero.  
+**\<moneromooo>** And for connecting monero spenders with monero earners.  
+**\<rehrar>** As Monero grows it will become gigantic eventually, but maybe that's not a huge issue.  
+**\<rehrar>** Just my thoughts.  
+**\<hyc>** success problems are nice to have. we're not there yet  
+**\<moneromooo>** Oh, sure. Once Monero's world reserve currency, it can go :)  
+**\<DaveyJones>** \^ but only then  
+**\<dEBRUYNE>** fluffypony: All right, seems cool. That'd also relieve you from some "low hanging fruit" work  
+**\<dEBRUYNE>** Which still can be quite time consuming  
+**\<fluffypony>** yup  
+**\<DaveyJones>** but maybe we should put up some kind of Disclaimer  
+**\<DaveyJones>** in case some service goes rogue  
+**\<sn0wmonster>** which judging by bitcoin's history, is not a matter of if, but when  
+**\<DaveyJones>** "this is just a list of merchants, and no appraisement by the core team"  
+**\<rehrar>** I'm actually going to be going g through all the Merchants this week to find the dead websites.  
+**\<moneromooo>** Warning: the monero team does not control Amazon, odd as it might seem to you.  
+**\<pigeons>** cryptokingdoms  
+**\<pigeons>** for example  
+**\<moneromooo>** CK's kinda back from the moribund actually.  
+**\<pigeons>** ok  
+**\<rehrar>** Meeting = end?  
+**\<DaveyJones>** sure  

_posts/2017-09-02-logs-for-the-Community-meeting-held-on-2017-09-02.md

@@ -0,0 +1,245 @@
+---  
+layout: post  
+title: Logs for the Community Meeting Held on 2017-09-02  
+summary: Community highlights, Forum Funding System updates and discussion of new proposals, translations, Monero Meetup kit, and miscellaneous  
+tags: [community, crypto]  
+author: dEBRUYNE / fluffypony  
+---  
+  
+*September 2nd, 2017*    
+  
+# Logs    
+  
+**\<sgp>** 0. Introduction  
+**\<sgp>** We would like to welcome everyone to this Monero Community Meeting  
+**\<sgp>** Link to agenda on GitHub: https://github.com/monero-project/meta/issues/110  
+**\<sgp>** Monero Community meetings intend to be a discussion place for anything going on in the Monero Community. We plan to use this meeting and future meetings to encourage the community to share ideas and provide support.  
+**\<sgp>** 1. Greetings  
+**\<serhack>** Hello!  
+**\<ArticMine>** hi  
+**\<pablonero[m]>** hello!  
+**\<ajs>** sup  
+**\<erciccione>** hi all!  
+**\<moneromax>** o hell!  
+**\<msvb-lab>** Hello.  
+**\<Jaquee>** hi  
+**\<sgp>** 2. Community highlights  
+**\<sgp>** I’m going to take a few minutes to show the enormous growth of the Monero community since the last community meeting. If you are new here, welcome!  
+**\<sgp>** The /r/Monero subreddit traffic nearly doubled from 817k pageviews in July to 1.553m pageviews in August. On a single day in August, over 700 people subscribed. See some charts by violentlypeaceful here: https://imgur.com/a/umPvj  
+**\<sgp>** I would like to add here as a reminder that several other Monero communities are available, including /r/xmrtrader for price discussion, /r/MoneroMining for mining, /r/MoneroMarket for buying/selling, /r/MoneroCommunity (which I hope you know about :p), and /r/kovri for Kovri (the next step in extra privacy)  
+**\<serhack>** Wow impressive  
+**\<sgp>** Now, time to talk about some contributions by Monero community members that went above and beyond! So much happened that I worry I missed some things, but here are a few that I noticed.  
+**\<sn0wmonster>** (I also have independent proof of the subs increase as i tracked this thread for 2 days and 900+ users subscribed: https://www.reddit.com/r/Monero/comments/6v4f70/celebrating_20000_subscribers_lambo_giveaway/)  
+**\<sgp>** Cool!  
+**\<sgp>** /u/lafudoci wrote a post today about how they built: https://xmr-tw.org/. Their translations to Chinese (Taiwan) have really built a strong foundation of knowledge. https://www.reddit.com/r/MoneroCommunity/comments/6xk7ao/my_experiences_in_promoting_monero_and_some/  
+**\<sgp>** A community member who later deleted their account posted this defense of privacy that quickly became one of the top posts of the Monero subreddit. It was linked in several other communities and is well worth the read: https://www.reddit.com/r/Monero/comments/6uldp2/monero_privacy_is_not_a_crime_or_something_to/  
+**\<sgp>** I added cryptocurrencies, including Monero, to the /r/privacy subreddit wiki. You can view it here and let me know your thoughts: https://np.reddit.com/r/privacy/wiki/cryptocurrency  
+**\<sgp>** MONERO NOW HAS AN ANDROID MOBILE WALLET! You will need to connect it to a remote node https://github.com/m2049r/xmrwallet/releases  
+**\<sgp>** VUALIFI launched, which allows anyone to make payment from Monero to most cryptocurrencies other than Bitcoin. This service compliments XMR.TO, https://vuali.fi/. They also have tor and I2P addresses available: https://www.reddit.com/r/Monero/comments/6wh131/announcing_vualifi_anonymous_payments_for/  
+**\<sgp>** /u/Monerooby\_Doo started a weekly Monero newsletter at http://www.monero-observer.com/. The second issue has now been published.  
+**\<sgp>** And finally, rehrar and sky redesigned the Monero subreddit, with more wiki goodness to come!  
+**\<sgp>** I am sure that I have forgotten something. If you have an example of a community member going above and beyond, please let us know now!  
+**\<sgp>** (keep in mind there will be another section for FFS updates)  
+**\<serhack>** Wow! A lot of users get involved into Monero Community :)  
+**\<sgp>** The subreddit has been flooded with new users, but the moderators and greater community have done a really great job managing the influx in volume  
+**\<pablonero[m]>** I also want to thank the u/monero moderators who had a hard job with all the new subscribers  
+**\<serhack>** Me too :)  
+**\<floam412>** that's crazy all of that above happened in two weeks... very impressive  
+**\<sgp>** Anyone else, or can we move on to the next point?  
+**\<sgp>** 3. FFS updates  
+**\<sgp>** For those new to the Monero community, the FFS stands for the Forum Funding System. It’s like a GoFundMe with Monero, where people can pitch ideas and receive payment when set tasks are completed.  
+**\<sgp>** Sarang Noether has been fully-funded https://forum.getmonero.org/7/open-tasks/87856/hire-mathematician-and-computational-physicist-to-join-research-team. He will be working on a variety of topics, including investigating ring signature proposals and blockchain bloat, efficient “future proofing” proposals, and community consensus projects.  
+**\<sgp>** Surae Noether posted his August research update. This may be technical for many users here, but it shows some research progress https://github.com/b-g-goodell/research-lab/blob/master/publications/research-roadmaps/MRL-R001%20Priorities%20for%20Monero%20Research%20Lab/MRL_2017_Q1_Update.pdf  
+**\<sgp>** Serhack posted his 8th integration update about web integrations: https://www.reddit.com/r/Monero/comments/6wr9nd/monero_integrations_update_8/  
+**\<sgp>** Any further comments serhack?  
+**\<serhack>** And soon like next week I will release prestashop plugin!!!  
+**\<sgp>** Very exciting!  
+**\<serhack>** You can go on :)  
+**\<sgp>** My FFS proposal has been delayed until further notice due to the recent price fluctuations https://forum.getmonero.org/6/ideas/88081/justin-s-local-meetup-talks-proposal-3  
+**\<sgp>** I would now like to give some time to @msvb-lab to discuss their FFS proposal  
+**\<msvb-lab>** Thanks, it relates to https://forum.getmonero.org/7/open-tasks/88149/dedicated-monero-hardware-wallet/  
+**\<msvb-lab>** ...which describes a dedicated hardware wallet to integrate unique Monero features and allow us control over roadmap and branding.  
+**\<msvb-lab>** Opensource, welcoming any contribution but mostly usage and testing.  
+**\<msvb-lab>** Since probably not everyone has a circuit lab, I'll send out the PCBs once the first gen (of about ten) are done.  
+**\<msvb-lab>** It is a FFS in mid stage, so any ideas, opinions, or suggestions are welcome.  
+**\<msvb-lab>** ...for example at the bottom of the comments page of the FFS link above.  
+**\<sn0wmonster>** (do we give comments now?)  
+**\<sgp>** What is needed from the community before you are prepared to aks for donations?  
+**\<sgp>** \*ask  
+**\<msvb-lab>** sn0wmonster: Go ahead with comments.  
+**\<sn0wmonster>** msvb-lab, i fully support the hardware wallet direction. i own every hardware wallet and they all suck to me because they don't cover Monero.  
+**\<serhack>** How will you test the security and privacy of Monero Hardware Wallet?  
+**\<sn0wmonster>** but it seems like it's pointless to even discuss it when the developers of the two main hardware wallets in the cryptocurrency space have both said "don't do it yet"  
+**\<sn0wmonster>** for the record, i'm completely *against* trying to make a physical hardware wallet  
+**\<msvb-lab>** serhack: Common side channel tools, third party decapping service.  
+**\<serhack>** Okay  
+**\<sn0wmonster>** its a whole tooling nightmare and investment that nobody should bother with when we already have tried and true platforms. the argument that "more is better for offsetting risk" doesn't apply so much when everything is open source and both major hardware wallet providers are willing to work with Monero's dev team to make it work for Monero  
+**\<sgp>** @sn0wmonster is it because you don't want one, or another concern?  
+**\<sn0wmonster>** sgp, I'm an investor over the past 2 decades in many hardware devices. it's not pretty. right now i'm working with the #neo900, and even that, with it's absolutely straightforward approach, is a nightmare.  
+**\<endogenic>** sn0wmonster: may i inquire as to your professional background?  
+**\<msvb-lab>** sn0wmonster: It's quite challengine, yes.  
+**\<sn0wmonster>** endogenic, no comment  
+**\<sn0wmonster>** i cannot imagine this community attempting to take on such a Herculean task or asking them to without first letting them know that the other wallet solutions could be programmed to work for Monero  
+**\<sn0wmonster>** just seems a bad value investment  
+**\<serhack>** We should think about privacy of an hardware wallet. What are the best procedures for protecting users ?  
+**\<sn0wmonster>** having said that, the issue is we have to wait for a new protocol for Trezor 2.0, and the Ledger i guess "just takes time"?  
+**\<rehrar>** Sorry I'm late.  
+**\<floam412>** what ever happened to ledger though? are they still in the process of integrating monero?  
+**\<dEBRUYNE>** sn0wmonster: I think ledger stated that their specification would be feasible  
+**\<sn0wmonster>** so whether or not msvb-lab is the dude who's gonna make it happen, the issue to me is "this is the wrong time to try"  
+**\<dEBRUYNE>** floam412: yes (afaik)  
+**\<vP11>** I think people are free to pursue whatever ideas they have. If someone wants to develop a hardware wallet, they can just go and do it. They can ask for funds and if the community wants to fund it, then good. what needs to be super clear is the amount of time and money that will be invested.  
+**\<floam412>** gotcha  
+**\<sn0wmonster>** if ledger is already on the road to implementing it, and the Monero team can lend a hand when necessary, then the proposal should be entirely for the Trezor, and it should wait until after 2.0 is released imo  
+**\<vP11>** and also to make it clear that other companies are already pursuing the same objective.  
+**\<dEBRUYNE>** sn0wmonster: https://www.reddit.com/r/Monero/comments/6thv8j/ledger_hardware_wallet_monero_integration/  
+**\<vP11>** the worst case scenario is a funding proposal that will not raise the needed amount.  
+**\<sn0wmonster>** vP11, of course, free market and all, just saying as a community to remain empowered requires focus  
+**\<sn0wmonster>** vP11, that's not the worst case actually. i've lived through the worst case.  
+**\<sn0wmonster>** paying for it and having it fail because of X millions of reasons.  
+**\<msvb-lab>** The argument against creating a dedicated wallet is that hoping others will implement into their existing designs will work well enough.  
+**\<msvb-lab>** And not cost another year of no possible XMR in a hw wallet problem, too.  
+**\<pablonero[m]>** I would prefer when Monero has it "own" hardware wallet and not depend on a company  
+**\<sgp>** @msvb-lab have you tried working with Ledger or Trezor? Maybe an alternative approach could be to use your talent to make an integration with them easier  
+**\<floam412>** Wouldn't it be a better idea to have someone continue NoodleDoodle's work on the Tezero software?  
+**\<sn0wmonster>** the market makers already succeeded, unless there is a logical security concern for the existing wallets, it literally is reinventing the wheel for the sake of "Monero" branding.  
+**\<sn0wmonster>** this is all my opinion of course  
+**\<sgp>** Though I see both sides of this argument  
+**\<msvb-lab>** sgp: Yes, that is a separate proposal in fact. It would not result in a dedicated wallet.  
+**\<ArticMine>** An I have mixed feelings about this  
+**\<msvb-lab>** It's proposal 88160:  
+**\<msvb-lab>** https://forum.getmonero.org/7/open-tasks/88160/monero-firmware-for-ledger-wallet/  
+**\<sn0wmonster>** there's also the added benefit that when a consumer orders a wallet from a third party service, it doesn't necessarily connect them to MONERO currency  
+**\<endogenic>** All your opinion  
+**\<endogenic>** ?  
+**\<serhack>** We shouldn't depend from thirdy company  
+**\<ArticMine>** How will this impact pending wallet implementations of Monero?  
+**\<sn0wmonster>** endogenic, was that for me?  
+**\<endogenic>** msvb-lab has lots of experience in hardware engineering  
+**\<endogenic>** Yes  
+**\<serhack>** Maybe you should take this advice; why don't you create a prototype?  
+**\<sn0wmonster>** oh, yes of course, it's my opinion from hardware devices and working in the business, but i am not an engineer.  
+**\<sgp>** @msb-lab I appreciate your thoughts for both of your proposals  
+**\<endogenic>** I would generally ask the one who has seen the actual process with his own eyes to advise me of how herculean the task it  
+**\<sn0wmonster>** i fully support (even financially) the software necessary to get it working on Trezor and Ledger  
+**\<msvb-lab>** ArticMine: It's likely that if any other wallet maker implements XMR, that they would do so regardless of a dedicated wallet project.  
+**\<vP11>** I'm not even sure what we're discussing here. Why is this related to the community? It doesn't matter if the proposal for the funding is made, the community won't necessarily "market" the project anyway.  
+**\<serhack>** Ask for some xmrs in order to make a prototype, and then if everyone likes it, we should find it  
+**\<dEBRUYNE>** I am not sure how beneficial 88160 would be if Ledger is already working on an implementation themselves  
+**\<sgp>** I'm going to start moving on to the next point. Thanks everyone for your opinions  
+**\<vP11>** good idea sgp :)  
+**\<ArticMine>** 100% FLOSS firmware / software is a powerful selling point here. That is the other side I see  
+**\<msvb-lab>** vP11: I'm bringing up the topic here in hopes of getting opinions and suggestions on paper.  
+**\<sgp>** Keep in mind that the FFS supporting one project does not mean it will completely represent the whole community. That's the beauty of an open-source decentralized project  
+**\<sgp>** 4. Translations  
+**\<msvb-lab>** ...in the comments section so that the proposal can be changed to meet the needs of the community.  
+**\<sgp>** The website, wallets, and community resources always need help! While I applaud the current efforts to localize important Monero documents into other languages, we need more community participation.  
+**\<sgp>** A great example occurred a little over a week ago, when community members worked together to add Korean translations to the next release https://github.com/monero-project/monero-core/pull/836  
+**\<sgp>** If you would like to get involved in the translation efforts but do not know where to start, please ask after the meeting. Plenty of people can point you in the right direction.  
+**\<endogenic>** vP11: i was also wondering why technical matters were being evaluated here  
+**\<msvb-lab>** dEBRUYNE: I'm not focusing so much on 88160 for that reason. Although I'm possibly the most pessimistic person that it actually happens.  
+**\<sgp>** @erciccione would tyou like to talk for a little while here?  
+**\<erciccione>** can i say a word  
+**\<erciccione>** @sgp thanks :)  
+**\<erciccione>** all the translations are going quite fine, i've been away all august i did the korean one because i thought was very important at that time  
+**\<erciccione>** right now we have 3 main things to translate  
+**\<erciccione>** the GUI, kovri website, and all the promo videos  
+**\<erciccione>** the main issue is the difficulty in communications, many people want's to help but they get lost when they meet the first difficulties  
+**\<erciccione>** i was thinking about creating a channel: monero-translations  
+**\<erciccione>** where there will be always support for newcomers or who wants to starts  
+**\<erciccione>** i never did a traslation in my life before starting with monero, and i'm pretty sure what scares people is the missing of proper guidelines  
+**\<erciccione>** so finally:  
+**\<needmultisig90>** We could hire translators on fiverrr  
+**\<erciccione>** i'd like to create a document that will help anybody to start and follow the updates about translations, and all this can be organized in monero-transaltions  
+**\<pablonero[m]>** i like the idea  
+**\<sn0wmonster>** needmultisig90: there's actually two proven ways that FOSS projects on Freenode do translations in a professional manner, one of them is by building the community out (like deevad did for #pepper&carrot, another is using the professional translating services where you send in the copy and it comes back to in X number of languages you requested and can be done in bulk)  
+**\<vP11>** I'd like to give a word too if possible (when erciccione finishes)  
+**\<erciccione>** @needmultisig90 i honestly don't think it's necessary. when i made the first reddit post "translation how you can help" i've been flooded by messages, and a lot of traslation were made in those weeks. the problem is that i had not the time to follow these people,  the irc channel will solve this  
+**\<sgp>** @erciccione this sounds like a fantastic idea. I highly encourage you to do this  
+**\<erciccione>** i'm done, sorry if i wasn't unclear  
+**\<rehrar>** ericcione, shoot me a message after the meeting please. I'd like to help you get some stuff together for this. :)  
+**\<erciccione>** @sgp thanks. i definetly will!  
+**\<vP11>** I have some previous experience in localization for open source projects, mainly the Mozilla project  
+**\<pablonero[m]>** I find it difficult to contribute to the translations as a noob on github. Would it be possible move the transaltions to an other platform? For example Zanata?  
+**\<erciccione>** @rehar will do ;)  
+**\<sgp>** Translations are vitally important, and I'm glad we are having this conversation  
+**\<erciccione>** pablonero: i agree github can be a pain  
+**\<vP11>** first things first, let's focus on the word "localization" instead of translation. the first is a process of adapting the content to a regional/local consumption and goes beyond translating text.  
+**\<erciccione>** there was a proposal about using transifex  
+**\<vP11>** I guess for your purpose it's what you're aiming for, erciccione  
+**\<erciccione>** but i don't know it so i can't comment  
+**\<vP11>** we don't need to reinvent the wheel, there are many open source projects with multiple proven structures that we could follow, and again I'll mention Mozilla because that's the one I have more experience with  
+**\<vP11>** wiki for the Mozilla localization project: https://wiki.mozilla.org/L10n:Contribute (this is to give you ideas)  
+**\<sgp>** @vp11 thanks for the link  
+**\<vP11>** an IRC channel is a very good idea, I like it. we can have a wiki/document with guidelines, softwares that people need to use to translate and other useful resources  
+**\<sgp>** Anything else, or can we move on to open ideas time?  
+**\<vP11>** I'd like to be involved on this to get a good localization platform setup so we can have a bigger reach :) will pm you later erciccione and rehrar  
+**\<erciccione>** that would be really great, thanks vP11!  
+**\<erciccione>** the platform is somethingreally needed right now  
+**\<erciccione>** i think we can move on @sgp  
+**\<sgp>** 5. Open ideas time  
+**\<sgp>** It’s open ideas time! Feel free to propose your ideas to this discussion group, and feel free to comment on others’ ideas. If you disagree with the idea, please reply with constructive criticism. Thank you!  
+**\<sgp>** Let's also try to focus on one idea at a time  
+**\<sgp>** Who has an idea how to help build the Monero community?  
+**\<pablonero[m]>** Make an FFS to get a lot of stickers and posters and send it to interested groups for free  
+**\<pablonero[m]>** what do you think?  
+**\<sgp>** I imagine most student groups would take free stuff  
+**\<sgp>** Sounds like a great way to get local groups interested. Give them something for free and hope they talk about it  
+**\<floam412>** if you are going to do something like that, I would suggest including a QR code that links to getmonero.org for people to find/research more info  
+**\<pablonero[m]>** floam412: good idea  
+**\<pablonero[m]>** what kind of printed stuff should we send?  
+**\<vP11>** http://www.phneep.com/projects/bitcoin-propaganda/  
+**\<vP11>** make Monero propaganda  
+**\<sgp>** I think just the Monero logo, the name, perhaps a small tagline like "safe money for everyone", and the website is sufficient  
+**\<sgp>** @vp11 yes please! haha  
+**\<vP11>** it must be the 18th time I paste this link :P I really think we could get these classic propaganda posters in Monero  
+**\<vP11>** they're very appealing and people pay attention to these  
+**\<pablonero[m]>** vP11: nice idea. what about copyrights?  
+**\<vP11>** you can easily find the "original/raw" images online. these have no copyrights.  
+**\<sgp>** @vp11 can you make a Reddit post on /r/MoneroCommunity so we actually get this started?  
+**\<vP11>** EXAMPLE: https://i.redd.it/z2feghbr6cbz.jpg  
+**\<serhack>** Create a "Monero Meetup Kit"?  
+**\<vP11>** sure thing sgp  
+**\<pablonero[m]>** serhack: that's the spriti  
+**\<sgp>** @serhack that would be awesome  
+**\<pablonero[m]>** spirit\*  
+**\<pablonero[m]>** anybody wants to make a small brochure?  
+**\<serhack>** Monero Meetup kit will contain some stickers, poster and a brochure  
+**\<serhack>** Some instrouctions, slides :)  
+**\<rehrar>** That's actually a fantastic idea, Serhack  
+**\<sgp>** @serhack or @pablonero[m] can you make a Reddit post on /r/MoneroCommunity about the meetup kit?  
+**\<pablonero[m]>** yes. I could also care about printing/sending  
+**\<vP11>** # Revitalize the /r/MoneroCommunity with a brand new theme  
+**\<serhack>** Okay, if @pablonero want to post, it's Okay else I will post  
+**\<vP11>** I see very small movement on the subreddit and I don't know if it's because people are not interested or if they don't get it what the subreddit is about.  
+**\<serhack>** But I have some ideas for ir  
+**\<serhack>** Maybe I should post  
+**\<pablonero[m]>** serhack: yep  
+**\<sgp>** @vp11 I think it's because there's little content there now  
+**\<rehrar>** vP11, the CSS will be up soon  
+**\<serhack>** Great!  
+**\<vP11>** that's cool, thanks :)  
+**\<sgp>** Any other ideas in these last few minutes?  
+**\<vP11>** one suggestion  
+**\<vP11>** since we know the nature of reddit where the threads go down once they get old, we could probably get a pinned thread on /r/MoneroCommunity with on-going initiatives (localization, images, meet up kit, etc) with the respective thread links so people can join later  
+**\<sgp>** Sure, will do  
+**\<sgp>** I will replace the "why community building is important" announcement  
+**\<sgp>** 6. Confirm next meeting date/time  
+**\<sgp>** The next meeting will two weeks from today on 16 September at 17:00 UTC. It will be the Saturday before the dev meetings. If someone has feedback on the new meeting date and time, please let us know.  
+**\<sgp>** (So, we are keeping with the Saturday meetings now)  
+**\<sgp>** 7. Conclusion  
+**\<sgp>** That’s all! Thanks for attending this Monero Community meeting, and we hope to see you on /r/MoneroCommunity and monero-community. Take care, and know that change starts with YOU.  
+**\<ArticMine>** The change to Saturday was great fro me  
+**\<erciccione>** ArticMine: for me aswell  
+**\<vP11>** same  
+**\<rehrar>** some people still want it after Dev/Kovri meetings Sunday  
+**\<rehrar>** We can make a reddit thread about it to gather more intel, even for people who weren't able to make meetings  
+**\<vP11>** I agree on that, rehrar.  
+**\<erciccione>** (\#monero-translations is a thing. only on irc for now, tomorrow i'll do the relays)  
+**\<sn0wmonster>** just a thought, (sorry im late) "safe money for everyone" sounds like a legal liability. how about "private money" or something a little less construable as a guarantee?  
+**\<sgp>** I need to take off. Thanks everyone!  
+**\<pablonero[m]>** thanks!  
+**\<erciccione>** ciao grazie!  
+**\<dEBRUYNE>** erciccione: Could you help this guy out w/ rebasing or rebase his PR? https://github.com/monero-project/monero-core/pull/794  
+**\<erciccione>** dEBRUYNE sure!  
+**\<dEBRUYNE>** Thanks!  

_posts/2017-09-03-overview-and-logs-for-the-dev-meeting-held-on-2017-09-03.md

@@ -0,0 +1,212 @@
+---
+layout: post
+title: Overview and Logs for the Dev Meeting Held on 2017-09-03
+summary: Discussion of open PRs and issues, MyMonero, RuffCT, serhack's integrations, upcoming release + scheduled protocol upgrade, dedicated hardware wallet, Monero Revuo, and miscellaneous
+tags: [dev diaries, core, crypto]
+author: dEBRUYNE / fluffypony
+---
+
+*August 20th, 2017*  
+
+# Overview  
+
+An overview can be found on [MoneroBase](https://monerobase.com/wiki/DevMeeting_2017-09-03).   
+
+# Logs  
+
+**\<moneromooo>** fluffypony can't make the meeting, so I'll be prodding people.  
+**\<moneromooo>** First thing is the release is soon, if you want to test the release branch, please feel free.  
+**\<moneromooo>** https://github.com/monero-project/monero/tree/release-v0.11.0.0  
+**\<moneromooo>** There are a couple patches still unmerged, but they shouldn't impact any testing.  
+**\<moneromooo>** Pony will likely start building later today, or maybe tomorrow.  
+**\<moneromooo>** Other than that, I guess we'll go through people to see what they're up to.  
+**\<moneromooo>** Who wants to start ?  hyc ?  
+**\<hyc>** hm, I've mostly been doing little patches for the release  
+**\<hyc>** whenever I tripped over something  
+**\<moneromooo>** And safe sync mode :)  
+**\<hyc>** new stuff worth mentioning - safesyncmode, salvage  
+**\<hyc>** yeah - so now monerod will automatically switch to SAFE sync mode whenever it catches up to the network  
+**\<hyc>** and will switch back to FAST if it falls behind  
+**\<hyc>** so hopefully we won't need to use the salvage flag ...  
+**\<hyc>** I think that's my highlights. next?  
+**\<moneromooo>** So... knaccc ?  
+**\<hyc>** (oh yeah, also cleaned up readline deadlocks etc)  
+**\<moneromooo>** So knaccc may not be around, but knaccc's been doing prototyping of the Ruffing et al sig scheme. Maybe later.  
+**\<moneromooo>** surae: around ?  
+**\<serhack>** Hey!  
+**\<serhack>** is there meeting?  
+**\<TinusMars>** no idea  
+**\<moneromooo>** surae also seems away, so serhack: anything you want to say about what you've done recently ?  
+**\<dEBRUYNE>** serhack, TinusMars: yes  
+**\<vtnerd>** @serhack yes, on going  
+**\<serhack>** okay  
+**\<serhack>** moneromoo: I'm going to release prestashop plugin!!  
+**\<serhack>** Second milestone is completed  
+**\<hyc>** congrats  
+**\<serhack>** but I have to do some maintanance ;) prestashop plugin is beta  
+**\<moneromooo>** This and woocommerce are among the most used plugins for that kind of thing, is that right ?  
+**\<serhack>** yep  
+**\<serhack>** in the future, whmcs, magento, shopify  
+**\<serhack>** so let's wait for another ffs  
+**\<moneromooo>** Great, and congrats for your first maintenance contract too :)  
+**\<serhack>** moneromoo: you can go on  
+**\<serhack>** thanks!  
+**\<hyc>** (oh one more note, we've cleaned up blockchain\_db code structure a bit. no more backend-specific includes in the rest of the source tree, only blockchain\_db is exposed now)  
+**\<moneromooo>** vtnerd: you've been cleaning up some stuff about network addresses, etc recently, want to say anything about this or other things ?  
+**\<moneromooo>** Or mymonero related things.  
+**\<vtnerd>** um, not sure what to report because I don't think I have any hidden patches pending core  
+**\<vtnerd>** the focus of mymonero is improving the perf of that poor guy, the DB is getting killed on the current design  
+**\<vtnerd>** so hopefully finally less complaints about "where is mymonero XMR?"  
+**\<hyc>** is that still using mySQL?  
+**\<vtnerd>** yeah for the time being  
+**\<serhack>** Vtnerd: Can I ask you any question about mymonero?  
+**\<endogenic>** That's one, serhack!  
+**\<vtnerd>** fluffypony discussed using LMDB for the open sourced version so that a dependency was not added  
+**\<serhack>** Why don't you use another db for example sqlite?  
+**\<serhack>** Endogenic: oh! :)  
+**\<moneromooo>** If it's going to be that kind of question, maybe leave it out for later, or #mymonero :)  
+**\<vtnerd>** at this point Im dealing with a legacy made before I joined the project. so I do not know the actual rationale  
+**\<hyc>** If you *must* use SQL you can use sqlightning on LMDB https://github.com/LMDB/sqlightning  
+**\<vtnerd>** I'd probably move it to LMDB first however  
+**\<serhack>** Oh okay sorry moneromoo  
+**\<hyc>** but I see no value add from using SQL itself  
+**\<vtnerd>** yes I have a partially written experimental hybrid mode  
+**\<vtnerd>** because currently the transactions on the network are pulled from mySQL too, so theres overhead in that  
+**\<endogenic>** No value from sql?  
+**\* endogenic** defers flamewar  
+**\<moneromooo>** endogenic: anything you want to add, apart from SQL discussion ? :)  
+**\<endogenic>** :'(  
+**\<hyc>** yeah give us the scoop endo  
+**\<endogenic>** You get an ios app, and you get an ios app...!  
+**\<serhack>** Wow! Endogenic :)  
+**\<endogenic>** Switched back to js (desktop and android) to bring new features over  
+**\<vtnerd>** the value of mysql is doing arbitrary queries easily, with the cost of building them  
+**\<hyc>** so both android and ios are ready to go now?  
+**\<endogenic>** Dun and bradstreet is having a little difficulty verifying mymonero for apple for some reason so we're waiting on that  
+**\<endogenic>** Vtnerd and transactions? Or can that be done in application layer?  
+**\<vtnerd>** anyway serhack, ask in mymonero as opposed to this meeting  
+**\<serhack>** Oh okay  
+**\<vtnerd>** I was going to pull the transactions directly from the monerod file  
+**\<endogenic>** Oh you must mean for mm specifically  
+**\<vtnerd>** so read it in real-time, like LMDB was designed to do  
+**\<endogenic>** Sorry i mean db txs  
+**\<endogenic>** Er  
+**\<vtnerd>** currently mymonero mirrors the entire tx history in a MySQL DB  
+**\<hyc>** I thought we weren't going to have the DB discussion right this moment but ... there's no value-add for that ;)  
+**\<vtnerd>** anyway, for monero specifically it looks like I will do anonimal suggestion of making the supercop code a separate project lib, I think moneromooo thought that was a good idea too  
+**\<hyc>** makes sense  
+**\<moneromooo>** Hmm, I didn't follow any discussion on that PR, I was going to go there after the release is done.  
+**\<ArticMine>** Are we having s meeting?  
+**\<moneromooo>** We are.  
+**\<ArticMine>** ok  
+**\<moneromooo>** OK, seems we're done here, vtnerd and endogenic, unless you have anything else ?  
+**\<vtnerd>** nope  
+**\<vtnerd>** direct all complaints to #mymonero haha  
+**\<msvb-lab>** Just curious, it was reported in the community meeting like a doubling of members or traffic. Has that translated to development/developer too?  
+**\<hyc>** I've noticed a few new people in this channel asking how to help devel  
+**\<moneromooo>** Jaquee: around ? Want to say something about the GUI and/or the light wallet changes ?  
+**\<serhack>** Yep, @lessless has done a good work with api lessless.github.io  
+**\<hyc>** is the GUI frozen for release now? are those binaries in that reddit thread basically final?  
+**\<lessless>** thanks serhack, being my pleasure. what is the topic btw? :)  
+**\<moneromooo>** I think it was a week delayed (IIRC Jaquee was going to be busy).  
+**\<serhack>** Your website helped a lot some devs :)  
+**\<moneromooo>** Alright, so Jaquee AFK too. msvb-lab, you wanted to say something about your hardware project ?  
+**\<Jaquee>** nothing new from me since last meeting  
+**\<moneromooo>** OK, thanks :)  
+**\<msvb-lab>** moneromooo: Yes, I want mention to any newcomers the current debate surrounding hw wallets and the FFS proposal.  
+**\<msvb-lab>** https://forum.getmonero.org/7/open-tasks/88160/monero-firmware-for-ledger-wallet/  
+**\<msvb-lab>** ...is for a firmware port but:  
+**\<msvb-lab>** https://forum.getmonero.org/7/open-tasks/88149/dedicated-monero-hardware-wallet/  
+**\<msvb-lab>** is the main effort towards a dedicated Monero hardware wallet.  
+**\<msvb-lab>** This is just a brief mention, because we've had discussion already last week on dev, this week on community.  
+**\<dEBRUYNE>** \<hyc> is the GUI frozen for release now? are those binaries in that reddit thread basically final? \<= Jaquee said he wanted to focus on fixing bugs that were reported by people using those bins  
+**\<dEBRUYNE>** So basically that + bug fixes  
+**\<msvb-lab>** Anyone with opinions/suggestions please write a comment in the forum (FFS thread.)  
+**\<moneromooo>** Alright. Who wants to say something next ?  
+**\<msvb-lab>** moneromooo: Thanks, that's all for props 88149 and 88160.  
+**\<rehrar>** I can. I have something that needs dev input.  
+**\<moneromooo>** Please go ahead.  
+**\<Jaquee>** dEBRUYNE hyc: code freeze was done aug 23rd afaik. (one week after monero code freeze)  
+**\<rehrar>** https://drive.google.com/file/d/0B0vhnWCa9J5QYW1yc2lRNWE2NzA/view?usp=sharing  
+**\<rehrar>** This is the recent Monero Revuo that will be published soon.  
+**\<rehrar>** Just want to get any last opinions on the development section. Anything else major been done that I've missed?  
+**\<serhack>** Great work @rehrar  
+**\<serhack>** Android wallet @rehrar ?  
+**\<rehrar>** Also, can someone tell me if I understood the purpose of 0MQ correctly?  
+**\<rehrar>** Android wallet is September. Doesn't quite make the cut. But maybe it can be in there. Who cares, right?  
+**\<serhack>** Mm. Right  
+**\<lessless>** serhack I would really love that work to be carried on - there are much more calls to cover. Can it become a part of official documentation? I think that way there more chance for contributions  
+**\<rehrar>** Oh, I should probably add a "What to expect in the hard fork" section.  
+**\<serhack>** I think yes. But I don't know where we can post your website lessless  
+**\<dEBRUYNE>** lessless: You can simply make a PR to the site repository on github  
+**\<moneromooo>** So, mooo next. I fixed a few things, but mostly more work on multisig based on luigi's new directions for N-1/N. Getting a bit lost in the sea of stuff to juggle, but it's progressing.  
+**\<moneromooo>** Who else wants to talk a bit about dev happenings ?  
+**\<lessless>** dEBRUYNE hmm, yeah! I can do that :)  
+**\<gingeropolous>** we still set for 9/21  for the fork? And its definitely 0.11.0.0 ?  
+**\<moneromooo>** 9/21 ?  
+**\<moneromooo>** Oh. I get it.  
+**\<gingeropolous>** september 21st .. ?  
+**\<moneromooo>** It's supposed to be around the 16th IIRC.  
+**\<gingeropolous>** aight, well the readme is wrong then  
+**\<gingeropolous>** so the version is 0.11.0.0 ?  
+**\<moneromooo>** I don't think I edited that. I did not realize it was already set in te readme :)  
+**\<moneromooo>** Yes.  
+**\<hyc>** daemon says 12.4 days away  
+**\<gingeropolous>** yeah, down in the magic table i try to maintain  
+**\<hyc>** so yeah around the 16th  
+**\* moneromooo** afk for a bit. If anyone else wants to say something about dev happenings, please feel free :)  
+**\<msvb-lab>** Sarang got hired as mathematician, congratulations.  
+**\<msvb-lab>** Any word from him (I'm curious) on plans this week or current dev work?  
+**\<knaccc>** My update on RuffCT - sarang and surae are working on resolving some notation issues between the Ruffing paper and the Bootle paper, and once they resolve a few things that aren't 100% clear from the papers, we'll be able to complete the prototype very quickly and will be able to share performance benchmarks so that we can all decide what kind of ring size we can use RuffCT to achieve.  
+**\<msvb-lab>** ...but he isn't here it seems.  
+**\<Jaquee>** rehrar: you might want to add a text about openmonero/mymonero backend support. PR #2109  
+**\<rehrar>** Thanks Jaquee, will look into it.  
+**\<hyc>** hmm. might also mention rangeproof work? we had some more discussion on how to approach that this past week  
+**\<ArticMine>** knaccc Any idea on the impact of RuffCT on tx size?  
+**\<hyc>** knaccc you had a paste of expected sizes, can you repost the link?  
+**\<knaccc>** ArticMine not yet, it looks extremely promising from a tx size perspective, but there is a problem with the implementation so preliminary figures are probably completely wrong  
+**\<knaccc>** in a week hopefully we'll have proper figures  
+**\<ArticMine>** great  
+**\<erciccione>** @rehar if you can, would be nice to mention the increased  number of languages that monero "speaks" in the community section, we got really a lot of stuff in these last months  
+**\<rehrar>** Will do eric, thanks.  
+**\<hyc>** hm, maybe we should keep the Sep 21 date. gives almost an extra week for people to upgrade  
+**\<hyc>** (hardfork date)  
+**\<gingeropolous>** and if they were going by the repo... its what they were expecting :/  
+**\<gingeropolous>** but no one reads the docs, so theres that  
+**\<hyc>** true  
+**\<hyc>** looks like we're out of topics then  
+**\<hyc>** anyone else?  
+**\<msvb-lab>** Is Sarang here?  
+**\<erciccione>** @rehrar if for eric you meant me, thank you :)  
+**\<msvb-lab>** Let's hear from him, I'm dying to find out what's he's working on.  
+**\<hyc>** seems no Sarang  
+**\<knaccc>** Sarang has been looking at the Ruffing and Bootle papers  
+**\<knaccc>** that's his immediate work, I think  
+**\<msvb-lab>** knaccc: Okay, cool enough. Thanks.  
+**\<rehrar>** Oops. Yeah. Just realized that you're erciccione, but that's ok cuz you misspelled my name just a bit ago too  
+**\<erciccione>** ooops just noticed . sorry :)  
+**\<rehrar>** moneromooo save us!  
+**\<iDunk>** Yeah, it's a bit... romanesco :)  
+**\<serhack>** :)  
+**\<gingeropolous>** thought mooo was afk  
+**\<rehrar>** Yeah, so instead of floundering about, perhaps we can confirm next meeting time and end?  
+**\<hyc>** well, if no one has any additional meeting items, I think we just confirm next  
+**\<rehrar>** \^ this guy  
+**\<hyc>** Sep 17 would be right after the hardfork  
+**\<hyc>** unless we decide to change the block height to match sep 21.  
+**\<rehrar>** I think that's a pretty important decision to make fairly urgently, no?  
+**\<iDunk>** 1403616? To keep with \*16 recent tradition.  
+**\<hyc>** certainly in the next few hours if we're going to freeze and tag today  
+**\<gingeropolous>** well, i think i put the 9/21 there because in 2016 it was 9/21  
+**\<gingeropolous>** but i dunno if its better to fork on a weekend or a weekday  
+**\<gingeropolous>** what was 9/21/2016?  
+**\<hyc>** wednesday  
+**\<hyc>** So, saturday or following thursday this time  
+**\<rehrar>** If the docs have said 21 for some time, perhaps it's best to keep it?  
+**\<iDunk>** 1400000 was on target for 21 when it was set, I think.  
+**\<iDunk>** But then nethash shot up and the diff struggled to keep the block target time to 120 seconds.  
+**\<hyc>** so it sounds like Sep 21 was always the intended date  
+**\<hyc>** and we should fix the height  
+**\<hyc>** ok let's confirm Sep 17 next meeting, 17:00 UTC, and call it a day. Thanks everyone  
+**\<rehrar>** Cya. :)  
+**\<rehrar>** No Kovri meeting today!  

_posts/2017-09-07-monero-0.11.0.0-released.md

@@ -0,0 +1,116 @@
+---
+layout: post
+title: Monero 0.11.0.0 "Helium Hydra" Released
+summary: A mandatory update that is ready for the September 15th hard fork
+tags: [releases]
+author: Riccardo Spagni (fluffypony)
+---
+
+*September 7th, 2017*
+
+### Overview
+
+This is the v0.11.0.0 major release of the Monero software, and it is a mandatory update due to the September 15th hard fork, which in turn increases the minimum ring signature size to 5 across the network, bans duplicate ring members in a ring signature, and enforces use of ringCT for all transaction outputs. This release of the software presents a number of major improvements to Monero, as well as a large set of bug fixes.
+
+Some highlights of this release are:
+
+- major synchronisation speed-up from reducing bandwidth used
+- massively improved the blockchain import function
+- changed terminology from "mixin" to "ring size"
+- add a --fluffy-blocks option to relay blocks as fluffy blocks if possible
+- allow for password verification without loading the subsequently unencrypted wallet into RAM
+- reduced privacy leak risks when using untrusted remote nodes
+- added an Esperanto wordlist for mnemonic seed choices
+- decreased memory demands for the getblocks RPC call
+- added a "fee" command to display fee information
+- transfer CLI command warns if there's a tx backlog for selected fee
+- add average seconds per block in bc\_dyn\_stats
+- added an on\_get\_alt\_blocks\_hashes RPC call 
+- added an Italian translation for the CLI
+- return the per-tx amount in the transfer\_split RPC call
+- switched to readline for the CLI
+- automatically switch to SAFE db-sync-mode once daemon catches up to network
+- added a histogram to poolstats
+- major speed-up for poolstats and coinbase\_tx\_sum
+- enable support for macOS smart mining
+- added the ability to build a Snap package
+- added a Vulnerability Response Process, with bug bounties available via [a dedicated HackerOne portal](https://hackerone.com/monero)
+- added support for payment proving via key derivation instead of tx key reveal
+- changed output selection for ring signatures to heavily weight newer outputs
+- added a sweep\_below function to sweep small amounts
+- moved the mempool to a database on disk instead of keeping it all in memory
+- fully enable iOS and Android full node support
+- enabled support for ppc64le architectures
+- added the ability to create and open wallets via RPC
+- added ability to relay transactions manually after creating them
+- better AC / battery power detection for Linux smart mining
+- getblocktemplate now indicates the expected total reward
+- as always, loads of bug fixes and performance improvements
+
+### Contributors for this Release
+
+This release was the direct result of 39 people who worked, largely unpaid and altruistically, to put out 557 commits containing 60 254 new lines of code. We'd like to thank them very much for their time and effort. In no particular order they are:
+
+- moneromooo
+- kenshi84
+- Roberto Oliveira
+- Lee Clagett
+- Eugene Otto
+- MoroccanMalinois
+- Michael Shick
+- JollyMort
+- Erik de Castro Lopo
+- anonimal
+- erciccione
+- Guillaume Le Vaillant
+- rbrunner7
+- binaryFate
+- Riccardo "fluffypony" Spagni
+- Jaquee
+- Julien Klepatch
+- moneroexamples
+- Nano Akron
+- Antti Keränen
+- Jethro Grassie
+- xmr-eric
+- schnerchi
+- MaxXor
+- Andrei Muresan
+- Jkat
+- stoffu
+- Mike C
+- Gingeropolous
+- Jonathan Cross
+- m2049r
+- Miguel Herranz
+- Randi Joseph
+- assylias
+- Martin Wimpress
+- Ryan Mehta
+- Gentian
+- Robby Weinberg
+- Howard Chu
+
+### Official Download Links
+- [Windows, 64-bit](https://downloads.getmonero.org/cli/monero-win-x64-v0.11.0.0.zip)
+- [Windows, 32-bit](https://downloads.getmonero.org/cli/monero-win-x86-v0.11.0.0.zip)
+- [macOS, 64-bit](https://downloads.getmonero.org/cli/monero-mac-x64-v0.11.0.0.tar.bz2)
+- [Linux, 64-bit](https://downloads.getmonero.org/cli/monero-linux-x64-v0.11.0.0.tar.bz2)
+- [Linux, 32-bit](https://downloads.getmonero.org/cli/monero-linux-x86-v0.11.0.0.tar.bz2)
+- [Linux, armv7](https://downloads.getmonero.org/cli/monero-linux-armv7-v0.11.0.0.tar.bz2)
+- [Linux, armv8](https://downloads.getmonero.org/cli/monero-linux-armv8-v0.11.0.0.tar.bz2)
+- [FreeBSD, 64-bit](https://downloads.getmonero.org/cli/monero-freebsd-x64-v0.11.0.0.tar.bz2)
+
+### Download Hashes
+
+If you would like to verify that you have downloaded the correct file, please use the following SHA256 hashes:
+
+monero-win-x64-v0.11.0.0.zip, 62c3d35c6d1ac7c73d5a0266e63af4faab8680776e3e149f5ae562d200c22189
+monero-win-x86-v0.11.0.0.zip, 0087b1092090ab270ad9a40ac579c017b9fd85043eca325e433ae598ec65349b
+monero-mac-x64-v0.11.0.0.tar.bz2, 8340ace926b23171a369bdbeba5d4e1abba7db33b603ecacc3aa1df4451b957b
+monero-linux-x64-v0.11.0.0.tar.bz2, 42a9df43175a7fe0efcd1aed58e92722f693b44529730e328c73887fb80e7bab
+monero-linux-x86-v0.11.0.0.tar.bz2, 452ce74dcb8c6af3be0ac0b1f3f90c31020cdf408ccf443507e96860a7aa8171
+monero-linux-armv7-v0.11.0.0.tar.bz2, f88e53250b558705ee866cd439a3366666d977e5377ba197aff66f53bd421793
+monero-freebsd-x64-v0.11.0.0.tar.bz2, c6373cd82a88ec8c56cedab2e0f65715ea908c9f3517d127db4bc0ecc7532428
+
+A GPG-signed list of the hashes is at https://getmonero.org/downloads/hashes.txt and should be treated as canonical, with the signature checked against the appropriate GPG key in the source code (in /utils/gpg_keys)

_strings_en.yml

@@ -37,6 +37,7 @@ menu:
   people: The People Behind Monero
   userguides: User Guides
   developerguides: Developer Guides
+  vrp: Vulnerability Response Process
   goals: Design & Development Goals
   openalias: The OpenAlias Project
   lab: Monero Research Lab
@@ -89,6 +90,7 @@ blog:
   title_3: Posts
   tagged: Tagged under
   author: Posted by
+  date: Posted at
   forum: Click here to join the discussion for this entry on the Monero Forum
 tags:
   all: Articles by Tag

community/hangouts/index.md

@@ -7,7 +7,6 @@ The Monero community is diverse and varied. We come from all over, but we defini
 </div>
 
 <div class="hangouts">
-
     <section class="container">   
         <ul class="row center-xs">
             <li>
@@ -56,38 +55,12 @@ The Monero community is diverse and varied. We come from all over, but we defini
                                 <p>The Monero community utilizes a lot of IRC channels that each serve different purposes. Some to work, and some just to hang out. You'll find the more popular ones below.</p>
                             </div>
                             <div class="row irc">
-                                <div class="col-md-4">
+                                {% for channel in site.data.irc %}
-                                    <a href="irc://chat.freenode.net/#monero">#monero</a>
+                                    <div class="col-md-4">
-                                    <p>This channel is used to discuss all things Monero related.</p>
+                                        <a href="irc://chat.freenode.net/#{{ channel.channel }}">#{{ channel.channel }}</a>
-                                </div>
+                                        <p>{{ channel.description }}</p>
-                                <div class="col-md-4">
+                                    </div>
-                                    <a href="irc://chat.freenode.net/#monero-community">#monero-community</a>
+                                {% endfor %}
-                                    <p>This channel is for the Monero community to congretate and discuss ideas.</p>
-                                </div>
-                                <div class="col-md-4">
-                                    <a href="irc://chat.freenode.net/#monero-dev">#monero-dev</a>
-                                    <p>The many contributors and developers come here to discuss dev-y things.</p>
-                                </div>
-                            </div>
-                            <div class="row irc">
-                                <div class="col-md-4">
-                                    <a href="irc://chat.freenode.net/#monero-markets">#monero-markets</a>
-                                    <p>We use this channel to talk about the price of Monero and other coins.</p>
-                                </div>
-                                <div class="col-md-4">
-                                    <a href="irc://chat.freenode.net/#monero-otc">#monero-otc</a>
-                                    <p>Over the counter Monero. Come here to purchase XMR from your fellow Moneron.</p>
-                                </div>
-                                <div class="col-md-4">
-                                    <a href="irc://chat.freenode.net/#monero-pools">#monero-pools</a>
-                                    <p>This is the place for mining questions and discussion.</p>
-                                </div>
-                            </div>
-                            <div class="row irc">
-                                <div class="col-md-4">
-                                    <a href="irc://chat.freenode.net/#monero-research-lab">#monero-research-lab</a>
-                                    <p>Research into financial privacy with cryptocurrency.</p>
-                                </div>
                             </div>
                         </div>
                     </div>

css/custom.css

@@ -976,6 +976,10 @@ a:hover, a:focus, a:active {
     outline: 0;
 }
 
+textarea:focus, input:focus{
+    outline: none;
+}
+
 a, button, input, select, textarea, label, label:checked, label:focus {
     -webkit-tap-highlight-color: rgba(0,0,0,0);
     -webkit-tap-highlight-color: transparent;
@@ -987,6 +991,23 @@ img, video {max-width: 100%;}
 
 video {width: 100%;}
 
+::-webkit-input-placeholder {
+  color: #AAA;
+}
+::-moz-placeholder {
+  color: #AAA;
+}
+:-moz-placeholder {
+  color: #AAA;
+}
+:-ms-input-placeholder {
+  color: #AAA;
+}
+::-ms-input-placeholder {
+  color: #AAA;
+}
+
+
 .container, .container-fluid {
     margin-left: auto;
     margin-right: auto;
@@ -1021,6 +1042,10 @@ video {width: 100%;}
     box-shadow: 0 2px 4px rgba(50,50,93,.1);
 }
 
+.bold {
+    font-weight: 600;
+}
+
 code {
     white-space: pre-wrap;
     background-color: #fff1e8;
@@ -2517,6 +2542,10 @@ footer {
     text-decoration: none; 
 }
 
+.downloads a img {
+    padding-top: 1rem;
+}
+
 
 .downloads .full>.info-block {
     padding: 4rem 5rem;
@@ -2567,6 +2596,11 @@ footer {
     background-position: 0 -208px;
 }
 
+.download-platforms h2 span.icon-dragonflybsd {
+    background-image: url(../img/monero-spritesheet.png);
+    background-position: 0 -13rem;
+}
+
 .download-platforms h2 span.icon-github {
     background-image: url(../img/monero-spritesheet.png);
     background-position: 0 -240px;
@@ -2783,7 +2817,7 @@ footer {
     border-radius: 50%;
 }
 
-.roadmap .tabPanel-content span {
+.roadmap .tabPanel-content span, .roadmap .ms-completed, .roadmap .ms-upcoming {
   width: 1.5rem;
   height: 1.5rem;
   text-align: center;
@@ -3015,7 +3049,7 @@ footer {
     padding-top: 0;
 }
     
-.roadmap .tabPanel-content span, .pre-roadmap li {
+.roadmap .tabPanel-content span, .pre-roadmap li, .roadmap .ms-completed, .roadmap .ms-upcoming {
     width: 1rem;
     height: 1rem;
 }
@@ -3226,11 +3260,7 @@ footer {
 }
 
 .hangouts .irc .col-md-4 {
-    padding: 0 0.5rem;
+    padding: 1rem 0.5rem;
-}
-
-.hangouts .irc a {
-    margin-bottom: 1rem;
 }
 
 .hangouts .sequestions a {
@@ -3572,7 +3602,7 @@ footer {
     color: #2f6f9f;
     padding: 0.7rem;
     border-radius: 0.2rem;
-    margin-top: 1rem;
+    margin-bottom: 1.5rem;
 }
 
 .ffs-status p {
@@ -3582,14 +3612,103 @@ footer {
     font-size: 0.85rem;
 }
 
-.ffs-status.complete {
+.complete .ffs-status {
     background-color: #d7e8d8;
 }
 
-.ffs-status.inprogress {
+.inprogress .ffs-status {
     background-color: #fef2d5;
 }
 
+.progress-numbers p {
+    display: inline-block;
+    padding-top: 1.2rem;
+}
+
+.progress-bar {
+    height: 1rem;
+    position: relative;
+    background: #edebed;
+    box-shadow: inset 0 -1px 1px rgba(0,0,0,.07);
+    margin: 1rem 0 1.5rem 0;
+}
+
+.progress-bar span {
+    display: block;
+    height: 100%;
+    background-color: rgb(229,115,37);
+    background-image: linear-gradient(
+        center bottom,
+        rgb(229,115,37) 37%,
+        rgb(231,129,58) 69%
+    );
+    box-shadow: 
+      inset 0 2px 9px  rgba(255,255,255,0.3),
+      inset 0 -2px 6px rgba(0,0,0,.07);
+    position: relative;
+    overflow: hidden;
+}
+
+.inprogress .progress-bar span, .complete .progress-bar span {
+    background-color: rgb(97,168,99);
+    background-image: linear-gradient(
+        center bottom,
+        rgb(97,168,99) 37%,
+        rgb(128,185,130) 69%
+    );
+}
+
+.fr-contribute .tab, .fr-contribute .tab:last-of-type, .milestones .tab, .milestones .tab:last-of-type {
+    border: none;
+}
+
+.fr-contribute .tab-content p, .milestones .tab-content p {
+    margin: 0;
+    text-align: left;
+}
+
+.fr-contribute label.accordion, .milestones label.accordion {
+    display: inline-block;
+    padding: 0 2rem 0 1rem;
+    border: 1px solid #ff7519;
+    margin: 0;
+    line-height: 2.7rem;
+    height: 2.7rem;
+    -webkit-transition: background .15s ease;
+    -moz-transition: background .15s ease;
+    -o-transition: background .15s ease;
+    transition: background .15s ease;
+    color: #ff7519;
+    text-transform: uppercase;
+}
+
+.fr-contribute label.accordion:hover, .fr-contribute label.accordion:focus, .fr-contribute  input.accordion[type=checkbox]:checked + label, .milestones label.accordion:hover, .milestones label.accordion:focus, .milestones input.accordion[type=checkbox]:checked + label {
+    background-color: #ff7519;
+    color: #ffffff;
+}
+
+.fr-contribute label.accordion::after, .milestones label.accordion:after {
+    right: 1rem;
+    border-left: 4px solid transparent;
+    border-right: 4px solid transparent;
+    border-top: 4px solid #ff7519;
+}
+
+.fr-contribute label.accordion:hover:after, .fr-contribute label.accordion:focus:after, .fr-contribute  input.accordion[type=checkbox]:checked + label:after, .milestones label.accordion:hover:after, .milestones label.accordion:focus:after, .milestones input.accordion[type=checkbox]:checked + label:after {
+    border-top: 4px solid #ffffff;
+}
+
+.fr-contribute label.accordion:focus:after, .fr-contribute  input.accordion[type=checkbox]:checked + label:after, .milestones label.accordion:focus:after, .milestones input.accordion[type=checkbox]:checked + label:after {
+    transform: rotateX(180deg);
+}
+
+.ms-completed, .ms-upcoming {
+    margin-top: 1rem !important;
+}
+
+.milestones .row.roadmap {
+    margin-top: 1.5rem;
+}
 
 @media only screen and (max-width: 75rem) {
     
@@ -3679,6 +3798,10 @@ footer {
     display: none;
 }
     
+.ms-completed, .ms-upcoming {
+    margin-top: 1.2rem !important;
+}
+    
 }
 
 @media only screen and (max-width: 41rem) {
@@ -3697,9 +3820,21 @@ footer {
 
 @media only screen and (max-width: 30rem) {
 
-    .ffs .mobile a.ffs-btn {
+.ffs .mobile a.ffs-btn {
-        font-size: 1.25rem;
+    font-size: 1.25rem;
-    }    
+}  
+    
+.milestones .roadmap .col-xs-1 {
+    -ms-flex-preferred-size: 16.667%;
+    flex-basis: 16.667%;
+    max-width: 16.667%;
+} 
+    
+.milestones .roadmap .col-xs-11 {
+    -ms-flex-preferred-size: 83.333%;
+    flex-basis: 83.333%;
+    max-width: 83.333%;
+}
 }
 
 @media only screen and (max-width: 25rem) {
@@ -3719,7 +3854,7 @@ footer {
     }    
 }
 
-/*************************ACCORDIAN********************************/
+/*************************accordion********************************/
 
 .tab {
   position: relative;
@@ -3732,12 +3867,12 @@ footer {
 .tab:last-of-type {
     border-bottom: 1px solid #d7d7d7;
 }
-input.accordian {
+input.accordion {
   position: absolute;
   display: none;
   z-index: -1;
 }
-label.accordian {
+label.accordion {
   position: relative;
   display: block;
   padding: 1rem 2rem 1rem 0;
@@ -3760,12 +3895,12 @@ label.accordian {
   margin: 0 1rem 1rem 1rem;
 }
 
-input.accordian:checked ~ .tab-content {
+input.accordion:checked ~ .tab-content {
   max-height: 100rem;
   overflow: visible;
 }
 
-label.accordian::after {
+label.accordion::after {
   margin-right: 0;
   content: "";
   position: absolute;
@@ -3783,10 +3918,10 @@ label.accordian::after {
   transition: border-bottom .1s, border-top .1s .1s;
 }
 
-input.accordian[type=checkbox]:checked + label::after {
+input.accordion[type=checkbox]:checked + label::after {
   transform: rotateX(180deg);
 }
-input.accordian[type=radio]:checked + label::after {
+input.accordion[type=radio]:checked + label::after {
   transform: rotateX(180deg);
 }
 

downloads/hashes.txt

@@ -6,15 +6,13 @@ This GPG-signed message exists to confirm the SHA256 sums on Monero binaries.
 Please verify the signature against the signature for fluffypony in the
 source code repository (/utils/gpg_keys).
 
-2fbda6f6b1051053703e40cf77b6c6e11334509ad03a3c22d89b6bcb05615910  monero-win-x64-v0.10.3.1.zip
+62c3d35c6d1ac7c73d5a0266e63af4faab8680776e3e149f5ae562d200c22189  monero-win-x64-v0.11.0.0.zip
-da628a45adfcb8be44df06ac904711d644d608c4eb6479a5d256062a5f6d74de  monero-win-x86-v0.10.3.1.zip
+0087b1092090ab270ad9a40ac579c017b9fd85043eca325e433ae598ec65349b  monero-win-x86-v0.11.0.0.zip
-fd17d55a8c9e901ff4064c39d9e14786cdd077aff9b3bb556e60d3a5e322050c  monero-mac-x64-v0.10.3.1.tar.bz2
+8340ace926b23171a369bdbeba5d4e1abba7db33b603ecacc3aa1df4451b957b  monero-mac-x64-v0.11.0.0.tar.bz2
-8db80f8cc4f80d4106db807432828df730a59eac78972ea81652aa6b9bac04ad  monero-linux-x64-v0.10.3.1.tar.bz2
+42a9df43175a7fe0efcd1aed58e92722f693b44529730e328c73887fb80e7bab  monero-linux-x64-v0.11.0.0.tar.bz2
-abc99f3928f4083bd1a380a869253e07bee9950e0aeb6388e9493bc0f0ec3f53  monero-linux-x86-v0.10.3.1.tar.bz2
+452ce74dcb8c6af3be0ac0b1f3f90c31020cdf408ccf443507e96860a7aa8171  monero-linux-x86-v0.11.0.0.tar.bz2
-451f65e4846b92d54859e22a5d92124557b397b4208d8752d5289d0262573c3c  monero-linux-armv8-v0.10.3.1.tar.bz2
+f88e53250b558705ee866cd439a3366666d977e5377ba197aff66f53bd421793  monero-linux-armv7-v0.11.0.0.tar.bz2
-8473fa20e0db4a3d3e46120cdf92c55be6a159478c511e21f7b77aa05d6c1910  monero-linux-armv7-v0.10.3.1.tar.bz2
+c6373cd82a88ec8c56cedab2e0f65715ea908c9f3517d127db4bc0ecc7532428  monero-freebsd-x64-v0.11.0.0.tar.bz2
-4c66a76752e18ae70b5fb1c728f0d2780eb129a6c8c7d0dee7ba02e05d91efae  monero-freebsd-x64-v0.10.3.1.tar.bz2
-c25c0f603ca5c96cb5963aaa2905edff390b7a97f654106911ffad8639deee7c  monero-dragonflybsd-x64-v0.10.3.1.tar.bz2
 
 0eddd423f5f0df236303d8b9225842142b331093eb69e6183f3f694238c371a7  monero-gui-win-x64-v0.10.3.1.zip
 c80ca68037158216a080e59e90b0a70761cff2f317d3c9cd0eeb661e8e2a1f99  monero-gui-mac-x64-v0.10.3.1.tar.bz2
@@ -23,13 +21,13 @@ c80ca68037158216a080e59e90b0a70761cff2f317d3c9cd0eeb661e8e2a1f99  monero-gui-mac
 
 Riccardo "fluffypony" Spagni
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
 
-iQEcBAEBCAAGBQJY3APJAAoJEFVDLfMczU/NNN0H/RQK53LnfBk9rURbxBXRgPcD
+iQEzBAEBCAAdFiEElLc43TUBMvWsvuodVUMt8xzNT80FAlmxorUACgkQVUMt8xzN
-Njv81hYc/rzGLgeQmxDf6Ug0qivaM7jFkd3aLkT3VZtid0tZWvygg6DnEg9QdSUi
+T83/GAf+Kou9Kt1ikIHeJRMNYy01MqvY/AkGtFKSVduLuDte0e+mAbN0qm+ugmZj
-xw9lndyxdeMmW3kbq4uT5n2RB+hx1T7QbXjgHX3+8KAl0G5AyVdVWGmdb/nk7Lwj
+m0FiXl9VHWgJhKJgkI2/nCqu7EYDNBuWLO0k2xqrJL+xLg7sTUhS1lDLF++74qoP
-Y9XJdK6WtbENYQ65YX8Y/s6QHgT4SUM136sdnFfZVCirX8J0YJKGsMWGDaX16L6O
+KQMQ+XBoa+KuBmEC5zUjtQvqdsj8g6RXjcwhSRiFg2X/I3t0eqjjHO980QqzjfVz
-otNMimhnwP0zTO8bNm+Hvl4v8+hmizJRK3kxpQdI4lWJZxX4iOSzFDlqc7gYBOR+
+rPE/ClCd4I0BGP6lv11tzzMT+Yx9GoSxNSX2XWG6BvjGgwmhtx4W3p/DZjTDPd+u
-1RnH28fFu/XTLm6F+2JVjtHy4JIJiFV9oYDcY7tJoJtAu+4hZs/mc2wew1pVVtM=
+z1n1t5MaOx3mUaVcKUk4h+MucRZMZV3tkrZ60tF+34f8VE+dCeSK3yfKrgW2NCZO
-=Ykcx
+cHVnsScRnFybjxKL8hlmnc3Sl2Piig==
+=nuf1
 -----END PGP SIGNATURE-----

downloads/index.md

@@ -7,7 +7,7 @@ title: "Downloads"
 
 <div class="container description" markdown="1">
 
-If you need help choosing the correct application, please click [here](#) for a quick user-guide, then select the appropriate release for your operating system below.
+If you need help choosing the correct application, please click [here](https://www.reddit.com/r/Monero/comments/64b5lf/what_is_the_best_monero_wallet/) for a quick answer, then select the appropriate release for your operating system below.
 Note: the SHA256 hashes are listed by the downloads for convenience, but a GPG-signed list of the hashes is at [getmonero.org/downloads/hashes.txt](https://getmonero.org/downloads/hashes.txt) and should be treated as canonical, with the signature checked against the appropriate GPG key in the source code (in /utils/gpg_keys).
 
 </div>
@@ -87,6 +87,11 @@ If you'd prefer to use a blockchain bootstrap, instead of syncing from scratch,
 <p>The following are mobile or light wallets that are deemed safe by trusted members of the community. If there is a wallet that is not on here, you can request the community check it out. Go to our <a href="/community/hangouts/">Hangouts</a> page to see where we are.</p>
 </div>
 </div>
+<div class="row center-xs">
+  <div class="col-xs-12">
+    <a href="https://mymonero.com"><img src="/img/mymonero.png" alt="MyMonero Logo"></a>
+  </div>
+</div>
 
 
 {% elsif data_downloads.gui_hash == nil and data_downloads.cli_hash != nil %}

forum-funding-system/proposals/getmonero-redesign.md

@@ -4,6 +4,23 @@ title: Getmonero.org Redesign
 address: 4445
 paymentid: 3xj3
 author: rehrar
+milestones:
+  - name: Milestone 1 - Front page & restructure
+    funds: 10% (~XMR 10.70)
+    done: April 28, 2017
+    status: completed
+  - name: Milestone 2 - Design
+    funds: 40% (~XMR 42.80)
+    done: July 1, 2017
+    status: completed
+  - name: Milestone 3 - Development
+    funds: 30% (~XMR 32.10)
+    done: July 1, 2017
+    status: completed
+  - name: Milestone 4 - Finishing touches
+    funds: 20% (~XMR 21.40)
+    done:
+    status: upcoming
 ---
 
 At the request of myself , I am editing my proposal that fluffypony recommended I edit that was edited from the initial idea. So, without further ado:

forum-funding-system/proposals/whatismonero-produced.md

@@ -1,6 +1,6 @@
 ---
 layout: ffs-cp
-title: What is Monero? is produced and open-sourced.
+title: What is Monero? is produced and open-sourced
 author: savandra
 ---
 

get-started/faq/index.md

@@ -4,8 +4,8 @@ title: FAQ
 ---
 
 <div class="tab">
-    <input id="tab-one" type="checkbox" name="tabs" class="accordian">
+    <input id="tab-one" type="checkbox" name="tabs" class="accordion">
-    <label for="tab-one" class="accordian">How does Monero have value?</label>
+    <label for="tab-one" class="accordion">How does Monero have value?</label>
     
 <div class="tab-content" markdown="1">
 
@@ -16,8 +16,8 @@ Monero has value because people are willing to buy it. If no one is willing to b
 </div>
 
 <div class="tab">
-    <input id="tab-two" type="checkbox" name="tabs" class="accordian">
+    <input id="tab-two" type="checkbox" name="tabs" class="accordion">
-    <label for="tab-two" class="accordian">How can I get Monero?</label>
+    <label for="tab-two" class="accordion">How can I get Monero?</label>
     
 <div class="tab-content" markdown="1">
 
@@ -27,8 +27,8 @@ You can buy Monero from an exchange or from an individual. Alternatively, you ca
 </div>
 
 <div class="tab">
-    <input id="tab-three" type="checkbox" name="tabs" class="accordian">
+    <input id="tab-three" type="checkbox" name="tabs" class="accordion">
-    <label for="tab-three" class="accordian">What is a mnemonic seed?</label>
+    <label for="tab-three" class="accordion">What is a mnemonic seed?</label>
     
 <div class="tab-content" markdown="1">
 
@@ -38,8 +38,8 @@ A mnemonic seed is a set of 25 words that can be used to restore your account an
 </div>
 
 <div class="tab">
-    <input id="tab-four" type="checkbox" name="tabs" class="accordian">
+    <input id="tab-four" type="checkbox" name="tabs" class="accordion">
-    <label for="tab-four" class="accordian">How is Monero’s privacy different from other coins?</label>
+    <label for="tab-four" class="accordion">How is Monero’s privacy different from other coins?</label>
     
 <div class="tab-content" markdown="1">
 
@@ -49,8 +49,8 @@ Monero uses three different privacy technologies: ring signatures, ring confiden
 </div>
 
 <div class="tab">
-    <input id="tab-five" type="checkbox" name="tabs" class="accordian">
+    <input id="tab-five" type="checkbox" name="tabs" class="accordion">
-    <label for="tab-five" class="accordian">Why is my wallet taking so long to sync?</label>
+    <label for="tab-five" class="accordion">Why is my wallet taking so long to sync?</label>
     
 <div class="tab-content" markdown="1">
 
@@ -60,8 +60,8 @@ If you are running a full node locally, you need to copy the entire blockchain t
 </div>
 
 <div class="tab">
-    <input id="tab-six" type="checkbox" name="tabs" class="accordian">
+    <input id="tab-six" type="checkbox" name="tabs" class="accordion">
-    <label for="tab-six" class="accordian">What is the different between a lightweight and a normal wallet?</label>
+    <label for="tab-six" class="accordion">What is the different between a lightweight and a normal wallet?</label>
     
 <div class="tab-content" markdown="1">
 
@@ -71,8 +71,8 @@ For a lightweight wallet, you give your view key to a node, who scans the blockc
 </div>
 
 <div class="tab">
-    <input id="tab-seven" type="checkbox" name="tabs" class="accordian">
+    <input id="tab-seven" type="checkbox" name="tabs" class="accordion">
-    <label for="tab-seven" class="accordian">How is Monero different from Bitcoin?</label>
+    <label for="tab-seven" class="accordion">How is Monero different from Bitcoin?</label>
     
 <div class="tab-content" markdown="1">
 
@@ -82,8 +82,8 @@ Monero is not based on Bitcoin. It is based on the CryptoNote protocol. Bitcoin
 </div>
 
 <div class="tab">
-    <input id="tab-eight" type="checkbox" name="tabs" class="accordian">
+    <input id="tab-eight" type="checkbox" name="tabs" class="accordion">
-    <label for="tab-eight" class="accordian">Does Monero have a block size limit?</label>
+    <label for="tab-eight" class="accordion">Does Monero have a block size limit?</label>
     
 <div class="tab-content" markdown="1">
 
@@ -93,8 +93,8 @@ No, Monero does not have a hard block size limit. Instead, the block size can in
 </div>
 
 <div class="tab">
-    <input id="tab-nine" type="checkbox" name="tabs" class="accordian">
+    <input id="tab-nine" type="checkbox" name="tabs" class="accordion">
-    <label for="tab-nine" class="accordian">What is a blockchain?</label>
+    <label for="tab-nine" class="accordion">What is a blockchain?</label>
     
 <div class="tab-content" markdown="1">
 
@@ -104,8 +104,8 @@ A blockchain is a system that stores a copy of all transaction history on the Mo
 </div>
 
 <div class="tab">
-    <input id="tab-ten" type="checkbox" name="tabs" class="accordian">
+    <input id="tab-ten" type="checkbox" name="tabs" class="accordion">
-    <label for="tab-ten" class="accordian">What is Kovri?</label>
+    <label for="tab-ten" class="accordion">What is Kovri?</label>
     
 <div class="tab-content" markdown="1">
 
@@ -115,8 +115,8 @@ Kovri is an I2P router written in C++. I2P is a hidden network like Tor with sev
 </div>
 
 <div class="tab">
-    <input id="tab-eleven" type="checkbox" name="tabs" class="accordian">
+    <input id="tab-eleven" type="checkbox" name="tabs" class="accordion">
-    <label for="tab-eleven" class="accordian">What is fungibility, and why is it important?</label>
+    <label for="tab-eleven" class="accordion">What is fungibility, and why is it important?</label>
     
 <div class="tab-content" markdown="1">
 
@@ -124,3 +124,17 @@ Fungibility is a simple property of money such that there are no differences bet
 </div>
 
 </div>
+
+<div class="tab">
+    <input id="tab-eleven" type="checkbox" name="tabs" class="accordian">
+    <label for="tab-eleven" class="accordian">If Monero is so private how do we know they're not being created out of thin air?</label>
+    
+<div class="tab-content" markdown="1">
+In Monero, every transaction output is uniquely associated with a key image that can only be generated by the holder of that output. Key images that are used more than once are rejected by the miners as double-spends and cannot be added to a valid block. When a new transaction is received, miners verify that the key image does not already exist for a previous transaction to ensure it's not a double-spend.
+
+We can also know that transaction amounts are valid even though the value of the inputs that you are spending and the value of the outputs you are sending are encrypted (these are hidden to everyone except the recipient). Because the amounts are encrypted using Pedersen commitments what this means is that no observers can tell the amounts of the inputs and outputs, but they can do math on the Pedersen commitments to determine that no Monero was created out of thin air.
+
+As long as the encrypted output amounts you create is equal to the sum of the inputs that are being spent (which include an output for the recipient and a change output back to yourself and the unencrypted transaction fee), then you have a legitimate transaction and know no Monero is being created out of thin air. Pedersen commitments mean that the sums can be verified as being equal, but the Monero value of each of the sums and the Monero value of the inputs and outputs individually are undeterminable.
+</div>
+
+</div>

get-started/mining/index.md

@@ -66,7 +66,9 @@ title: Mining Monero
                         </div>
                     </div>
                     <div class="row center-xs">
+
                        <p>Depending on your hardware, there are various mining programs available for use. You might consider trying different ones and seeing how it affects you hashrate. Please note, that some miners also have developer fees.</p>
+
                     </div>
                     <div class="row miners">
                         <div class="col-md-4 col-xs-12 center-xs">
@@ -94,4 +96,4 @@ title: Mining Monero
     </section>
     
 
-</div>
+</div>

get-started/using/index.md

@@ -3,7 +3,7 @@ layout: custom
 title: Using Monero
 ---
 <div class="text-center container description">
-    <p>Using Monero is easy, and there are a variety of tools and guides available to help newcomers. This page will guide you through the basics.</p>
+    <p>Transacting with Monero can be made easy. This page is designed to guide users in that process.</p>
 </div>
 <div class="using">
     <section class="container">
@@ -13,11 +13,11 @@ title: Using Monero
                 <div class="info-block text-adapt">
                     <div class="row center-xs">
                         <div class="col">
-                            <h2>1. Start Here</h2>
+                            <h2>1. Learn</h2>
                         </div>
                     </div>
                     <div class="row start-xs">
-                        <p>Monero is a cryptocurrency that allows anonymous transactions around the world. Monero stands on pillars of security, privacy, and decentralization, and the community and developers are committed to protecting these values. We suggest learning more about how Monero works and reading the <a href="/get-started/what-is-monero/">What is Monero page</a>. The <a href="https://github.com/monero-project">source code for Monero</a> and all our official clients are available for public view and discussion on Github.</p>
+                        <p>Monero is a secure, private, and untraceable cryptocurrency. The developers and community are committed to protecting these values. Learn more by reading the <a href="/get-started/what-is-monero/">What is Monero</a> page. The <a href="https://github.com/monero-project">source code</a> is also available for review and discussion.</p>
                     </div>
                 </div>
             </div>
@@ -30,11 +30,11 @@ title: Using Monero
                 <div class="info-block">
                     <div class="row center-xs">
                         <div class="col">
-                            <h2>2. Support</h2>
+                            <h2>2. Request Support</h2>
                         </div>
                     </div>
                     <div class="row start-xs">
-                        <p>Before reading further, it is important to know that there is a large, supportive community that can assist if you run into trouble. If you have questions about anything, no matter how large or small, don't hesitate to ask. We chill in a lot of places, so see our <a href="/community/hangouts/">Hangouts page</a> to track us down. Remember, there are no stupid questions, and we are all learning together.</p>
+                        <p>There is a large and supportive community that will assist if you experience any difficulty. See the <a href="/community/hangouts/">Hangouts</a> page for more information.</p>
                     </div>
                 </div>
             </div>
@@ -42,11 +42,11 @@ title: Using Monero
                 <div class="info-block">
                     <div class="row center-xs">
                         <div class="col">
-                            <h2>3. Getting a Wallet</h2>
+                            <h2>3. Generate a Wallet</h2>
                         </div>
                     </div>
                     <div class="row start-xs">
-                        <p>You need somewhere to store physical cash such as your bank, your wallet, or under your mattress. Although Monero is an entirely digital asset (you cannot touch them!), you still need a place to store them. This is done in a digital wallet. You oversee securing your own funds, and there is no way to restore them if you make a mistake. Thus, take great care in selecting the right wallet for you. Some are safer and others are more convenient than others. See our <a href="/downloads/">downloads page</a> for the wallets that The Monero Project has put out.</p>
+                        <p>A Monero wallet is required to secure your own funds. See the <a href="/downloads/">Downloads</a> page for a listing of available wallets.</p>
                     </div>
                 </div>
             </div>
@@ -59,11 +59,11 @@ title: Using Monero
                 <div class="info-block text-adapt">
                     <div class="row center-xs">
                         <div class="col">
-                            <h2>4. Getting Monero</h2>
+                            <h2>4. Acquire Monero</h2>
                         </div>
                     </div>
                     <div class="row start-xs">
-                        <p>Empty wallets are no fun! Let’s get some Monero in there! You can receive Monero from someone else, or purchase some on <a href="/community/merchants/">an exchange</a>. We do not endorse specific services, but you can view the exchanges that support Monero on the Merchants page. Depending on the exchange, you can buy Monero from several currencies including USD, EUR, and Bitcoin. For price speculation and talk, join the active trading discussion at <a href="irc://chat.freenode.net/#monero-markets">#monero-markets.</a></p>
+                        <p>Monero may be purchased on an <a href="/community/merchants/">exchange</a> with fiat or other cryptocurrencies. An alternate way of acquiring Monero is via <a href="https://getmonero.org/get-started/mining/">mining</a>, the computationally-complex process whereby transactions are immutably recorded on the blockchain.</p>
                     </div>
                 </div>
             </div>
@@ -76,11 +76,11 @@ title: Using Monero
                 <div class="info-block">
                     <div class="row center-xs">
                         <div class="col">
-                            <h2>5. Transferring Monero</h2>
+                            <h2>5. Send and Receive Monero</h2>
                         </div>
                     </div>
                     <div class="row start-xs">
-                        <p>It is typically a poor idea to leave a large amount of money on an exchange. If you manage your wallet properly, it is a much safer place to store your Monero. Learn how to send and receive Monero by <a href="/get-started/accepting/">viewing our guide</a>, and learn about your risk exposure.</p>
+                        <p>Learn how to send and receive Monero by viewing the <a href="/get-started/accepting/">guide</a>.</p>
                     </div>
                 </div>
             </div>
@@ -88,14 +88,14 @@ title: Using Monero
                 <div class="info-block">
                     <div class="row center-xs">
                         <div class="col">
-                            <h2>6. Now What?</h2>
+                            <h2>6. Transact with Monero</h2>
                         </div>
                     </div>
                     <div class="row start-xs">
-                        <p>You now have Monero and know how to use it! Monero, like cash, can be used for many goods and services. For a list of some groups that accept Monero directly, see our <a href="/community/merchants/">Merchants page.</a> Other services make it easy to pay Bitcoin addresses with the privacy of Monero.</p>
+                        <p>Monero may be used to purchase many goods and services. For a listing, see the <a href="/community/merchants/">Merchants</a> page. </p>
                     </div>
                 </div>
             </div>
         </div>
     </section>
-</div>
+</div>

get-started/what-is-monero/index.md

@@ -1,6 +1,6 @@
 ---
 layout: default
-title: "What Is Monero?"
+title: "What Is Monero (XMR)?"
 ---
 
 <div class="site-wrap">
@@ -15,8 +15,8 @@ title: "What Is Monero?"
                         <div class="row middle-xs info-block-row private">
                             <div class="col-lg-7 col-md-6 col-sm-8 col-xs-12  why-text">
                                 <h3>Monero is the leading cryptocurrency with a focus on private and censorship-resistant transactions.</h3>
-                                <p>Almost all cryptocurrencies (including Bitcoin and Ethereum) are transparent. They reveal your entire transaction history to the world.</p>
+                                <p>Most existing cryptocurrencies, including Bitcoin and Ethereum, have transparent blockchains, meaning that transactions are openly verifiable and traceable by anyone in the world. Furthermore, sending and receiving addresses for these transactions may potentially be linkable to a person's real-world identity. </p>
-                                <p>Monero uses unbreakable cryptography to ensure that no one can see how much money you have or where you spend it, even if they know your wallet address.</p>
+                                <p>Monero uses cryptography to shield sending and receiving addresses, as well as transacted amounts.</p>
                             </div>
                             <div class="col-lg-5 col-md-6 col-sm-4 col-xs-12 last-sm first-xs center-xs">
                                 <img src="/img/crypto-lock.png" alt="Encrypted lock" class="main-icon">
@@ -28,9 +28,9 @@ title: "What Is Monero?"
                             </div>
                             <div class="col-lg-7 col-md-6 col-sm-8 col-xs-12 why-text">
                                 <h3>Monero transactions are confidential and untraceable.</h3>
-                                <p>The source of funds in every Monero transaction is untraceable, and the transaction amounts are confidential. Always-on privacy means that every Monero user's activity enhances the privacy of all other users.</p>
+                                <p>Every Monero transaction, by default, obfuscates sending and receiving addresses as well as transacted amounts. This always-on privacy means that every Monero user's activity enhances the privacy of all other users, unlike selectively transparent cryptocurrencies (e.g. Z-Cash).</p>
-                                <p>Because funds on the Monero blockchain are untraceable, they cannot become tainted by association with their previous owners. This means you can accept Monero without risk of the funds you've received being blocked or censored at currency exchanges or merchants.</p>
+                                <p>Monero is fungible. By virtue of obfuscation, Monero cannot become tainted through participation in previous transactions. This means Monero will always be accepted without the risk of censorship.</p>
-                                <p>Monero's <a href="https://getkovri.org/">Kovri project</a> (coming soon) encrypts and routes transactions through the I2P Invisible Internet Project nodes to hide your IP address and protect you from network monitoring.</p>
+                                <p>The Kovri Project, <a href="https://getkovri.org/">currently in development</a>, will route and encrypt transactions via I2P Invisible Internet Project nodes. This will obfuscate a transactor's IP address and provide further protection against network monitoring.</p>
                             </div>
 
                         </div>

index.html

@@ -20,8 +20,8 @@ Title: Home
                         <div class="main-info">
                             <h1 id="main-h1">Monero</h1>
                             <h2 id="main-h2">Private Digital Currency</h2>
-                            <p id="main-text">Monero is a secure, private, untraceable currency. It is open-source and freely available to all. With Monero, you are your own bank. Only 
+                            <p id="main-text">Monero is a secure, private, and untraceable cryptocurrency. It is open-source and accessible to all. With Monero, you are your own bank. Only 
-                            you control and are responsible for your funds; your accounts 
+                            you control and are responsible for your funds. Your accounts 
                             and transactions are kept private from prying eyes.</p>
                             <p><a href="/get-started/using/" class="btn-link btn-auto btn-primary">Get Started</a></p>
                         </div>
@@ -40,7 +40,7 @@ Title: Home
                     <div class="row middle-xs info-block-row private">
                         <div class="col-lg-6 col-md-6 col-sm-8 col-xs-12  why-text">
                             <h3>Monero is secure.</h3>
-                            <p>Monero can't be hacked to steal your funds, due to the power of distributed consensus, which you can read about here. This means that you are responsible for your money, and don't have to trust any entity to keep it safe for you.</p>
+                            <p>Monero is a decentralized cryptocurrency, meaning it is extremely difficult to hack and steal your funds. Transactions are confirmed by distributed consensus, and then immutably recorded on the blockchain. Third-parties do not need to be trusted to keep your Monero safe. </p>
                         </div>
                         <div class="col-lg-6 col-md-6 col-sm-4 col-xs-12 last-sm first-xs center-xs">
                             <img src="/img/secure-monero.png" alt="Secure safe" class="main-icon">
@@ -52,14 +52,14 @@ Title: Home
                         </div>
                         <div class="col-lg-6 col-md-6 col-sm-8 col-xs-12 why-text">
                             <h3>Monero is private.</h3>
-                            <p>The power of the blockchain usually increases security at the cost of privacy, but with Monero's sophisticated privacy-centric technology, you get all of the security benefits of the blockchain without any of the privacy trade-offs.</p>
+                            <p>Monero uses ring signatures and ring confidential transactions to obfuscate the amounts, origins, and destinations of all transactions. Monero gains all the benefits of a decentralized cryptocurrency, without any of the standard privacy concessions. </p>
                         </div>
                         
                     </div>
                     <div class="row middle-xs info-block-row">
                         <div class="col-lg-6 col-md-6 col-sm-8 col-xs-12 why-text">
                             <h3>Monero is untraceable.</h3>
-                            <p>By taking advantage of ring signatures, Monero makes it ambiguous which funds have been spent, and thus extremely unlikely that a transaction could be linked to particular user.</p>
+                            <p>Sending and receiving addresses as well as transacted amounts are obfuscated by default. Transactions on the Monero blockchain cannot be linked to a particular user or real-world identity.</p>
                         </div>
                         <div class="col-lg-6 col-md-6 col-sm-4 col-xs-12 last-sm first-xs center-xs">
                             <img src="/img/untraceable-monero.png" alt="Untraceable Monero paths" class="main-icon">
@@ -71,7 +71,7 @@ Title: Home
                         </div>
                         <div class="col-lg-6 col-md-6 col-sm-8 col-xs-12 why-text">
                             <h3>Monero is fungible.</h3>
-                            <p>Because of the on-by-default nature of the privacy technologies, Monero is fungible, meaning one Monero will always be equal to another. This means you won't have to worry about Monero blacklisted by exchanges or vendors.</p>
+                            <p> Monero is fungible because it is private by default. In its current state, it is extremely unlikely that Monero will ever be blacklisted by exchanges or vendors due to its association in previous transactions.</p>
                         </div>
                     </div>
                 </div>

resources/moneropedia/change.md

@@ -2,9 +2,15 @@
 layout: moneropedia
 entry: "Change"
 terms: ["change"]
-summary: "Monero sent as part of a transaction, but unique in that returns to your account instead of going to a recipient"
+summary: "Monero sent as part of a transaction, that returns to your account instead of going to another recipient"
 ---
 
 ### The Basics
 
-{{ page.summary | capitalize }}.
+{{ page.summary | capitalize }}.
+
+### More Information
+
+The @wallet in the the Monero software makes change automatically, but when you send a transaction, you are taking an @input that you control and telling the Monero network what to do with it. The @input is a "deposit" to your account that you are able to spend. @Outputs are the part of the transaction that tells the Monero network where to send the funds.
+
+You might have multiple inputs in your account, in many different denominations (For example: you deposited 0.5 XMR on Friday, and 0.75 XMR on Saturday). So, when have a transaction with an input of 0.5 XMR, but you only want to send 0.1 XMR, your transaction will include a @fee to pay the @miner, an output for 0.1 XMR to send to the recipient, and the rest that you want to send back to yourself will be an output back to you (this is called "change"). Once the transaction is completed, the change becomes available to you as an input that you can again split and send with a new transaction.

resources/moneropedia/cryptocurrency.md

@@ -2,9 +2,21 @@
 layout: moneropedia
 entry: "Cryptocurrency"
 terms: ["cryptocurrency", "cryptocurrencies", "altcoin", "altcoins"]
-summary: "digital currencies that do not have a central point of control, operating in a distributed peer-to-peer network"
+summary: "a digital currency in which encryption techniques are used to regulate the generation of units of currency and verify the transfer of funds, usually operating independently of a central bank"
 ---
 
 ### The Basics
 
-{{ page.summary | capitalize }}.
+{{ page.summary | capitalize }}.
+
+### More Information
+
+Cryptocurrency is the generic term for a large set of digital assets that use encryption techniques to generate units of currency, verify the transactions, and transfer value. Generally, cryptocurrencies are considered to be decentralized. Cryptocurrency should not be confused with virtual currency which is a type of digital money that is usually controlled by it's creators or developers. (Some examples of virtual currency are gametime in World of Warcraft, ROBUX in Roblox, reward points programs, or Ripple, all of which can be exchanged for currency or cash value, but are not considered cryptocurrency because they are centalized and controlled/issued by a single entity).  
+
+Monero is one of many cryptocurrencies currently available. Other examples are Bitcoin, Litecoin, Dogecoin, Dash, Zcash, etc, but nearly all other cryptocurrencies lack features that make them a true money (most importantly @fungability which is a requirement for it to be a @store-of-value).
+
+Not all cryptocurrencies operate the same, but they usually share the properties of @decentralization, encryption, and the ability to send and receive transactions. Most are irreversible, pseudonymous, global, and permissionless. Most aim to be a @store-of-value or be digital cash that allows you to transact.
+
+Most cryptocurrencies (including Monero) use a distributed ledger (called a @blockchain) to keep track of previous transactions . The blockchain serves to tell other users on the network that transactions have happened. There are many different ways for cryptocurrencies to create their blockchain, and not all are the same. Monero uses @proof-of-work to craft blocks, where other cryptocurrencies may use proof-of-stake or other consolidated methods.
+
+Ultimately, cryptocurrency is an attempt to create @trustless value; that is free from borders, governments, and banks. Whether that be to transact or to be digital gold is up to the users of each.

resources/moneropedia/node.md

@@ -7,4 +7,19 @@ summary: "a device on the Internet running the Monero software, with a full copy
 
 ### The Basics
 
-{{ page.summary | capitalize }}.
+{{ page.summary | capitalize }}.
+
+### More Information
+
+Nodes participate in the Monero network and secure @transactions by enforcing the rules of the network. Nodes download the entire @blockchain to know what transactions have taken place. Nodes assist the network by relaying transactions to other nodes on the network. Nodes may also choose contribute to the Monero network by participating in crafting @blocks (this is called @mining). 
+
+Mining is the process by which nodes create a block from the previously accepted block, transactions that are waiting to be processed in the @tx-pool, and the @coinbase. When a node believes it has crafted a valid block it will transmit the completed block to other nodes on the network and those nodes signal agreement by working on the next block in the chain. 
+
+The rules that nodes follow are built into the Monero software; When all nodes agree about the rules to follow this is called @consensus). Consensus is necessary for a cryptocurrency because it is how the blockchain is built; If nodes don't agree about which blocks are valid, for example people who have not updated their Monero software, those nodes that don't agree will no longer be able to participate in the Monero network.
+
+The Monero Core Team plans for a @hardforks every 6 months, to occur in September and March of each year. At that time, if you are running a node it must be updated to the most recent version of the Monero software or it will no longer be able to participate in the network. 
+
+---
+
+##### Other Resources
+<sub>1. *Fluffypony gives a great explanation of why mandatory hardforks are good for Monero.* ([Monero Missives for the Week of 2016-06-20](https://getmonero.org/2016/06/20/monero-missive-for-the-week-of-2016-06-20.html))</sub>

resources/moneropedia/pedersen-commitment

@@ -0,0 +1,24 @@
+---
+layout: moneropedia
+entry: "Pedersen Commitment"
+terms: ["commitments", "commitment", "pedersen"]
+summary: "Pedersen commitments are cryptographic algorythms that allow a prover to commit to a certain value without revealing it or being able to change it."
+---
+
+### The Basics
+
+When you spend Monero, the value of the inputs that you are spending and the value of the outputs you are sending are encrypted and opaque to everyone except the recipient of each of those outputs. Pedersen commitments allow you to send Monero without revealing the value of the transactions. Pedersen commitments also make it possible for people to verify that transactions on the blockchain are valid and not creating Monero out of thin air.
+
+### What It Means
+
+As long as the encrypted output amounts created, which include an output for the recipient and a change output back to the sender, and the unencrypted transaction fee is equal to the sum of the inputs that are being spent, it is a legitimate transaction and can be confirmed to not be creating Monero out of thin air.
+
+Pedersen commitments mean that the sums can be verified as being equal, but the Monero value of each of the sums and the Monero value of the inputs and outputs individually are undeterminable. Pedersen commitments also mean that even the ratio of one input to another, or one output to another is undeterminable.
+
+Even though it's unclear which inputs are really being spent (the ring signature lists both the real inputs being spent and decoy inputs therefore you don't actually know which input Pedersen commitments you need to sum) that's okay, because the RingCT ring signature only has to prove is that for one combination of the inputs the outputs are equal to the sum of the inputs. For mathematical reasons, this is impossible to forge.
+
+### In-depth Information
+
+See information in [Ring Confidential Transactions paper](https://eprint.iacr.org/2015/1098.pdf) by Shen Noether of the Monero Research Lab.
+
+{{ page.summary | capitalize }}.

resources/moneropedia/ringsignatures.md

@@ -6,6 +6,13 @@ summary: "a group of cryptographic signatures with at least one real participant
 ---
 
 ### The Basics
-A ring signature is a type of group @signature that makes use of your @account keys and a number of public keys (also known as outputs) pulled from the @blockchain using a triangular distribution method. Over the course of time, past outputs could be used multiple times to form possible signer participants. In a "ring" of possible signers, all ring members are equal and valid. There is no way an outside observer can tell which of the possible signers in a signature group belongs to your @account. So, ring signatures ensure that transaction outputs are untraceable. Moreover, there are no fungibility issues with Monero given that every transaction output has plausible deniability (e.g. the network can not tell which outputs are spent or unspent).
+
+In cryptography, a ring signature is a type of digital signature that can be performed by any member of a group of users that each have keys. Therefore, a message signed with a ring signature is endorsed by someone in a particular group of people. One of the security properties of a ring signature is that it should be computationally infeasible to determine *which* of the group members' keys was used to produce the signature.
+
+For instance, a ring signature could be used to provide an anonymous signature from "a high-ranking White House official", without revealing which official signed the message. Ring signatures are right for this application because the anonymity of a ring signature cannot be revoked, and because the group for a ring signature can be improvised (requires no prior setup).
+
+### Application to Monero
+
+A ring signature makes use of your @account keys and a number of public keys (also known as outputs) pulled from the @blockchain using a triangular distribution method. Over the course of time, past outputs could be used multiple times to form possible signer participants. In a "ring" of possible signers, all ring members are equal and valid. There is no way an outside observer can tell which of the possible signers in a signature group belongs to your @account. So, ring signatures ensure that transaction outputs are untraceable. Moreover, there are no fungibility issues with Monero given that every transaction output has plausible deniability (e.g. the network can not tell which outputs are spent or unspent).
 
 To read how Monero gives you privacy by default (unlinkability), see @stealth-addresses.

resources/research-lab/index.md

@@ -15,8 +15,8 @@ title: "Monero Research Lab"
                             <div class="col"><h2>Monero Research Lab Papers</h2></div>
                         </div>
                         <div class="tab">
-                              <input id="tab-one" type="checkbox" name="tabs" class="accordian" checked="checked">
+                              <input id="tab-one" type="checkbox" name="tabs" class="accordion" checked="checked">
-                              <label for="tab-one" class="accordian">MRL-0001: A Note on Chain Reactions in Traceability in CryptoNote 2.0</label>
+                              <label for="tab-one" class="accordion">MRL-0001: A Note on Chain Reactions in Traceability in CryptoNote 2.0</label>
                               <div class="tab-content">
                                 <p><strong>Abstract:</strong> This research bulletin describes a plausible attack on a ring-signature based
                                     anonymity system. We use as motivation the cryptocurrency protocol CryptoNote
@@ -38,8 +38,8 @@ title: "Monero Research Lab"
                               </div>
                             </div>
                             <div class="tab">
-                              <input id="tab-two" type="checkbox" name="tabs" class="accordian">
+                              <input id="tab-two" type="checkbox" name="tabs" class="accordion">
-                              <label for="tab-two" class="accordian">MRL-0002: Counterfeiting via Merkle Tree Exploits within Virtual Currencies Employing the CryptoNote Protocol</label>
+                              <label for="tab-two" class="accordion">MRL-0002: Counterfeiting via Merkle Tree Exploits within Virtual Currencies Employing the CryptoNote Protocol</label>
                               <div class="tab-content">
                                 <p><strong>Abstract:</strong> On 4 September 2014, an unusual and novel attack was executed against the
                                     Monero cryptocurrency network. This attack partitioned the network into two
@@ -58,8 +58,8 @@ title: "Monero Research Lab"
                               </div>
                             </div>
                             <div class="tab">
-                              <input id="tab-three" type="checkbox" name="tabs" class="accordian">
+                              <input id="tab-three" type="checkbox" name="tabs" class="accordion">
-                              <label for="tab-three" class="accordian">MRL-0003: Monero is Not That Mysterious</label>
+                              <label for="tab-three" class="accordion">MRL-0003: Monero is Not That Mysterious</label>
                               <div class="tab-content">
                                 <p><strong>Introduction:</strong> Recently, there have been some vague fears about the CryptoNote source code and
                                     protocol floating around the internet based on the fact that it is a more complicated
@@ -74,8 +74,8 @@ title: "Monero Research Lab"
                               </div>
                             </div>
                             <div class="tab">
-                              <input id="tab-four" type="checkbox" name="tabs" class="accordian">
+                              <input id="tab-four" type="checkbox" name="tabs" class="accordion">
-                              <label for="tab-four" class="accordian">MRL-0004: Improving Obfuscation in the CryptoNote Protocol</label>
+                              <label for="tab-four" class="accordion">MRL-0004: Improving Obfuscation in the CryptoNote Protocol</label>
                               <div class="tab-content">
                                 <p><strong>Abstract:</strong> We identify several blockchain analysis attacks available to degrade the
 untraceability of the CryptoNote 2.0 protocol. We analyze possible solutions,
@@ -106,8 +106,8 @@ results of internal investigation.<br>
                               </div>
                             </div>
                             <div class="tab">
-                              <input id="tab-five" type="checkbox" name="tabs" class="accordian">
+                              <input id="tab-five" type="checkbox" name="tabs" class="accordion">
-                              <label for="tab-five" class="accordian">MRL-0005: Ring Signature Confidential Transactions</label>
+                              <label for="tab-five" class="accordion">MRL-0005: Ring Signature Confidential Transactions</label>
                               <div class="tab-content">
                                 <p><strong>Abstract:</strong> This article introduces a method of hiding transaction amounts in the strongly
 decentralized anonymous cryptocurrency Monero. Similar to Bitcoin, Monero is a
@@ -153,7 +153,7 @@ This is the original cryptonote paper written by the cryptonote team. Reading it
 
 [Annotated Whitepaper](https://downloads.getmonero.org/whitepaper_annotated.pdf)
 
-The Monero Research Lab released an anotated version of the cryptonote whitepaper. This is sort of like an informal review of the claims that are made line-by-line of the whitepaper. It also explains some of the harder concepts in relatively easy to understand terms.
+The Monero Research Lab released an annotated version of the cryptonote whitepaper. This is sort of like an informal review of the claims that are made line-by-line of the whitepaper. It also explains some of the harder concepts in relatively easy to understand terms.
 
 [Surae Noether's Whitepaper Review](https://downloads.getmonero.org/whitepaper_review.pdf)
 
@@ -164,4 +164,4 @@ This paper is a formal review of the original cryptonote paper by MRL researcher
                 </div>
                 <!-- end right one-third block-->
             </div>
-</section>
+</section>

resources/technical-specs/index.md

@@ -0,0 +1,137 @@
+---
+layout: custom
+title: "Technical Specs"
+---
+
+<div class="about-monero">
+    <section class="container">
+        <div class="row">
+            <!-- left two-thirds block-->
+            <div class="full col-xs-12">
+                <div class="info-block text-adapt">
+
+                    <div class="row">
+                        <div class="col">
+                            <h3>No premine, no instamine, no token</h3>
+                        </div>
+                    </div>
+
+<div markdown="1">
+* Monero had no premine or instamine
+* Monero did not sell any token
+* Monero had no presale of any kind
+</div>
+
+                    <div class="row">
+                        <div class="col">
+                            <h3>Proof of Work</h3>
+                        </div>
+                    </div>
+
+<div markdown="1">
+* CryptoNight
+* may change in the future
+</div>
+
+                    <div class="row">
+                        <div class="col">
+                            <h3>Difficulty retarget</h3>
+                        </div>
+                    </div>
+
+<div markdown="1">
+* every block
+* based on the last 720 blocks, excluding 20% of the timestamp outliers
+</div>
+
+                    <div class="row">
+                        <div class="col">
+                            <h3>Block time</h3>
+                        </div>
+                    </div>
+
+<div markdown="1">
+* 2 minutes
+* may change in the future as long as emission curve is preserved
+</div>
+
+                    <div class="row">
+                        <div class="col">
+                            <h3>Block reward</h3>
+                        </div>
+                    </div>
+
+<div markdown="1">
+* smoothly decreasing and subject to penalties for blocks greater then median size of the last 100 blocks (M100)
+* see the [latest block](https://moneroblocks.info/) coinbase transaction amount for current reward
+</div>
+
+                    <div class="row">
+                        <div class="col">
+                            <h3>Block size</h3>
+                        </div>
+                    </div>
+
+<div markdown="1">
+* dynamic, maximum of 2 * M100
+</div>
+
+                    <div class="row">
+                        <div class="col">
+                            <h3>Emission curve</h3>
+                        </div>
+                    </div>
+
+<div markdown="1">
+* first, main curve: ~18.132 million coins by the end of May 2022
+* then, tail curve: 0.6 XMR per 2-minute block, kicks in once main emission is done, translates to <1% inflation decreasing over time
+* see [charts and details](https://www.reddit.com/r/Monero/comments/512kwh/useful_for_learning_about_monero_coin_emission/)
+</div>
+
+                    <div class="row">
+                        <div class="col">
+                            <h3>Max supply</h3>
+                        </div>
+                    </div>
+
+<div markdown="1">
+* infinite
+</div>
+
+                    <div class="row">
+                        <div class="col">
+                            <h3>Sender privacy</h3>
+                        </div>
+                    </div>
+
+<div markdown="1">
+* Ring signatures
+</div>
+
+                    <div class="row">
+                        <div class="col">
+                            <h3>Recipient privacy</h3>
+                        </div>
+                    </div>
+
+<div markdown="1">
+* Stealth addresses
+</div>
+
+                    <div class="row">
+                        <div class="col">
+                            <h3>Amount obfuscation</h3>
+                        </div>
+                    </div>
+
+<div markdown="1">
+* Ring confidential transactions
+</div>
+
+                </div>
+            </div>
+            <!-- end right one-third block-->
+        </div>
+        
+    </section>
+</div>

resources/user-guides/importing_blockchain.md

@@ -0,0 +1,61 @@
+---
+layout: static_page
+title: Importing the Monero Blockchain from an outside source 
+---
+
+# Importing the Blockchain to Monero GUI wallet (Windows)
+
+### Step 1
+
+Download the Current bootstrap from https://downloads.getmonero.org/blockchain.raw; you can skip this step if you are importing the Blockchain from another source.
+
+### Step 2
+
+Find the path of your Monero wallet (the folder where you extracted your wallet). For example mine is:
+
+`D:\monero-gui-0.10.3.1`
+
+Your path may be different depending on where you decided to download your wallet and what version of the Monero wallet you have.
+
+### Step 3
+
+Find the path of your downloaded Blockchain for example mine was: 
+
+`C:\Users\KeeJef\Downloads\blockchain.raw`
+
+Yours might be different depending on where you downloaded the Blockchain to.
+
+### Step 4
+
+Open a Command Prompt window. You can do this by pressing the Windows key + R, and then typing in the popup box `CMD`
+
+### Step 5
+
+Now you need to navigate using the CMD window to the path of your Monero wallet. You can do this by typing:
+
+`cd C:\YOUR\MONERO\WALLET\FILE\PATH\HERE` 
+
+It should look something like:
+
+`cd D:\monero-gui-0.10.3.1`
+
+If your Monero wallet is on another drive you can use `DriveLetter:` for example if your Monero wallet was on your D drive then before using the cd command you would do `D:`
+
+### Step 6
+
+Now type in your command prompt window:
+
+`monero-blockchain-import --verify 1 --input-file C:\YOUR\BLOCKCHAIN\FILE\PATH\HERE`
+
+For example I would type :
+
+`monero-blockchain-import --verify 1 --input-file C:\Users\KeeJef\Downloads\blockchain.raw`
+
+If you downloaded the Blockchain from a trusted, reputable source you may set `verify 0` this will reduce the amount of time to sync the Blockchain.  
+
+### Step 7
+
+After the the Blockchain has finished syncing up you can open your Monero wallet normally. Your downloaded blockchain.raw can be deleted. 
+
+
+Author: Kee Jefferys

resources/user-guides/index.md

@@ -16,6 +16,7 @@ title: "User Guides"
 
 [Monero Tools](monero_tools.html)
 [How to make an offline backup](Offline_Backup.html)
+[Importing the Monero blockchain](importing_blockchain.html)
 [How to run a node on VPS](vps_run_node.html)
 [Securely purchasing and storing Monero](securely_purchase.html)
 
@@ -35,6 +36,7 @@ title: "User Guides"
 [How to make a view-only wallet](view_only.html)
 [How to prove payment](prove-payment.html)
 [Restoring wallet from keys](restore_from_keys.html)
+[How to connect to a remote node within GUI wallet](remote_node_gui.html)
 
 </div>
             </div>
@@ -66,7 +68,9 @@ title: "User Guides"
                         <h2>Mining</h2>
                     </div>
                 </div>
-<div class="row start-xs text-center" markdown="1">
+<div class="row start-xs" markdown="1">
+
+[How to solo mine with the GUI](solo_mine_GUI.html)
 
 [How to mine on a pool with xmr-stak-cpu](mine-to-pool.html)
 
@@ -76,5 +80,50 @@ title: "User Guides"
             </div>
         </div>
     </div>
+    
+    
+    
 </section>
+<section class="container">
+    <div class="row">
+        <div class="left half no-pad-sm col-lg-6 col-md-6 col-sm-12 col-xs-12">
+            <div class="info-block">
+                <div class="row center-xs">
+                    <div class="col">
+                        <h2>Website</h2>
+                    </div>
+                </div>
+<div class="row start-xs" markdown="1">
+
+[General Web Edit Instructions (READ FIRST!)](website-general.html)
+[How to make a blog post](website-blog.html)
+[How to make a User Guide](website-user-guide.html)
+[How to make a Moneropedia entry](website-moneropedia.html)
+[How to make a FFS proposal](website-ffs.html)
+[How to update the Team page](website-team.html)
+[How to add update Events page](website-events.html)
+[How to update the Roadmap](website-roadmap.html)
+[How to add a new Merchant](website-merchants.html)
+[How to add a new question to the FAQ](website-faq.html)
+
 </div>
+            </div>
+        </div>
+        <div class="right half col-lg-6 col-md-6 col-sm-12 col-xs-12">
+            <div class="info-block">
+                <div class="row center-xs">
+                    <div class="col">
+                        <h2>Miscellaneous</h2>
+                    </div>
+                </div>
+<div class="row start-xs" markdown="1">
+Coming Soon
+</div>
+            </div>
+        </div>
+    </div>
+    
+    
+    
+</section>
+</div>

resources/user-guides/prove-payment.md

@@ -55,6 +55,8 @@ The information supplied by Alice plugs neatly instead of the placeholders. mone
 key to decode the transaction, and display how much this particular transaction sent to this address. Obviously,
 Charlie will want to double check with Bob the address is really his - same as with Bitcoin.
 
+Alternatively, the transaction key can be obtained in the GUI in the History tab. Click on details for each individual transaction to get the key.
+
 Note: if several transactions were made, this needs repeating for each such transaction.
 
 

resources/user-guides/remote_node_gui.md

@@ -0,0 +1,15 @@
+---
+layout: static_page
+title: How to use a remote node in the GUI wallet
+---
+
+## Finding a node
+First things first, you need to find a node to connect to! [moneroworld.com](https://moneroworld.com/#nodes) has some great resources for finding nodes. One of the easiest methods
+would be to use a node run by moneroworld, but they have a tool for finding random nodes too.
+
+## Connecting to the node from the GUI wallet
+After you enter your password for your wallet, you will see a pop up that will give you the option to "use custom settings". Click on it. You will then be
+sent to the "Settings" page in the GUI. At this point you should see two text boxes to the right of a label that says "Daemon address". In the first box (the on to the left) you need to enter the address of the node that you want to
+connect to. This address might look like `node.moneroworld.com` or it could look like any old ip address. The smaller box to the right is where you enter the node's port. The default port is `18081` but if you are using a random node the port that is used will vary. The port for node.moneroworld.com uses 18089.
+### Your screen should look a bit like this
+<img src="/resources/user-guides/png/remote_node/remote-node-screenshot.png" width="600">

resources/user-guides/solo_mine_GUI.md

@@ -0,0 +1,26 @@
+---
+layout: static_page
+title: "How to solo mine with the GUI"
+title-pre-kick: "Solo mining with the GUI"
+title-kick: ""
+title-post-kick: ""
+kick-class: ""
+icon: "icon_userguides"
+attribution: "<!-- Icon is based on work by Freepik (http://www.freepik.com) and is licensed under Creative Commons BY 3.0 -->"
+---
+
+It is very easy to solo mine with the official GUI. If you have not done so already, go to the <a href="/downloads/">Monero downloads page</a> and download the official GUI for your operating system. Then, run the setup and be patient as Monero synchronizes with the network. You should see that it displays "Connected" in the lower left corner.
+
+<img src="/resources/user-guides/png/solo_mine_GUI/01.PNG" style="width: 600px;"/>
+
+Click on the "Advanced" tab. You should see that several other options appear. Now click on the "Mining" sub-tab.
+
+<img src="/resources/user-guides/png/solo_mine_GUI/02.PNG" style="width: 600px;"/>
+
+You should now have an option to start mining. You can optionally change the number of threads to mine with. For optimal efficiency, you should mine with your CPU's cache divided by 2. You will need to look up your CPU's specs on the manufacturer's website. If you are unsure, leave the number of threads at 1. Click the "Start mining" button.
+
+<img src="/resources/user-guides/png/solo_mine_GUI/03.PNG" style="width: 600px;"/>
+
+You are now mining with the network, as you can see on the bottom of the image. In this example, the computer is contributing 23 H/s to the Monero network. Mining helps keep the network secure, and you may get lucky and receive a reward for protecting the network.
+
+To stop mining, simply click the "Stop mining" button.

resources/user-guides/website-blog.md

@@ -0,0 +1,34 @@
+---
+layout: static_page
+title: How to make a blog post
+---
+
+### Quick Start
+* Make new .md file in _posts (named whatever, no spaces)
+* Front Matter (below)
+* Write Blog Post
+* Test/Build
+* Submit PR
+
+### Make a file
+Navigate to the _posts folder of the website and make a new file. Be sure the file name has no spaces and the ending is .md
+
+### Front Matter
+```
+---
+layout: post
+title: CHANGE TO YOUR TITLE
+summary: A BRIEF ONE OR TWO SENTENCE SUMMARY
+tags:  [CHOOSE, RELEVANT, TAGS, AND, SEPARATE, THEM, BY, COMMAS, KEEP, THE, BRACKETS]
+author: YOUR NAME OR HANDLE HERE
+---
+```
+
+### Write
+After the front matter is finished you are free to write the remainder of your blog post in markdown. 
+
+### Build/Test
+Build your website using `jekyll serve` if it's not rebuilding automatically and test that your page appears in the 'News' section of the website, as well as the sidebars.
+
+### Submit Pull Request
+You're all done. Submit a PR and wait for it to be reviewed and merged. Be sure to make any changes if requested.

resources/user-guides/website-events.md

@@ -0,0 +1,38 @@
+---
+layout: static_page
+title: How to add an event
+---
+
+### 9.1 Edit the .yml file
+Navigate to the `/_data/` folder and open `events.yml`. You will notice a  list separated by hyphenated `-event` tags. 
+
+**DO NOT MESS WITH THE FORMATTING OR INDENTATION OF ANYTHING OR JEKYLL WILL NOT BUILD PROPERLY!**
+
+Find the area that you want to update and copy the code below:
+```
+- event:
+  where:
+  when:
+  description:
+  link:
+```
+and paste it IN THE CHRONOLOGICAL ORDER that it will be in. So if there is an event happening before yours, make sure it is higher up than yours. If there is an event happening AFTER yours, make sure it is after your event.
+
+Fill in the data as follows:
+* `event:` The name of the event goes here as well as the date. The recommended format is: `Event Name - January 1st, 2000`
+* `where:` Where the event will take place. Vanue name and address are recommended.
+* `when:` Date and time
+* `description:` Descriptoin of the happenings of your event
+* `link:` The website of your event (if applicable, this can be left blank and everything will be ok). This link must have http:// at the beginning if it is an external link.
+
+**Make sure the indentation is EXACTLY the same as the other proposals in the area. If it's not the jekyll build WILL fail.**
+
+Save the file.
+
+### 9.2 Build/Test
+Build your website using `jekyll serve` if it's not rebuilding automatically. If the build fails and you receive an error, you may have messed up somewhere in the `events.yml` file back in 9.1. Go back to that section and check the indentation. Yes, it's stupid. Yes, it has to be perfect.
+
+If the build is successful, go to the Events page `/community/events/` and check to see that the event is showing up in the correct place. Click their Event url link (if applicable) and make sure it redirects correctly. Test the page and let rehrar know if there are any bugs.
+
+### 9.3 Submit a Pull Request
+You're all done. Submit a PR and wait for it to be reviewed and merged. Be sure to make any changes if requested.

resources/user-guides/website-faq.md

@@ -0,0 +1,43 @@
+---
+layout: static_page
+title: How to add a question to the FAQ
+---
+
+### Copy/Paste Code
+Navigate to the `/get-started/faq` folder and open the `index.md` file. Inside you will see HTML code, but you will see it is very repetetive.
+
+Copy the code below:
+```
+<div class="tab">
+    <input id="tab-CHANGETHIS" type="checkbox" name="tabs" class="accordian">
+    <label for="tab-CHANGETHIS" class="accordian">CHANGE QUESTION</label>
+    
+<div class="tab-content" markdown="1">
+
+CHANGE ANSWER
+
+</div>
+
+</div>
+```
+And paste it at the very bottom of the file. Literally underneath everything else.
+
+Now we're going to change just a couple of things. Find the section with:
+```
+<input id="tab-CHANGETHIS" type="checkbox" name="tabs" class="accordian">
+<label for="tab-CHANGETHIS" class="accordian">CHANGE QUESTION</label>
+```
+
+and change the sections in between the quotes that say 'CHANGETHIS'. Leave the first part `tab-` alone. You can change it to anything really, as long as they are identical in the input and label, but it's good to see what number is on the last FAQ question (i.e. `tab-nine`) and make it the next number.
+
+Now inside the label tag you're going to find where it says 'CHANGE QUESTION' and change it to the Question you want answered.
+
+Lastly, find the words 'CHANGE ANSWER' and change it to the answer of your question. 
+
+**DO NOT MESS WITH THE INDENTATION HERE. The div that has `markdown=1` MUST be flush with the left side, the answer to the question must start flush with the left side, and the `</div>` MUST be flush with the left side. **
+
+### Build/Test
+Build your website using `jekyll serve` if it's not rebuilding automatically. If the build is successful, go to the FAQ page `/get-started/faq/` and check to see that your question is showing up and, when clicked, the answer drops down. If not, check to make sure that the `id="tab-CHANGETHIS"` in the input and the `for="CHANGETHIS"` in the label are identical to each other. Test the page and let rehrar know if there are any bugs.
+
+### Submit a Pull Request
+You're all done. Submit a PR and wait for it to be reviewed and merged. Be sure to make any changes if requested.

resources/user-guides/website-ffs.md

@@ -0,0 +1,72 @@
+---
+layout: static_page
+title: How to make a FFS proposal
+---
+
+### Quick Start
+
+* Read [How the Forum Funding System works](#) and the [Forum Funding System Terms and Guidelines](#).
+* Make the .md file in the /forum-funding-system/proposals folder. Remember the name.
+* Choose your front matter layout based on whether your proposal is an Idea (`ffs-ideas`) or Open Task (`ffs-ot`) as specified in the above reading
+* Fill out the rest of the Front Matter below, leaving the `address` and `paymentid` sections empty
+* Edit the ffs.yml file. I strongly recommend you read this section.
+* Write the proposal
+* Test/Build
+* Submit PR
+
+### Make the proposal
+
+Navigate to the /forum-funding-system/proposals folder and make a new file. Be sure the file name has no spaces and the ending is .md. It is very important that you remember the EXACT name of this file.
+
+### Front Matter
+
+```
+---
+layout: ffs-ideas OR ffs-ot
+title: NAME OF YOUR PROPOSAL
+summary: A BRIEF SUMMARY OF YOUR PROPOSAL
+author: YOUR NAME OR HANDLE
+address:
+paymentid:
+---
+```
+
+The layout will depend on if you are simply presenting an idea that you do not plan to do yourself or if you are presenting an idea that you are capable and willing to do, the chosen layout will be `ffs-ideas` or `ffs-ot` respectively. You can get more information in the [How the Forum Funding System works](#) User Guide. Fill out the next three sections as normal (title, summary, author), but leave the last two (address, paymentid) blank. Again, DO NOT PUT ANYTHING HERE.
+
+### Editing the .yml file
+
+Navigate to the /_data folder and open the file titled `ffs.yml`. In this file you will find a long list of FFS proposals. 
+
+**DO NOT MESS WITH THE FORMATTING OR INDENTATION OF ANYTHING OR JEKYLL WILL NOT BUILD PROPERLY!**
+
+Identify the section you will be placing your proposal in. If you used `ffs-ideas` in the layout variable in the front matter then you will be putting your proposal in `stage: ideas`, and if you used `ffs-ot` in the layout, then you will be putting your proposal in the `stage: Open Tasks`. Copy the following code:
+
+```
+- name:
+  url: /forum-funding-system/proposals/
+  summary:
+  author:
+```
+
+and paste it as the very top underneath the `proposals:`. 
+
+**Make sure the indentation is EXACTLY the same as the other proposals in the area. If it's not the jekyll build WILL fail. If in doubt, put the line with the hyphen (-name) all the way to the left and press space four time, and then put the remainder of the variables all the way to the left and press space six times.**
+
+Fill in the information. 
+* `name:` should be the same as the title chosen in 7.3  
+* for `url:` you should append the EXACT name of the file as chosen in 7.2 to the current string but with `.html` at the end instead of `.md`. So it should look like `/forum-funding-system/proposals/YOUR-FILE-NAME.html`
+* `summary:` should be the same summary copy and pasted from the front matter in 7.3
+* `author:` should be your name or handle, again the same as the front matter in 7.3
+
+Sorry for the repetition here, but it's how Jekyll is working to put things correctly.
+
+### Write the proposal
+Go ahead and write your proposal now. Go back to your .md file in `/forum-funding-system/proposals`. Be sure to follow the [Forum Funding System Terms and Guidelines](#). Let me be the first to thank you for wanting to contribute your time and energy to better Monero.
+
+### Build/Test
+Build your website using `jekyll serve` if it's not rebuilding automatically. If the build fails and you receive an error, you may have messed up somewhere in the `ffs.yml` file back in 7.4. Go back to that section and check the indentation. Yes, it's stupid. Yes, it has to be perfect.
+
+If the build is successful, go to the Forum Funding System section of the website and make sure that your proposal is showing up in the correct areas, and that when the linked is clicked it takes you to the correct page with your proposal. Use this time to read everything for accuracy and make any changes. If not, you will have to do multiple PRs to make edits and updates. It is this way by design so we can keep track of edits made by authors.
+
+### Submit a Pull Request
+You're all done. Submit a PR and wait for it to be reviewed and merged. Be sure to make any changes if requested.

resources/user-guides/website-general.md

@@ -0,0 +1,47 @@
+---
+layout: static_page
+title: General Website Instructions
+---
+
+### 1.0 Introduction
+
+Greetings everyone, this is rehrar. I'm here to walk you through everything you need to know to make changes, edits, or even completely new pages for the new getmonero.org website. It'll definitely be a bit of a ride, so strap yourself in. Please note that translations are not available yet, but when they are added, this document will be updated with instructions on how to translate the content of getmonero.org. In the meantime, any help translating this document into another language is greatly appreciated.
+
+If for any reason you have questions or need to contact us, you can find us on the IRC channel #monero. We'll do whatever we can to help you.
+
+### 2.0 What you'll need
+
+* Jekyll: Getmonero.org is made using a simple, static website generator called [Jekyll](https://jekyllrb.com/). You will need it installed on your system to test any changes that you made. If you're using a Linux-based system you can just follow the instructions on the website to get up and going. If you're using Windows, you will want to check out [this site](http://jekyll-windows.juthilo.com/) for instructions on how to get Jekyll working on your system.
+
+* GitHub: Pretty much everything in Monero is hosted on [GitHub](https://github.com) and uses Git as the primary version control system. If you're not familiar with how to use Git, you can check out [this tutorial](https://guides.github.com/activities/hello-world/) for a good overview. It will take you through pretty much everything you'll need to know to edit the website. If you haven't already, register for GitHub and fork the [Monero Website repository](https://github.com/monero-project/monero-site).
+
+* Markdown experience: To write pages, you're going to need to know how to use Markdown. It's basically a in-between language that enables people who don't know HTML to just write, and it will be compiled into HTML for you. You can find a great Markdown cheat sheet with examples [here](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet). IF you need more help, Google and YouTube are great resources.
+
+*Note: If you're confused, feel free to click other files in the same directory (folder) that you are in for the step that you are on to see some working examples. Compare them to the instructions and you should understand better.*
+
+* Jekyll Gems: The current iteration of the getmonero.org website uses the following plugins:
+  * [jekyll-paginate](https://jekyllrb.com/docs/pagination/)
+  * builder
+  * rubysl-rexml
+  * In the event that more gems are added, this documentation will be updated to reflect the changes needed to build the site.
+
+*Note:* To install them all at once, use the command: `gem install builder rubysl-rexml jekyll-paginate`
+
+Once you have the above list of things, it's typically a good idea to build the website from your local computer to make sure it works before you make any changes. To do this, complete the following steps:
+
+1. Navigate to the your local `monero-site` repository.
+2. Serve the website: `jekyll serve`
+3. Open a browser and go to [http://127.0.0.1:4000](http://127.0.0.1:4000).
+4. If all went well, you should see the Monero website and you're ready to make changes.
+
+### 3.0 General change recommendations
+
+The average Monero user that will want to contribute to the website should probably stick with making blog posts, user guides, Moneropedia entries, or a Forum Funding System proposal, all of which are covered in this document. If this is all you want to do, don't worry, it's actually not a daunting task at all. If you are not well versed in web development however, it is not recommended you try to do anything beyond that.
+
+If you are a web developer and would like to make large macro-level changes, it would be best to get in contact with rehrar. The HTML/CSS framework is custom, though quite easy to use for a seasoned developer. Still, there are some pages that are more complicated than others and would require fair amounts of styling changes should the structure change significantly.
+
+This website is completely open-source however, and anything and everything is available for changing should the community deem it necessary.
+
+Every section from here on out will talk about how to make a specific type of web page. It will start with a bullet point list of what to do for the advanced among you that just want a quick overview. For those who are still learning this list is followed by a detailed explanation, starting with example front matter. Any variable in the front matter written in all caps you are expected to change (make sure your changes are not all caps though). It will then lead you through the rest of the process until it's time to type your content.
+
+All external links must have http:// or https:// in front of them or they will not redirect properly.

resources/user-guides/website-merchants.md

@@ -0,0 +1,32 @@
+---
+layout: static_page
+title: How to add a new merchant
+---
+
+### Edit the .yml file
+Navigate to the `/_data/` folder and open `merchants.yml`. You will notice a list separated by hyphenated `-category` tags. 
+
+**DO NOT MESS WITH THE FORMATTING OR INDENTATION OF ANYTHING OR JEKYLL WILL NOT BUILD PROPERLY!**
+
+Find the category that best describes your business/service and copy the code below:
+```
+- name:
+  url:
+```
+and paste it in the correct category under the `merchants:` section.
+
+Fill in the data as follows:
+* `name:` The name of the the business/service.
+* `url:` The external url of the business/service. This link must have http:// (or https://) at the beginning if it is an external link.
+
+**Make sure the indentation is EXACTLY the same as the other proposals in the area. If it's not the jekyll build WILL fail.**
+
+Save the file.
+
+### Build/Test
+Build your website using `jekyll serve` if it's not rebuilding automatically. If the build fails and you receive an error, you may have messed up somewhere in the `merchants.yml` file back in 10.1. Go back to that section and check the indentation. Yes, it's stupid. Yes, it has to be perfect.
+
+If the build is successful, go to the Merchants page `/community/merchants/` and check to see that the business is showing up in the correct category and that the link is redirecting correctly. Test the page and let rehrar know if there are any bugs.
+
+### Submit a Pull Request
+You're all done. Submit a PR and wait for it to be reviewed and merged. Be sure to make any changes if requested.

resources/user-guides/website-moneropedia.md

@@ -0,0 +1,28 @@
+---
+layout: static_page
+title: How to add a Moneropedia entry
+---
+
+### Make a file
+Navigate to the /resources/moneropedia folder and make a new file. Be sure the file name has no spaces and the ending is .md
+
+### Front Matter
+```
+---
+layout: moneropedia
+entry: "PUT THE NAME OF THE TERM HERE IN QUOTE, THIS IS HOW IT WILL SHOW UP ON THE LANDING PAGE"
+terms: ["PUT", "TERMS", "HERE", "EXPLAINED", "BELOW"]
+summary: "PUT SUMMARY OF YOUR ENTRY HERE IN QUOTES"
+---
+```
+
+There is one thing to highlight. The `terms:` section of the front matter can be filled with as many terms as you would like. This is how other Moneropedia entries will link to this page. You can link to other Moneropedia entries as well in your page by putting an ampersand before the term used, i.e. `@THE-TERM-USED`. This will make an automatic link in the Moneropedia entry to the referred term, replace the @term with the word used in that terms `entry:` area of the front matter, and on hover it will show the summary. How cool is that?
+
+### Write
+Write your Moneropedia entry. Remember that you can link to other Moneropedia entries using `@term-used-in-entry` as described above. Just go to the .md file of the Moneropedia entry you want to link to and use any of the terms in the `terms:` field of the front matter. Be sure to write whichever one you choose EXACTLY as shown and preceded by an ampersand.
+
+### Build/Test
+Build your website using `jekyll serve` if it's not rebuilding automatically and test check the link to your entry is appearing on the alphabetical list of Moneropedia entries and that it leads to your entry when clicked. Test your Moneropedia entry in the browser and contact rehrar if there are any bugs.
+
+### Submit Pull Request
+You're all done. Submit a PR and wait for it to be reviewed and merged. Be sure to make any changes if requested.

resources/user-guides/website-roadmap.md

@@ -0,0 +1,34 @@
+---
+layout: static_page
+title: How to update the Roadmap
+---
+
+### Edit the .yml file
+Navigate to the `/_data/` folder and open `roadmap.yml`. You will notice a list separated by hyphenated `-year` tags. 
+
+**DO NOT MESS WITH THE FORMATTING OR INDENTATION OF ANYTHING OR JEKYLL WILL NOT BUILD PROPERLY!**
+
+Find the year that you want to update and copy the code below:
+```
+- name:
+  date:
+  status:
+```
+and paste it in the correct years `accomplishments:` section IN THE CHRONOLOGICAL ORDER that it will be in. So if there is a accomplishment that happened/is happening before the one you are inputting, make sure it is higher up than yours. If there is an accomplishment that happened/is happening AFTER yours, make sure it is after yours. If you don't have exact dates, just do your best to estimate.
+
+Fill in the data as follows:
+* `name:` The name of the accomplishment. Try to keep it short, a sentence or two at most.
+* `date:` When the accomplishment happened (past) or when it is expected to happen (future)
+* `status:` If the task is done, put `completed`, if the task is currently in the works put `ongoing`, and if work on the task has not yet started to your knowledge, but is expected to, put `upcoming`.
+
+**Make sure the indentation is EXACTLY the same as the other proposals in the area. If it's not the jekyll build WILL fail.**
+
+Save the file.
+
+### Build/Test
+Build your website using `jekyll serve` if it's not rebuilding automatically. If the build fails and you receive an error, you may have messed up somewhere in the `roadmap.yml` file back in 10.1. Go back to that section and check the indentation. Yes, it's stupid. Yes, it has to be perfect.
+
+If the build is successful, go to the Events page `/resources/roadmap/` and check to see that the newly added accomplishment is showing up in the correct place in the correct year. Test the page and let rehrar know if there are any bugs.
+
+### Submit a Pull Request
+You're all done. Submit a PR and wait for it to be reviewed and merged. Be sure to make any changes if requested.

resources/user-guides/website-team.md

@@ -0,0 +1,30 @@
+---
+layout: static_page
+title: How to update the Team page
+---
+
+If you are acting on behalf of another individual, please make sure you get their permission first before adding them onto the Team page.
+
+### Change the .yml file
+Navigate to the `/_data/` folder and open `team.yml`. You will notice a long list separated by main `-area:` tags. 
+
+**DO NOT MESS WITH THE FORMATTING OR INDENTATION OF ANYTHING OR JEKYLL WILL NOT BUILD PROPERLY!**
+
+Find the area that you want to update and copy the code below:
+```
+- name:
+  url:
+```
+Put the name or handle of the person in the `name` section and in the  `url:` section put the link to their GitHub URL (it must have https:// at the beginning). If they have no GitHub, then you may leave it blank, it won't mess anything up.
+
+**Make sure the indentation is EXACTLY the same as the other proposals in the area. If it's not the jekyll build WILL fail.**
+
+Save the file.
+
+### Build/Test
+Build your website using `jekyll serve` if it's not rebuilding automatically. If the build fails and you receive an error, you may have messed up somewhere in the `team.yml` file back in 8.1. Go back to that section and check the indentation. Yes, it's stupid. Yes, it has to be perfect.
+
+If the build is successful, go to the Team page `/community/team/` and check to see that the contributor is showing up in the correct place. Click their GitHub link (if applicable) and make sure it redirects correctly. Test the page and let rehrar know if there are any bugs.
+
+### Submit a Pull Request
+You're all done. Submit a PR and wait for it to be reviewed and merged. Be sure to make any changes if requested.

resources/user-guides/website-user-guide.md

@@ -0,0 +1,44 @@
+---
+layout: static_page
+title: How to make a User Guide
+---
+
+### Quick Start
+
+* Make file in /resources/user-guides with a .md ending and no spaces in filename.
+* Front Matter as in 5.3
+* Write User Guide
+* Add guide using markdown in the correct category in /resources/user-guides/index.md being careful not to mess with any indentation
+* Test/Build
+* Submit PR
+
+### Make a file
+Navigate to the /resources/user-guides folder and make a new file. Be sure the file name has no spaces and the ending is .md
+
+### Front Matter
+```
+---
+layout: static_page
+title: TITLE OF YOUR USER GUIDE
+---
+```
+
+### Write
+Write your user guide. Be succinct but thorough. Remember, people will be using your guides when they need help. Make sure all the information is there. Feel free to use images or screenshots if necessary to help get your point across.
+
+### Add Guide to the 'User Guide' landing page
+In the /resources/user-guides folder, find the file labeled index.md and open it. 
+
+DO NOT CHANGE ANYTHING IN THIS DOCUMENT BESIDES WHAT YOU ARE INSTRUCTED TO.
+
+This file will look quite different because it's HTML. Don't panic. Simply Ctrl + F (i.e. the find feature) and search for the category that you want to put your User Guide in. You will see there are some sections that are not indented like the others. They are flush with the left side of the screen. **Do not change the indentation.** You can put markdown in these areas.
+
+Once you've identified the non-indented area under the category you would like your User Guide to be under, you can use markdown to insert your link underneath the others. `[TITLE OF USER GUIDE](LINK-TO-USER-GUIDE.html)`. Please note that the file name in between the paranthases must be EXACTLY the same name as the file name you made in step 5.2, but with a `.html` at the end instead of `.md`.
+
+In the event that you think your User Guide should be in a new Category that doesn't exist yet, contact rehrar to make one for you.
+
+### Build/Test
+Build your website using `jekyll serve` if it's not rebuilding automatically and test that your link appears in the correct category and that it leads to your User Guide when clicked. Test your User Guide in the browser and contact rehrar if there are any bugs.
+
+### Submit Pull Request
+You're all done. Submit a PR and wait for it to be reviewed and merged. Be sure to make any changes if requested.

resources/vrp/index.md

@@ -0,0 +1,145 @@
+---
+layout: static_page
+title: "Vulnerability Response Process"
+icon: "icon_people"
+attribution: "<!-- Icon is based on work by Freepik (http://www.freepik.com) and is licensed under Creative Commons BY 3.0 -->"
+---
+
+# Monero Site Vulnerability Response Process
+
+## Preamble
+
+Researchers/Hackers: while you research/hack, we ask that you please refrain from committing the following:
+- Denial of Service / Active exploiting against the network
+- Social Engineering of Monero staff or contractors
+- Any physical or electronic attacks against Monero community property and/or data centers
+
+## I. Points of Contact for Security Issues
+
+```
+ric@getmonero.org
+BDA6 BD70 42B7 21C4 67A9  759D 7455 C5E3 C0CD CEB9
+
+luigi1111@getmonero.org
+8777 AB8F 778E E894 87A2  F8E7 F4AC A018 3641 E010
+```
+
+## II. Security Response Team
+
+- fluffypony
+- luigi1111
+
+## III. Incident Response
+
+1. Researcher submits report via one or both of two methods:
+    - a. Email
+    - b. [HackerOne](https://hackerone.com/monero)
+
+2. Response Team designates a Response Manager who is in charge of the particular report based on availability and/or knowledge-set
+
+3. In no more than 3 working days, Response Team should gratefully respond to researcher using only encrypted, secure channels
+
+4. Response Manager makes inquiries to satisfy any needed information to confirm if submission is indeed a vulnerability
+    - a. If submission proves to be vulnerable, proceed to next step
+    - b. If not vulnerable:
+      - i. Response Manager responds with reasons why submission is not a vulnerability
+      - ii. Response Manager moves discussion to a new or existing ticket on GitHub if necessary
+
+5. If over email, Response Manager opens a HackerOne issue for new submission
+
+6. Establish severity of vulnerability:
+    - a. HIGH: impacts site as a whole, has potential to break entire site, results in the loss of user-data, or is on a scale of great catastrophe
+    - b. MEDIUM: impacts individual users, or must be carefully exploited
+    - c. LOW: is not easily exploitable
+
+7. Respond according to the severity of the vulnerability:
+    - a. HIGH severities must be notified on website and reddit /r/Monero within 3 working days of classification
+      - i. The notification should list appropriate steps for users to take, if any
+      - ii. The notification must not include any details that could suggest an exploitation path
+      - iii. The latter takes precedence over the former
+    - b. LOW and MEDIUM and HIGH severities will require a rolling release update of the site
+
+8. Response Team applies appropriate patch(es)
+    - a. Response Manager designates a PRIVATE git "hotfix branch" to work in
+    - b. Patches are reviewed with the researcher
+    - c. Any messages associated with PUBLIC commits during the time of review should not make reference to the security nature of the PRIVATE branch or its commits
+    - d. Vulnerability announcement is drafted
+      - i. Include the severity of the vulnerability
+      - ii. Include all vulnerable systems/apps/code
+      - iii. Include solutions (if any) if patch cannot be applied
+    - e. Release date is discussed
+
+9. At release date, Response Team coordinates with developers to finalize update:
+    - a. Response Manager propagates the "hotfix branch" to trunk
+    - b. Response Manager includes vulnerability announcement draft in release notes
+    - c. Proceed with the Point or Regular Release
+
+## IV. Post-release Disclosure Process
+
+1. Response Team has 90 days to fulfill all points within section III
+
+2. If the Incident Response process in section III is successfully completed:
+    - a. Response Manager contacts researcher and asks if researcher wishes for credit
+    - b. Finalize vulnerability announcement draft and include the following:
+      - i. Project name and URL
+      - ii. Versions known to be affected
+      - iii. Versions known to be not affected (for example, the vulnerable code was introduced in a recent version, and older versions are therefore unaffected)
+      - iv. Versions not checked
+      - v. Type of vulnerability and its impact
+      - vi. If already obtained or applicable, a CVE-ID
+      - vii. The planned, coordinated release date
+      - viii. Mitigating factors (for example, the vulnerability is only exposed in uncommon, non-default configurations)
+      - ix. Workarounds (configuration changes users can make to reduce their exposure to the vulnerability)
+      - x. If applicable, credits to the original reporter
+    - c. Release finalized vulnerability announcement on website and reddit /r/Monero
+    - d. For HIGH severities, release finalized vulnerability announcement on well-known mailing lists:
+      - i. oss-security@lists.openwall.com
+      - ii. bugtraq@securityfocus.com
+    - e. If applicable, developers request a CVE-ID
+      - i. The commit that applied the fix is made reference too in a future commit and includes a CVE-ID
+
+3. If the Incident Response process in section III is *not* successfully completed:
+    - a. Response Team and developers organize an IRC meeting to discuss why/what points in section III were not resolved and how the team can resolve them in the future
+    - b. Any developer meetings immediately following the incident should include points made in section V
+    - c. If disputes arise about whether or when to disclose information about a vulnerability, the Response Team will publicly discuss the issue via IRC and attempt to reach consensus
+    - d. If consensus on a timely disclosure is not met (no later than 90 days), the researcher (after 90 days) has every right to expose the vulnerability to the public
+
+## V. Incident Analysis
+
+1. Isolate codebase
+    - a. Response Team and developers should coordinate to work on the following:
+      - i. Problematic implementation of classes/libraries/functions, etc.
+      - ii. Focus on apps/distro packaging, etc.
+      - iii. Operator/config error, etc.
+
+2. Auditing
+    - a. Response Team and developers should coordinate to work on the following:
+      - i. Auditing of problem area(s) as discussed in point 1
+      - ii. Generate internal reports and store for future reference
+      - iii. If results are not sensitive, share with the public via IRC or GitHub
+
+3. Response Team has 45 days following completion of section III to ensure completion of section V
+
+## VI. Resolutions
+
+Any further questions or resolutions regarding the incident(s) between the researcher and response + development team after public disclosure can be addressed via the following:
+
+- [GitHub](https://github.com/monero-project/monero/issues/)
+- [HackerOne](https://hackerone.com/monero)
+- [Reddit /r/Monero](https://reddit.com/r/Monero/)
+- IRC
+- Email
+
+## VII. Continuous Improvement
+
+1. Response Team and developers should hold annual meetings to review the previous year's incidents
+
+2. Response Team or designated person(s) should give a brief presentation, including:
+    - a. Areas of Monero affected by the incidents
+    - b. Any network downtime or monetary cost (if any) of the incidents
+    - c. Ways in which the incidents could have been avoided (if any)
+    - d. How effective this process was in dealing with the incidents
+
+3. After the presentation, Response Team and developers should discuss:
+    - a. Potential changes to development processes to reduce future incidents
+    - b. Potential changes to this process to improve future responses