Merge pull request #1206 from psychocrypt/topic-renameMonero2

rename `monero2` to `monero7`

doc/FAQ.md

@@ -9,7 +9,7 @@
 * [Virus Protection Alert](#virus-protection-alert)
 * [Change Currency to Mine](#change-currency-to-mine)
 * [How can I mine Monero](#how-can-i-mine-monero)
-* [Why is Monero named monero2](why-is-monero-named-monero2)
+* [Why is Monero named monero7](why-is-monero-named-monero7)
 * [Which currency must be chosen if my fork coin is not listed](#which-currency-must-be-chosen-if-my-fork-coin-is-not-listed)
 
 ## "Obtaining SeLockMemoryPrivilege failed."
@@ -72,15 +72,16 @@ If your antivirus software flags **xmr-stak**, it will likely move it to its qua
 
 If the miner is compiled for Monero and Aeon than you can change
  - the value `currency` in the config *or*
- - start the miner with the [command line option](usage.md) `--currency monero` or `--currency aeon`
+ - start the miner with the [command line option](usage.md) `--currency monero7` or `--currency aeon`
+ - run `xmr-stak --help` to see all supported currencies and algorithms
 
 ## How can I mine Monero
 
-Set the value `currency` in `pools.txt` to `monero2`.
+Set the value `currency` in `pools.txt` to `monero7`.
 
-## Why is Monero named monero2
+## Why is Monero named monero7
 
-To avoid configuration conflicts after the hard fork of Monero to the new POW with our old naming schema where all cryptonight currencies was selected by choosing `monero` as currency we decided to switch to the name `monero2`.
+To avoid configuration conflicts after the hard fork of Monero to the new POW with our old naming schema where all cryptonight currencies was selected by choosing `monero` as currency we decided to switch to the name `monero7`.
 
 ## Which currency must be chosen if my fork coin is not listed
 

xmrstak/jconf.cpp

@@ -102,7 +102,7 @@ xmrstak_coin_algo coin_algos[] = {
 	{ "graft", cryptonight, nullptr },
 	{ "intense", cryptonight, nullptr },
 	{ "karbo", cryptonight, nullptr },
-	{ "monero2", cryptonight_monero, "pool.usxmrpool.com:3333" },
+	{ "monero7", cryptonight_monero, "pool.usxmrpool.com:3333" },
 	{ "sumokoin", cryptonight_heavy, nullptr }
 };
 
@@ -322,7 +322,7 @@ bool jconf::IsOnAlgoList(std::string& needle)
 	if(needle == "monero")
 	{
 		printer::inst()->print_msg(L0, "You entered Monero as coin name. Monero will hard-fork the PoW.\nThis means it will stop being compatible with other cryptonight coins.\n"
-			"Please use monero2 if you want to mine Monero, or name the coin that you want to mine.");
+			"Please use 'monero7' (support auto switch to new POW) if you want to mine Monero, \nor name the coin that you want to mine.");
 		return false;
 	}
 
@@ -623,7 +623,7 @@ bool jconf::parse_config(const char* sFilename, const char* sFilenamePools)
 		if(ctmp == "monero")
 		{
 			printer::inst()->print_msg(L0, "You entered Monero as coin name. Monero will hard-fork the PoW.\nThis means it will stop being compatible with other cryptonight coins.\n"
-				"Please use monero2 if you want to mine Monero, or name the coin that you want to mine.");
+				"Please use monero7 (support auto switch to new POW) if you want to mine Monero, or name the coin that you want to mine.");
 			return false;
 		}
 

xmrstak/pools.tpl

@@ -28,7 +28,7 @@ POOLCONF],
  *    graft
  *    intense
  *    karbo
- *    monero2 (use this for Monero's new PoW)
+ *    monero7 (use this for Monero's new PoW)
  *    sumokoin
  *
  */