Unverified Commit 3851424f authored by Riccardo Spagni's avatar Riccardo Spagni
Browse files

various fixes, changes to current moneropedia placeholders

parent 1d44b84e
......@@ -15,7 +15,7 @@ Monero works a little differently to what you may have become accustomed to from
However, because Monero has stealth addresses there is no need to have separate recipient addresses for each payment or user, and a single wallet address can be published. Instead, when receiving payments a merchant will provide the person paying with a "payment ID".
A payment ID is a hexadecimal string that is 64 characters long, and is normally randomly created by the merchant. An example of a payment ID is: <span style="word-break: break-all; word-wrap: break-word;">666c75666679706f6e7920697320746865206265737420706f6e792065766572</span>
A payment ID is a hexadecimal string that is 64 characters long, and is normally randomly created by the merchant. An example of a payment ID is: <span class="long-term">666c75666679706f6e7920697320746865206265737420706f6e792065766572</span>
### Checking for a Payment in simplewallet
......
......@@ -18,7 +18,7 @@ Ongoing development of the Monero Project is solely supported by donations and s
If you would like to make a donation you can do so by using any of the methods below:
- Donating in Monero: you can send XMR donations to [donate.getmonero.org](monero:46BeWrHpwXmHDpDEUmZBWZfoQpdc6HaERCNmx1pEYL2rAcuwufPN9rXHHtyUA4QVy66qeFQkn6sfK8aHYjA3jk3o1Bv16em?recipient_name=Monero%20Development&tx_description=Donation%20to%20Monero%20Core%20Team), or directly to our Monero donation address -
<span style="word-break: break-all; word-wrap: break-word;">[46BeWrHpwXmHDpDEUmZBWZfoQpdc6HaERCNmx1pEYL2rAcuwufPN9rXHHtyUA4QVy66qeFQkn6sfK8aHYjA3jk3o1Bv16em](monero:46BeWrHpwXmHDpDEUmZBWZfoQpdc6HaERCNmx1pEYL2rAcuwufPN9rXHHtyUA4QVy66qeFQkn6sfK8aHYjA3jk3o1Bv16em?recipient_name=Monero%20Development&tx_description=Donation%20to%20Monero%20Core%20Team)</span>
<span class="long-term">[46BeWrHpwXmHDpDEUmZBWZfoQpdc6HaERCNmx1pEYL2rAcuwufPN9rXHHtyUA4QVy66qeFQkn6sfK8aHYjA3jk3o1Bv16em](monero:46BeWrHpwXmHDpDEUmZBWZfoQpdc6HaERCNmx1pEYL2rAcuwufPN9rXHHtyUA4QVy66qeFQkn6sfK8aHYjA3jk3o1Bv16em?recipient_name=Monero%20Development&tx_description=Donation%20to%20Monero%20Core%20Team)</span>
- Donating in Bitcoin: you can also send BTC donations to [donate.getmonero.org](bitcoin:1FhnVJi2V1k4MqXm2nHoEbY5LV7FPai7bb?label=Monero%20Development&message=Donation%20to%20Monero%20Core%20Team), or directly to our Bitcoin address: [1FhnVJi2V1k4MqXm2nHoEbY5LV7FPai7bb](bitcoin:1FhnVJi2V1k4MqXm2nHoEbY5LV7FPai7bb?label=Monero%20Development&message=Donation%20to%20Monero%20Core%20Team)
- To donate via credit card, wire transfer, or PayPal, please email the core team at [{{ site.email }}](mailto:{{ site.email }})
......
......@@ -7,3 +7,4 @@ summary: ""
### The Basics
{{ page.summary | capitalize }}.
\ No newline at end of file
......@@ -7,9 +7,9 @@ summary: "either an alias, such as donate.getmonero.org, or a set of 95 characte
### The Basics
When you send Monero to someone you only need one piece of information, and that is their Monero address. A *raw* Monero address is a set of 95 characters starting with a 4. The Monero donation address, for instance, is <span style="word-break: break-all; word-wrap: break-word;">46BeWrHpwXmHDpDEUmZBWZfoQpdc6HaERCNmx1pEYL2rAcuwufPN9rXHHtyUA4QVy66qeFQkn6sfK8aHYjA3jk3o1Bv16em</span>.
When you send Monero to someone you only need one piece of information, and that is their Monero address. A *raw* Monero address is a set of 95 characters starting with a 4. The Monero donation address, for instance, is <span class="long-term">46BeWrHpwXmHDpDEUmZBWZfoQpdc6HaERCNmx1pEYL2rAcuwufPN9rXHHtyUA4QVy66qeFQkn6sfK8aHYjA3jk3o1Bv16em</span>.
Because those addresses are long and complex you will often encounter an @openalias address instead. For example, Monero donations can be sent to <span style="word-break: break-all; word-wrap: break-word;">[email protected]</span> or <span style="word-break: break-all; word-wrap: break-word;">donate.getmonero.org</span>
Because those addresses are long and complex you will often encounter an @openalias address instead. For example, Monero donations can be sent to <span class="long-term">[email protected]</span> or <span class="long-term">donate.getmonero.org</span>
If you would like to get an @openalias address of your own then there is some information on the [OpenAlias page](/knowledge-base/openalias).
......@@ -7,3 +7,4 @@ summary: "a distributed ledger of all transactions both past and present, withou
### The Basics
{{ page.summary | capitalize }}.
\ No newline at end of file
......@@ -7,3 +7,4 @@ summary: "Monero sent as part of a transaction, but unique in that returns to yo
### The Basics
{{ page.summary | capitalize }}.
\ No newline at end of file
---
layout: moneropedia
entry: "Consensus"
terms: ["consensus", "consensus-network"]
summary: "consensus describes a property of distributed networks like Monero where most of the participants follow the rules, and thus reject bad participants"
---
### The Basics
{{ page.summary | capitalize }}.
\ No newline at end of file
......@@ -10,3 +10,4 @@ attribution: "<!-- Icon is based on work by Freepik (http://www.freepik.com) and
---
### Work in Progress
---
layout: moneropedia
entry: "Mnemonic Seed"
terms: ["mnemonic-seed", "mnemonic"]
summary: "a 13 or 25 word phrase used to backup a Monero account, available in a number of languages"
---
### The Basics
{{ page.summary | capitalize }}.
\ No newline at end of file
---
layout: moneropedia
entry: "Ring Signature"
terms: ["ring-signature", "ring-signatures"]
summary: "a group of cryptographic signatures with at least one real participant, but no way to tell which in the group is the real one as they all appear valid"
---
### The Basics
{{ page.summary | capitalize }}.
\ No newline at end of file
......@@ -7,3 +7,4 @@ summary: "a cryptographically signed container that details the transfer of Mone
### The Basics
{{ page.summary | capitalize }}.
\ No newline at end of file
......@@ -7,3 +7,4 @@ summary: "a special transaction where the recipient can only spend the funds aft
### The Basics
{{ page.summary | capitalize }}.
\ No newline at end of file
......@@ -51,7 +51,7 @@ if (isset($_COOKIE["MONERO_LANG"]))
</div>
<div class="col-md-4">
<ul class="nav nav-pills nav-stacked flag-select">
<li><h3><img class="flag" src="//static.getmonero.org/images/flags/allflags.png"> More coming...</h3></li>
<li><h3 style="line-height: 50px; padding: 10px 20px;"><img class="flag" src="//static.getmonero.org/images/flags/allflags.png"> More to come...</h3></li>
</ul>
</div>
</div>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment