Commit ad3809c8 authored by Riccardo Spagni's avatar Riccardo Spagni Committed by GitHub
Browse files

Merge pull request #369 from QuickBASIC/text-revisions-0

Minor spelling/grammar revisions
parents a54f472c 43c09900
......@@ -15,7 +15,7 @@ title: "Error 404, Page Not Found"
<div class="top-left">
<div class="not-found-text">
<h1 class="not-found-text">Oh no, we couldn't find anything for that link!</h1>
<h1 class="not-found-text">Oh no! We couldn't find anything for that link!</h1>
</div>
</div>
......
......@@ -23,7 +23,7 @@
name: i2p
- slug: i8n
name: Internationalisation
name: Internationalization
- slug: rpc
name: RPC API
......
......@@ -42,9 +42,9 @@ If you need to check for payments programmatically, then details follow the next
* Communicate the payment ID and Monero address to the individual who is making payment
* Check for the payment using the "payments" command in monero-wallet-cli
### Checking for a Payment Programatically
### Checking for a Payment Programmatically
In order to check for a payment programatically you can use the get_payments or get_bulk_payments JSON RPC API calls.
In order to check for a payment programmatically you can use the get_payments or get_bulk_payments JSON RPC API calls.
*get_payments*: this requires a payment_id parameter with a single payment ID.
......
......@@ -37,7 +37,7 @@ title: Mining Monero
</div>
</div>
<div class="row center-xs">
<p>One of the common ways to mine Monero is to join a pool, although <a href="">mining solo is possible and encouraged.</a> A Monero community member has put together a <a href="http://moneropools.com/">list of trusted Monero pools</a> for you to consider. Remember, join a smaller pool to spread the hashes around!</p>
<p>One of the common ways to mine Monero is to join a pool, although <a href="">mining solo is possible and encouraged.</a> A Monero community member has put together a <a href="http://moneropools.com/">list of trusted Monero pools</a> for you to consider. Remember; join a smaller pool to spread the hashes around!</p>
</div>
</div>
</div>
......@@ -49,7 +49,7 @@ title: Mining Monero
</div>
</div>
<div class="row center-xs">
<p>Some people choose to invest in specalized mining hardware in order to increase their mining hashrate. A Monero community member has decided to put together a <a href="http://monerobenchmarks.info/">site for the benchmarks of different GPUs</a>. Results may vary. Feel free to contribute</p>
<p>Some people choose to invest in specialized mining hardware in order to increase their mining hashrate. A Monero community member has decided to put together a <a href="http://monerobenchmarks.info/">site for the benchmarks of different GPUs</a>. Results may vary. Feel free to contribute</p>
</div>
</div>
</div>
......@@ -66,7 +66,7 @@ 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 your hashrate. Please note, that some miners also have developer fees.</p>
<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">
......
......@@ -5,7 +5,7 @@ title: Legal
### The Monero Project
The majority of the content on this website, including the Monero logo and our Monero Missive podcast, is released under the CC BY-SA 4.0 license (the [Creative Commons Attribution-ShareAlike 4.0 International license](https://creativecommons.org/licenses/by-sa/4.0/)). This means that you can copy and redistribute the material in any medium or format, and remix, transform, and build upon the material for any purpose, even commercially. However, when doing so you must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests The Monero Project endorses you or your use.
The majority of the content on this website, including the Monero logo and our Monero Missive podcast, is released under the CC BY-SA 4.0 license (the [Creative Commons Attribution-ShareAlike 4.0 International license](https://creativecommons.org/licenses/by-sa/4.0/)). This means that you can copy and redistribute the material in any medium or format, and remix, transform, and build upon the material for any purpose, even commercially. However when doing so, you must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests The Monero Project endorses you or your use.
### Icons and Other Attributed Items
......
......@@ -56,7 +56,7 @@ The Monero Project takes many precautions to ensure the files available for down
### Sponsors and Advertisers are Not Endorsed
Though we seek to partner with quality companies, we are not responsible for the claims or representations made by sponsors and advertisers. The Monero Project does not review, endorse or recommend the products or services of any company mentioned on our site. We will not be liable in any way for damages of any kind resulting out of the misuse of any personal information or data submitted by you to an sponsor or advertiser.
Though we seek to partner with quality companies, we are not responsible for the claims or representations made by sponsors and advertisers. The Monero Project does not review, endorse or recommend the products or services of any company mentioned on our site. We will not be liable in any way for damages of any kind resulting out of the misuse of any personal information or data submitted by you to a sponsor or advertiser.
### Offsite Links
......@@ -164,7 +164,7 @@ The Monero Project uses Google Analytics to collect usage and visitor data for t
The Google Analytics data is used to provide statistics on the website and help us to improve the content and the information flow.
Server logs are used to analyse errors and diagnose requests to dead links. A portion of the server logs are used to gather statistics on Monero downloads in order to help us better understand our user's needs.
Server logs are used to analyze errors and diagnose requests to dead links. A portion of the server logs are used to gather statistics on Monero downloads in order to help us better understand our user's needs.
</div>
</div>
</div>
......
......@@ -29,7 +29,7 @@ The private keys for both of these must be protected by you in order to retain y
### Backing Up Your Account
When you have manage your own Monero Account with the private @spend-key, you are solely responsible for the security of your funds. Thankfully, Monero makes it very easy to backup your account. When creating a Monero account for the first time you will be given a unique @mnemonic-seed for your account that consists of 13 or 25 words in the language of your choosing. **This seed is the only thing you need to backup for your account**, and so it is imperative that it is written down and stored securely. Never store this seed in a form or location that would allow someone else to see it!
When you manage your own Monero Account with the private @spend-key, you are solely responsible for the security of your funds. Thankfully, Monero makes it very easy to backup your account. When creating a Monero account for the first time you will be given a unique @mnemonic-seed for your account that consists of 13 or 25 words in the language of your choosing. **This seed is the only thing you need to backup for your account**, and so it is imperative that it is written down and stored securely. Never store this seed in a form or location that would allow someone else to see it!
{:.cli-code}
List of available languages for your wallet's seed:
......
......@@ -2,7 +2,7 @@
layout: moneropedia
entry: "Airgap"
terms: ["airgap"]
summary: "An airgap is a security measure to physically seperate a computer or device from all other networks, such as the Internet."
summary: "An airgap is a security measure to physically separate a computer or device from all other networks, such as the Internet."
---
### The Basics
......
......@@ -7,7 +7,7 @@ summary: "a distributed ledger of all transactions both past and present, withou
---
### The Basics
A @blockchain is a distributed database that continuously grows with a record of all of the transactions that have occurred with a given cryptocurrency. This database is often referred to as a ledger because the data contains a large list of transctions that have taken place. In Monero, these transactions are packaged together into 'blocks' every 2 minutes (on average) and all miners and nodes on the network have copies of these blocks.
A @blockchain is a distributed database that continuously grows with a record of all of the transactions that have occurred with a given cryptocurrency. This database is often referred to as a ledger because the data contains a large list of transactions that have taken place. In Monero, these transactions are packaged together into 'blocks' every 2 minutes (on average) and all miners and nodes on the network have copies of these blocks.
### Monero's @Blockchain
Unlike Bitcoin and other cryptocurrencies, transactions in the Monero @blockchain do not reveal where funds came from or went to, providing anonymity and making the currency completely @fungible. Additionaly, the amounts of all transactions are hidden by @RingCT, a feature of Monero. For auditing or other transparency purposes a user can share a @view-key to prove they control certain amounts of @Moneroj.
Unlike Bitcoin and other cryptocurrencies, transactions in the Monero @blockchain do not reveal where funds came from or went to, providing anonymity and making the currency completely @fungible. Additionally, the amounts of all transactions are hidden by @RingCT, a feature of Monero. For auditing or other transparency purposes a user can share a @view-key to prove they control certain amounts of @Moneroj.
......@@ -7,7 +7,7 @@ summary: "property of a currency whereby two units can be substituted in place o
### The Basics
Fungibility means that two units of a currency can be mutually substituted and the substituted currency is equal to another unit of the same size. For example, two $10 bills can be exchanged and they are functionally identical to any other $10 bills in circulation (although $10 bills have unique ID numbers and are therefore not completely fungible). Gold is probably a closer example of true fungibility, where any 1 oz. of gold of the same grade is worth the same as another 1 oz of gold. Monero is fungible due to the nature of the currency which provides no way to link transactions together nor trace the history of any perticular XMR. 1 XMR is functionally identical to any other 1 XMR.
Fungibility means that two units of a currency can be mutually substituted and the substituted currency is equal to another unit of the same size. For example, two $10 bills can be exchanged and they are functionally identical to any other $10 bills in circulation (although $10 bills have unique ID numbers and are therefore not completely fungible). Gold is probably a closer example of true fungibility, where any 1 oz. of gold of the same grade is worth the same as another 1 oz of gold. Monero is fungible due to the nature of the currency which provides no way to link transactions together nor trace the history of any particular XMR. 1 XMR is functionally identical to any other 1 XMR.
Fungibility is an advantage Monero has over Bitcoin and almost every other cryptocurrency, due to the privacy inherent in the Monero @blockchain and the permanently traceable nature of the Bitcoin blockchain. With Bitcoin, any BTC can be tracked by anyone back to it's creation @coinbase-transaction. Therefore, if a coin has been used for an illegal purpose in the past, this history will be contained in the @blockchain in perpetuity. This lack of fungibility means that certain businesses will be obligated to avoid accepting BTC that have been previously used for purposes which are illegal, or simply run afoul of their Terms of Service. Currently some large Bitcoin companies are blocking, suspending, or closing accounts that have received Bitcoin used in online gambling or other purposes deemed unsavory by said companies.
......
......@@ -25,7 +25,7 @@ As recent as October of 2016, [#tor-dev](https://oftc.net/WebChat/) has offered
>during the free haven brainstorming, there was a moment where we described a routing mechanism, and somebody said "garlic routing!", and everybody laughed.
so we for sure thought we had invented the name, at the time.
*Note: permission to use the aforementioned quotes were granted by Nick Mathewson and Roger Dingledine*
*Note: permission to use the aforementioned quotes was granted by Nick Mathewson and Roger Dingledine*
### In-depth Information
......
......@@ -13,7 +13,7 @@ Monero is powered strictly by Proof of Work. It employs a mining algorithm that
The smart mining feature allows transparent CPU mining on the user's computer, far from the de facto centralization of mining farms and pool mining, pursuing Satoshi Nakamoto's original vision of a true P2P currency.
As of June 2017, botnets made of hacked computers account for a not-insignificant portion of the miners on the Monero network. This is due to the profitibility of mining on CPUs via the @CryptoNight algorithm.
As of June 2017, botnets made of hacked computers account for a not-insignificant portion of the miners on the Monero network. This is due to the profitability of mining on CPUs via the @CryptoNight algorithm.
......
......@@ -11,9 +11,9 @@ The Monero Core Team released a standard called OpenAlias which permits much mor
OpenAlias seeks to provide a way to simplify aliasing amidst a rapidly shifting technology climate. Users are trying to cross the bridge to private and cryptographically secure infrastructure and systems, but many of them have just barely started remembering the email addresses of their friends and family.
As part of the ongoing development of the Monero cryptocurrency project, we asked ourselves: how can we simplify payments for users unfamiliar with cryptocurrency? Monero stealth addresses are at least 95 characters long - memorising them is not an option, and asking someone to send a payment to <95-character-string> is only going to lead to confusion.
As part of the ongoing development of the Monero cryptocurrency project, we asked ourselves: how can we simplify payments for users unfamiliar with cryptocurrency? Monero stealth addresses are at least 95 characters long - memorizing them is not an option, and asking someone to send a payment to <95-character-string> is only going to lead to confusion.
At its most basic, OpenAlias is a TXT DNS record on a FQDN (fully qualified domain name). By combining this with DNS-related technologies we have created an aliasing standard that is extensible for developers, intuitive and familiar for users, and can interoperate with both centralised and decentralised domain systems.
At its most basic, OpenAlias is a TXT DNS record on a FQDN (fully qualified domain name). By combining this with DNS-related technologies we have created an aliasing standard that is extensible for developers, intuitive and familiar for users, and can interoperate with both centralized and decentralized domain systems.
{{ page.summary | capitalize }}.
......
......@@ -16,7 +16,7 @@ The Payment ID is usually used to identify transactions to merchants and exchang
Since the 0.9 Hydrogen Helix version, the Payment IDs can be encrypted and embedded in a payment address. The payment ID's of this type should be 64-bits and are encrypted with a random one-time key known only to the sender and receiver.
### Creating a Payment ID
It is recommented to use the official wallet's `integrated_address` command to automatically generate Integrated Addresses that contain Compact Payment ID's. If you want to use the command line, you can generate Payment ID's as follows:
It is recommended to use the official wallet's `integrated_address` command to automatically generate Integrated Addresses that contain Compact Payment ID's. If you want to use the command line, you can generate Payment ID's as follows:
Creating a compact Payment ID for an Integrated Address:
```# openssl rand -hex 8```
......
......@@ -8,7 +8,7 @@ summary: "The method of which Kovri uses to bootstrap into the I2P network"
### The Basics
When you start @Kovri for the first time (or if its been offline for a long time), @Kovri will need a list of peers to connect to so it can [bootstrap](https://en.wikipedia.org/wiki/Bootstrap) into the @I2P network. @Kovri gets these peers from a special file stored on a reseed server. On this file are all the various pieces of information @Kovri needs in order to connect with @I2P peers.
When you start @Kovri for the first time (or if it's been offline for a long time), @Kovri will need a list of peers to connect to so it can [bootstrap](https://en.wikipedia.org/wiki/Bootstrap) into the @I2P network. @Kovri gets these peers from a special file stored on a reseed server. On this file are all the various pieces of information @Kovri needs in order to connect with @I2P peers.
### In-depth information
......
......@@ -9,7 +9,7 @@ summary: "automatic one-time addresses for every transaction"
Stealth addresses are an important part of Monero's inherent privacy. They allow and require the sender to create random one-time addresses for every @transaction on behalf of the recipient. The recipient can publish just one address, yet have all of his/her incoming payments go to unique addresses on the @blockchain, where they cannot be linked back to either the recipient's published address or any other transactions' addresses. By using stealth addresses, only the sender and receiver can determine where a payment was sent.
When you create a Monero account you’ll have a private @view-key, a private @spend-key, and a Public Address. The @spend-key is used to send payments, the @view-key is used to display incoming transactions destined for your account, and the Public Address is for receiving payments. Both the @spend-key and @view-key are used to build your monero address. You can have a “watch only” wallet that only uses the @view-key. This feature can be used for accounting or auditing purposes but is currently unreliable due to the inability to track outgoing transactions. You can decide who can see your Monero balance by sharing your @view-key. Monero is private by default and optionally semi-transparent!
When you create a Monero account you’ll have a private @view-key, a private @spend-key, and a Public Address. The @spend-key is used to send payments, the @view-key is used to display incoming transactions destined for your account, and the Public Address is for receiving payments. Both the @spend-key and @view-key are used to build your Monero address. You can have a “watch only” wallet that only uses the @view-key. This feature can be used for accounting or auditing purposes but is currently unreliable due to the inability to track outgoing transactions. You can decide who can see your Monero balance by sharing your @view-key. Monero is private by default and optionally semi-transparent!
When using the Monero Wallet all this is handled by the software. Sending Monero is as easy as entering the destination address, the amount, and pressing Send. To recieve Monero, simply provide the sender your Public Address.
......
......@@ -22,7 +22,7 @@ Example:
anonimal.i2p=AQZGLAMpI9Q0l0kmMj1vpJJYK3CjLp~fE3MfvE-e7KMKjI5cPOH6EN8m794uHJ6b09qM8mb9VEv1lVLEov~usVliTSXCSHuRBOCIwIOuDNU0AbVa4BpIx~2sU4TxKhoaA3zQ6VzINoduTdR2IJhPvI5xzezp7dR21CEQGGTbenDslXeQ4iLHFA2~bzp1f7etSl9T2W9RID-KH78sRQmzWnv7dbhNodMbpO6xsf1vENf6bMRzqD5vgHEHZu2aSoNuPyYxDU1eM6--61b2xp9mt1k3ud-5WvPVg89RaU9ugU5cxaHgR927lHMCAEU2Ax~zUb3DbrvgQBOTHnJEx2Fp7pOK~PnP6ylkYKQMfLROosLDXinxOoSKP0UYCh2WgIUPwE7WzJH3PiJVF0~WZ1dZ9mg00c~gzLgmkOxe1NpFRNg6XzoARivNVB5NuWqNxr5WKWMLBGQ9YHvHO1OHhUJTowb9X90BhtHnLK2AHwO6fV-iHWxRJyDabhSMj1kuYpVUBQAEAAcAAA==
1. `anonimal.i2p` is the @locally-unique-host
2. `=` is the seperator
2. `=` is the separator
3. Everything that remains is the @base64-address
### Subscription types
......@@ -30,12 +30,12 @@ anonimal.i2p=AQZGLAMpI9Q0l0kmMj1vpJJYK3CjLp~fE3MfvE-e7KMKjI5cPOH6EN8m794uHJ6b09q
For @Kovri, there are two types of subscription files: *public* and *private*.
A *public* subscription:
- is used when bootstrapping to use essential services (IRC, email, monero, etc.)
- is used when bootstrapping to use essential services (IRC, email, Monero, etc.)
- is static and is refreshed every 12 hours from Monero's @address-book server
- allows you to safely share the subscription with everyone as it is publically available (anyone who shares the same public subscription will also be able to resolve the same hostname to the same destination as you)
A *private* subscription:
- is used exclusively by you and is not shared with others unless you explicitely choose to share the file
- is used exclusively by you and is not shared with others unless you explicitly choose to share the file
- default file is `private_hosts.txt` in your @data-directory
### Updating a private subscription
......
......@@ -7,15 +7,10 @@ summary: "the block reward at the end of the emission curve"
### The Basics
Monero block rewards will never drop to zero. Block rewards will gradually drop
until tail emission commences at the end of May 2022. At this point, rewards
will be fixed at 0.6 XMR per block.
Monero block rewards will never drop to zero. Block rewards will gradually drop until tail emission commences at the end of May 2022. At this point, rewards will be fixed at 0.6 XMR per block.
### Why
Miners need an incentive to mine. Because of the dynamic blocksize, competition
between miners will cause fees to decrease. If mining is not profitable due to
a high cost and low reward, miners lose their incentive and will stop mining,
reducing the security of the network.
Miners need an incentive to mine. Because of the dynamic blocksize, competition between miners will cause fees to decrease. If mining is not profitable due to a high cost and low reward, miners lose their incentive and will stop mining, reducing the security of the network.
Tail emission ensures that a dynamic block size and fee market can develop.
......@@ -9,7 +9,7 @@ summary: "one of two sets of private and public cryptographic keys that each acc
Monero features an opaque blockchain (with an explicit allowance system called the @view-key), in sharp contrast with transparent blockchains used by any other cryptocurrency not based on @CryptoNote. Thus, Monero is said to be "private, optionally transparent".
Every Monero address has a private viewkey which can be shared. By sharing a viewkey a person is allowing access to view every incoming transaction for that address. However, outgoing transactions can not be reliably viewed as of June 2017. Therefore the balance of a Monero address as shown via a viewkey should not be relied upon.
Every Monero address has a private viewkey which can be shared. By sharing a viewkey a person is allowing access to view every incoming transaction for that address. However, outgoing transactions cannot be reliably viewed as of June 2017. Therefore the balance of a Monero address as shown via a viewkey should not be relied upon.
......
......@@ -11,7 +11,7 @@ A Monero account, or wallet, stores the information necessary to send and receiv
The term "hot wallet" describes a Monero @account which is connected to the Internet. You can send funds easily but security is much lower than a cold wallet. Never store large amounts of cryptocurrency in a hot wallet!
A cold wallet is generated on a trusted device or computer via an @airgap. If the device is to be reused, the data storage should be securely overwritten. As soon as a cold wallet is connected to the internet, or its mnemonic phrase or @spend-key is entered on an internet-connected device, it's no longer "cold" and should be considered "hot".
A cold wallet is generated on a trusted device or computer via an @airgap. If the device is to be reused, the data storage should be securely overwritten. As soon as a cold wallet is connected to the internet or its mnemonic phrase or @spend-key is entered on an internet-connected device, it's no longer "cold" and should be considered "hot".
A Monero @paper-wallet can be generated by downloading the source code of https://moneroaddress.org/. Verify the signature of the code on a trusted airgapped device. Create the wallet and print or store it on the media of your choice.
......
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