Merge branch 'master' into details

WalletWasabi · Aug 6, 2019 · 6d28195 · 6d28195
2 parents 68121a0 + 5e29293
commit 6d28195
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 10 deletions.
diff --git a/docs/.vuepress/public/GenerateWallet.png → ...ss/public/WalletManagerGenerateWallet.png b/docs/.vuepress/public/GenerateWallet.png → ...ss/public/WalletManagerGenerateWallet.png
diff --git a/docs/.vuepress/public/RecoveryWords.png → ...ess/public/WalletManagerRecoveryWords.png b/docs/.vuepress/public/RecoveryWords.png → ...ess/public/WalletManagerRecoveryWords.png
diff --git a/docs/FAQ/FAQ-UseWasabi.md b/docs/FAQ/FAQ-UseWasabi.md
@@ -28,7 +28,6 @@ In order to protect your paper backup, consider to store the password and recove
 You have successfully setup your wallet when you click `I wrote down my Recovery Words!`
 
 ![](/WalletManagerRecoveryWords.png)
-
 :::
 
 ## Synchronization
@@ -378,7 +377,6 @@ So consolidating in a CoinJoin is better, but it might still reveal the common o
 
 
 Wallet Manager
-- How do I generate a new wallet?
 - How do I back up my mnemonic seed?
 - What password should I use?
 - Can I spend my bitcoin without the password?

diff --git a/docs/IntroWasabi.md b/docs/IntroWasabi.md
@@ -1,15 +1,7 @@
-
-This is the open source documentation repository of Wasabi Wallet, here you will find information about the nuances of privacy in Bitcoin, how Wasabi solves these difficult problems, and how you can use these tools to defend yourself.
-If you have a question that is not yet covered, please [open an issue](https://github.com/zkSNACKs/WasabiDoc/issues), if you have a good answer to a question, please [open a pull request](https://github.com/zkSNACKs/WasabiDoc/pulls).
-
 # WasabiDoc
 
 [Wasabi](https://wasabiwallet.io) is an open-source, non-custodial, privacy focused Bitcoin wallet for desktop. It implements trustless coin shuffling: [Schnorrian CoinJoin](https://github.com/nopara73/ZeroLink/).
 
-However, "[anonymity loves company](https://www.freehaven.net/anonbib/cache/usability:weis2006.pdf)", the more participants there are, the better your privacy is, and the faster the CoinJoin rounds are.
-Whether you are looking for state of the art operational security or you are philosophically aligned with the principles of freedom and privacy, now it is YOUR time to contribute.
-Fire up your Wasabi and help us to bootstrap the system!
-
 This is the open source documentation repository of Wasabi Wallet, here you will find information about the nuances of privacy in Bitcoin, how Wasabi solves these difficult problems, and how you can use these tools to defend yourself.
 If you have a question that is not yet covered, please [open an issue](https://github.com/zkSNACKs/WasabiDoc/issues), if you have a good answer to a question, please [open a pull request](https://github.com/zkSNACKs/WasabiDoc/pulls).