Merge pull request #1019

user guides: mining: Rewrite mining guide

_i18n/ar.yml

@@ -422,7 +422,7 @@ user-guides:
   purchasing-storing: شراء وتخزين مونيرو بأمان
   verify-allos: تحقق من ملفات التثبيت علي ويندوز ولينُكس (متقدم)
   verify-windows: تحقق من الملفات علي ويندوز (للمبتدئين)
-  mine-on-pool: كيفيه التعدين في حقل (تجمّع للتعدين) مع برنامج xmr-stak-cpu
+  mine-on-pool: كيفيه التعدين في حقل (تجمّع للتعدين) مع برنامج XMRig
   solo-mine: كيفيه التعدين منفرداً بالواجهه الرسوميه
   mine-docker: التعدين بواسطه  Docker و XMRig
   locked-funds: كيفيه إصلاح مشكله الاموال المُعلّقه

_i18n/ar/resources/user-guides/mine-to-pool.md

@@ -1,98 +1,244 @@
-{% include disclaimer.html translated="yes" translationOutdated="no" %}
+{% include disclaimer.html translated="no" translationOutdated="no" %}
 
-# إختيار حقل (تجمّع للتعدين)
+## Wallet
 
-هُناك العديد من الحقول يمكنك الإختيار منها , قائمه بالحقول المتاحه موجوده بـ [moneropools.com](https://moneropools.com).
-التعدين في حقل كبير قد يعني دفعات أكثر تواتراً. ولكن التعدين في حقل أصغر يساعد في الحفاظ علي لامركزيه الشبكه.
+Before starting, you already need to have a wallet configured and
+working. The pool needs to know your wallet address to be able to send
+payments there. See the [Accepting Monero guide]({{ site.baseurl
+}}/get-started/accepting) for more information.
 
-# إختيار برنامج تعدين لوحده المعالجه المركزيه (CPU)
+## Profitability
 
-تماماً كحقول التعدين هُناك العديد من برامج التعدين. يجب عليك إختيار المُناسب للجهاز الذي تريد التعدين عليه. هذا الدليل سيُغطي التعدين عن طريق وحده المعالجه المركزيه فقط, وسنقوم بإستخدام برنامج
-[xmr-stak-cpu](https://github.com/fireice-uk/xmr-stak-cpu). من البدائل برنامج
-[wolf's CPUMiner](https://github.com/wolf9466/cpuminer-multi) و برنامج
-[sgminer-gm](https://github.com/genesismining/sgminer-gm). إعدادات هذه البرامج تختلف قليلاً ولن يتم تغطيتها في هذا الدليل.
+Before mining, you should decide if it is worth it or not for you. You
+have to decide this for yourself, based on your power costs and the
+hardware that you have available. There are many sites, such as
+[CryptoCompare](https://www.cryptocompare.com/mining/calculator/xmr)
+that allow you to enter your miner's speed and power draw, and it will
+show you the profit (or loss) per week/month.
 
-## لأنظمه ويندوز
+## Download Miner
 
-إذا كنت تستخدم نظام ويندوز يوفر مطور برنامج (xmr-stak-cpu) ملفات التنزيل علي
-[GitHub release page](https://github.com/fireice-uk/xmr-stak-cpu/releases).
+The first step is to download mining software onto your computer.
 
-حمّل `xmr-stak-cpu-win64.zip` وفك ضغطه في مكان سهل الوصول إليه.
+### Windows
 
-## لأنظمه التشغيل الأخري
+The XMRig developer provides pre-built binaries for Windows
+users. They are available on the [GitHub release
+page](https://github.com/xmrig/xmrig/releases/latest).
 
-إذا كنت لا تستخدم نظام ويندوز فسيتعين عليك تجميع xmr-stak-cpu بنفسك ولحسن الحظ لأمر ليس بهذه الصعوبه. قبل أن تتمكن من تجميع برنامج التعدين ستحتاج إلى تثبيت بعض المتطلبات الأساسية الخاصة به.
+Scroll down until you see `xmrig-VERSION-msvc-win64.zip`. Download
+this file and extract the archive somewhere memorable, like your desktop.
 
-توزيعات Debian:
+### Ubuntu Linux
 
-    sudo apt-get install libmicrohttpd-dev libssl-dev cmake build-essential
+The XMRig developer provides pre-built binaries for Ubuntu Xenial
+Xerus (16.04). They may work on other Ubuntu versions, and on other
+distributions, but this is not guaranteed.
 
-توزيعات Red Hat:
+These binaries are available on the [GitHub release
+page](https://github.com/xmrig/xmrig/releases/latest).
 
-	sudo yum install openssl-devel cmake gcc-c++ libmicrohttpd-devel
+Scroll down until you see `xmrig-VERSION-xenial-x64.tar.gz`. Download
+this file, extract the archive somewhere memorable, like your desktop.
 
-<!-- TODO: Add dependencies for other operating systems? -->
+### Other Linux
 
-بعد ذلك ستحتاج لإستخدام (cmake) لإنشاء ملفات الإنشاء شغل البرنامج وقم بنسخ ملف الإعدادات :
+Users of other Linux distributions can compile XMRig from
+source. Firstly, install the dependencies:
 
-    mkdir build-$(gcc -dumpmachine)
-	cd $_
-	cmake ../
-	make -j$(nproc)
-	cp ../config.txt bin/
-	cd bin
+```
+# For Debian-based distros
+sudo apt install \
+	build-essential \
+	cmake \
+	git \
+	libhwloc-dev \
+	libssl-dev \
+	libuv1-dev
+```
 
-لا تحتفل بعد حيث يحتاج برنامج التعدين إلى التهيئة. تشغيل البرنامج الآن يجب أن يعطيك كتلة من النص لنسخها ولصقها:
+Download the XMRig source code:
 
-![image1](png/mine_to_pool/1.png)
+```
+git clone https://github.com/xmrig/xmrig.git
+cd xmrig
+```
 
-إفتح `config.txt` وقم *بتبديل* سطرين `"cpu_threads_conf"`بالنص الذي قمت بنسخه, سيبدو كذلك بعدها :
+Configure and compile XMRig:
 
-![image2](png/mine_to_pool/2.png)
+```
+cmake -Bbuild
+make -Cbuild -j$(nproc)
+```
 
-إنزل للأسفل في الملف إلي أن تجد سطر يحتوي علي `"pool_address"`. *بدّل* المحتوي بين علامات الإقتباس لعنوان ومنفذ حقل التعدين الذي إخترته سابقاً , ستجد هذه البيانات في موقع حقل التعدين.
+Copy binary and example configuration to your home directory:
 
-ضع عنوان محفظتك بين علامات الاقتباس في عنوان المحفظة. يمكنك ترك كلمة المرور فارغة ما لم يحدد حقل التعدين خلاف ذلك.
+```
+cp build/xmrig ~/
+cp src/config.json ~/
+```
 
-بعد ذلك ، يجب أن يبدو ملف الإعدادات الخاص بك كما يلي:
+### macOS Build
 
-![image3](png/mine_to_pool/3.png)
+Firstly, install XCode and [Homebrew](https://brew.sh).
 
-# تشغيل برنامج التعدين
+Use Homebrew to install dependencies:
 
-إحفظ ملف *الإعدادات* وشغل برنامج التعدين
+```
+brew install \
+	cmake \
+	hwloc \
+	libmicrohttpd \
+	libuv \
+	openssl
+```
 
-![image4](png/mine_to_pool/4.png)
+Download XMRig sources:
 
-بعض الحقول تسمح لك بمتابعه قوه التعدين الخاصه بعنوانك عن طريق لصق عنوانك في موقعهم. يمكنك أيضاً متابعه قوه التعدين الخاصه بك عن طريق ضغط مفتاح `h`
+```
+git clone https://github.com/xmrig/xmrig.git
+cd xmrig
+```
 
-# ضبط برنامج التعدين
+Configure and compile XMRig:
 
-ربما تري رسائل مثل :
+```
+cmake -Bbuild -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl
+make -Cbuild -j$(nproc)
+```
 
-	[2017-07-09 12:04:02] : MEMORY ALLOC FAILED: mmap failed
+Copy binary and example configuration to your home directory:
 
-وهذا يعني أنه يمكنك الحصول على زيادة بنسبة 20٪ من قوه التعدين من خلال تمكين الصفحات الكبيرة.
+```
+cp build/xmrig ~/
+cp src/config.json ~/
+```
 
-## الصفحات الكبيره علي ليُنكس
+## Selecting a pool
 
-أولاً إغلق برنامج التعدين ( إذا كان مازال يعمل ), وقم بتشغيل الأمر التالي لتفعيل الصفحات الكبيره وإبدأ برنامج التعدين كـROOT:
+There are lots of pools to choose from. You can find a list at
+[miningpoolstats.stream/monero](https://miningpoolstats.stream/monero).
 
-	sudo sysctl -w vm.nr_hugepages=128
-	sudo ./xmr-stak-cpu
+Choosing a larger pool means that you will see more frequent (but
+smaller) payouts, but choosing a smaller pools helps keep the network
+decentralised. [Miners will not lose any revenue by mining on a
+smaller pool](https://redd.it/g6uh2l).
 
-## الصفحات الكبيره علي ويندوز
+## Configuring the miner
 
-مأخوذ من `config.txt`:
+Navigate to your chosen pool's webpage and read their
+documentation. They should mention an address and port for you to
+enter into your miner. For example, `pool.xmr.pt:3333`.
 
->إفتراضياً سنحاول تخصيص الصفحات الكبيره ويعني ذلك أنك تحتاج الشتغيل بصلاحيات المدير علي ويندوز
-يجب أن تُعدل سياسات المجموعات علي نظامك لتمكين الصفحات الكبيره. وهذه هي الخطوات
-1. في القائمة "ابدأ" ، انقر فوق "تشغيل". في المربع فتح ، اكتب gpedit.msc.
-2. في وحده تحكم مُحرر سياسات المجموعات قم بتوسيع إعدادات الحاسوب وبعد ذلك توسيع إعدادات الويندوز
-3. وسّع إعدادات الحمايه وبعد ذلك وسّع إعدادات السياسات المحليه.
-4. حدد مجلد تعيين حقوق المستخدم
-5. سيتم عرض السياسات في نافذه التفاصيل.
-6. في النافذه انقر نقراً مزدوجاً فوق تأمين الصفحات في الذاكرة.
-7. في إعدادات الأمان المحلية - قفل الصفحات في الذاكره ، انقر فوق إضافة مستخدم أو مجموعة.
-8. في مربع حوار إختيار المُستخدمين أو حساب الخدمات أو الجماعات قم بإضافه حساب لتقوم بتشغيل برنامج التعدين عليه
-9. إعادة تشغيل لتثبيت التغييرات
+Next, open up the config.json you copied or extracted earlier in your
+favourite text editor. Scroll down to the line that says
+`donate.v2.xmrig.com:3333` and change the text inside the quotes to
+the address of your pool. The line below should contain
+`YOUR_WALLET_ADDRESS`. Change that to your actual wallet address.
+
+After these modifications, your configuration should look something like this:
+
+```
+{
+	// [...]
+	"pools": [
+		{
+			"url": "pool.xmr.pt:3333",
+			"user": "43YjW8SZov..."
+		}
+	],
+	// [...]
+}
+```
+
+## Starting the miner
+
+Windows users can double click on xmrig.exe. Users of other operating
+systems should `cd` into the directory that contains XMRig and then
+type `./xmrig` and press return.
+
+If you see green messages saying that shares have been accepted,
+congratulations, everything is working!
+
+## Troubleshooting
+
+### Anti-virus keeps removing XMRig
+
+Some anti-viruses flag XMRig as malware because it is often deployed
+to infected computers to mine without the owner's consent. As it is
+your computer and you are configuring the miner to mine for you, it is
+safe to add XMRig to your anti-virus whitelist.
+
+### Cannot read/set MSR
+
+On some CPUs, XMRig tries to increase performance by disabling certain
+features like your CPU's instruction prefetcher. These operations
+require root/administrator, so try right clicking xmrig.exe and
+running it as administrator, or running `sudo ./xmrig` on other
+systems.
+
+### Algo not known
+
+Find the line in config.json that says `algo: null` and change it to
+`algo: "rx/0"`. By default, XMRig expects the pool to tell it which
+hashing algorithm to use.
+
+### Huge Pages 0%
+
+#### Allowing large pages on Windows
+
+Taken from [the MSDN](https://docs.microsoft.com/en-us/sql/database-engine/configure-windows/enable-the-lock-pages-in-memory-option-windows?view=sql-server-ver15):
+
+>1. On the Start menu, click Run. In the Open box, type gpedit.msc.
+2. On the Local Group Policy Editor console, expand Computer Configuration, and then expand Windows Settings.
+3. Expand Security Settings, and then expand Local Policies.
+4. Select the User Rights Assignment folder.
+5. The policies will be displayed in the details pane.
+6. In the pane, double-click Lock pages in memory.
+7. In the Local Security Setting – Lock pages in memory dialog box, click Add User or Group.
+8. In the Select Users, Service Accounts, or Groups dialog box, add an account that you will run the miner on
+9. Reboot for change to take effect.
+
+You may also need to launch the miner as administrator.
+
+#### Allowing large pages on Linux
+
+Firstly stop the miner (if it's running), run the following commands to enable
+large pages and then start the miner as root:
+
+	sudo sysctl -w vm.nr_hugepages=1168
+	sudo ./xmrig
+
+You may have to increase 1168 depending on how many NUMA nodes your
+CPU(s) have.
+
+#### Allowing large pages on macOS
+
+Huge pages are not supported on macOS.
+
+### Balance Not Increasing
+
+Most pools are <abbr title="Pay Per Last N Shares">PPLNS</abbr> pools,
+which means that you only get paid when a miner on the pool finds a
+block. If the pool you are mining on is small, this can take a few
+days to weeks.
+
+Additionally, any blocks found must mature before they can be paid
+out. This takes 60 blocks (approx. 2 hours).
+
+## Getting Help
+
+An active Monero mining community on Reddit is
+[/r/MoneroSupport](https://www.reddit.com/r/MoneroSupport/). You can
+also join [#monero-pools on
+freenode](https://webchat.freenode.net/?channel=#monero-pools).
+
+## Going Futher
+
+* Consider using a subaddress just for mining, to prevent your address
+  being linked to different services.
+* [Consider using Tor to connect to the
+  pool](https://xmrig.com/docs/miner/tor) (or to a hidden service pool
+  like HashVault, RespectXMR and MoneroOcean). This hides mining
+  activity from your ISP, and prevents the pool from knowing who you
+  are.

_i18n/de.yml

@@ -423,7 +423,7 @@ user-guides:
   purchasing-storing: Monero sicher kaufen und verwahren
   verify-allos: Dateien auf Linux, Mac bzw. Windows in der Befehlszeile verifizieren (fortgeschritten)
   verify-windows: Dateien unter Windows verifizieren (Anfänger)
-  mine-on-pool: Mining auf einem Pool mit xmr-stak-cpu
+  mine-on-pool: Mining auf einem Pool mit XMRig
   solo-mine: Solomining mit der GUI
   mine-docker: Mining mit Docker und XMRig
   locked-funds: Feststeckende Guthaben freigeben

_i18n/de/resources/user-guides/mine-to-pool.md

@@ -1,110 +1,195 @@
 {% include disclaimer.html translated="no" translationOutdated="no" %}
 
-# Selecting a pool
+## Wallet
 
-There are many pools to choose from, a list is available at
-[moneropools.com](https://moneropools.com). Mining on a larger pool could mean
-more frequent payouts, but mining on a smaller pool helps to keep the network
-decentralized.
+Before starting, you already need to have a wallet configured and
+working. The pool needs to know your wallet address to be able to send
+payments there. See the [Accepting Monero guide]({{ site.baseurl
+}}/get-started/accepting) for more information.
 
-# Selecting a CPU miner
+## Profitability
 
-Just like pools, there are a lot of miners to choose from. The one that you
-should pick depends on the hardware you want to mine on. This guide will only
-use a CPU miner, and will be using
-[xmr-stak-cpu](https://github.com/fireice-uk/xmr-stak-cpu). Alternatives include
-[wolf's CPUMiner](https://github.com/wolf9466/cpuminer-multi) and
-[sgminer-gm](https://github.com/genesismining/sgminer-gm). However, their
-configuration is slightly different and will not be covered in this guide.
+Before mining, you should decide if it is worth it or not for you. You
+have to decide this for yourself, based on your power costs and the
+hardware that you have available. There are many sites, such as
+[CryptoCompare](https://www.cryptocompare.com/mining/calculator/xmr)
+that allow you to enter your miner's speed and power draw, and it will
+show you the profit (or loss) per week/month.
 
-## For Windows Systems
+## Download Miner
 
-If you are using a Windows system, the developer of xmr-stak-cpu provides
-binaries to download on the
-[GitHub release page](https://github.com/fireice-uk/xmr-stak-cpu/releases).
+The first step is to download mining software onto your computer.
 
-Download `xmr-stak-cpu-win64.zip` and extract it somewhere you'll be able to
-find it again.
+### Windows
 
-## For Other Operating Systems
+The XMRig developer provides pre-built binaries for Windows
+users. They are available on the [GitHub release
+page](https://github.com/xmrig/xmrig/releases/latest).
 
-If you're not using Windows, you will have to compile xmr-stak-cpu for yourself,
-luckily this isn't as hard as it sounds. Before you can compile the miner, you
-will need to install some of its prerequisites.
+Scroll down until you see `xmrig-VERSION-msvc-win64.zip`. Download
+this file and extract the archive somewhere memorable, like your desktop.
 
-For Debian-based distros:
+### Ubuntu Linux
 
-    sudo apt-get install libmicrohttpd-dev libssl-dev cmake build-essential
+The XMRig developer provides pre-built binaries for Ubuntu Xenial
+Xerus (16.04). They may work on other Ubuntu versions, and on other
+distributions, but this is not guaranteed.
 
-For Red Hat based distros:
+These binaries are available on the [GitHub release
+page](https://github.com/xmrig/xmrig/releases/latest).
 
-	sudo yum install openssl-devel cmake gcc-c++ libmicrohttpd-devel
+Scroll down until you see `xmrig-VERSION-xenial-x64.tar.gz`. Download
+this file, extract the archive somewhere memorable, like your desktop.
 
-<!-- TODO: Add dependencies for other operating systems? -->
+### Other Linux
 
-Following this, you just need to use cmake to generate the build files, run
-make and copy the config file:
+Users of other Linux distributions can compile XMRig from
+source. Firstly, install the dependencies:
 
-    mkdir build-$(gcc -dumpmachine)
-	cd $_
-	cmake ../
-	make -j$(nproc)
-	cp ../config.txt bin/
-	cd bin
+```
+# For Debian-based distros
+sudo apt install \
+	build-essential \
+	cmake \
+	git \
+	libhwloc-dev \
+	libssl-dev \
+	libuv1-dev
+```
 
-Don't celebrate just yet, as the miner needs to be configured. Running the miner
-now should give you a block of text to copy and paste:
+Download the XMRig source code:
 
-![image1](png/mine_to_pool/1.png)
+```
+git clone https://github.com/xmrig/xmrig.git
+cd xmrig
+```
 
-Open `config.txt` and *replace* the two `"cpu_threads_conf"` lines with the text
-you just copied. It should look something like this afterwards:
+Configure and compile XMRig:
 
-![image2](png/mine_to_pool/2.png)
+```
+cmake -Bbuild
+make -Cbuild -j$(nproc)
+```
 
-Scroll down in the file until you see the lines containing `"pool_address"`.
-*Replace* the contents of the second set of quotes with the address and port of
-the pool you chose earlier. You can find this information on the pool's website.
+Copy binary and example configuration to your home directory:
 
-Put your wallet address between the quotes on the wallet address. You may leave
-the password blank unless the pool specifies otherwise.
+```
+cp build/xmrig ~/
+cp src/config.json ~/
+```
 
-After this, your config should look something like this:
+### macOS Build
 
-![image3](png/mine_to_pool/3.png)
+Firstly, install XCode and [Homebrew](https://brew.sh).
 
-# Running the miner
+Use Homebrew to install dependencies:
 
-**Save the config** file and run the miner!
+```
+brew install \
+	cmake \
+	hwloc \
+	libmicrohttpd \
+	libuv \
+	openssl
+```
 
-![image4](png/mine_to_pool/4.png)
+Download XMRig sources:
 
-Some pools allow you to monitor your hashrate by pasting your address into their
-website. You can also monitor your hashrate by pressing the `h` key.
+```
+git clone https://github.com/xmrig/xmrig.git
+cd xmrig
+```
 
-# Tuning the miner
+Configure and compile XMRig:
 
-You might see nasty messages like this:
+```
+cmake -Bbuild -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl
+make -Cbuild -j$(nproc)
+```
 
-	[2017-07-09 12:04:02] : MEMORY ALLOC FAILED: mmap failed
+Copy binary and example configuration to your home directory:
 
-This means that you can get around a 20% hashrate boost by enabling large pages.
+```
+cp build/xmrig ~/
+cp src/config.json ~/
+```
 
-## Large pages on Linux
+## Selecting a pool
 
-Firstly stop the miner (if it's running), run the following commands to enable
-large pages and then start the miner as root:
+There are lots of pools to choose from. You can find a list at
+[miningpoolstats.stream/monero](https://miningpoolstats.stream/monero).
 
-	sudo sysctl -w vm.nr_hugepages=128
-	sudo ./xmr-stak-cpu
+Choosing a larger pool means that you will see more frequent (but
+smaller) payouts, but choosing a smaller pools helps keep the network
+decentralised. [Miners will not lose any revenue by mining on a
+smaller pool](https://redd.it/g6uh2l).
 
-## Large pages on Windows
+## Configuring the miner
 
-Taken from `config.txt`:
+Navigate to your chosen pool's webpage and read their
+documentation. They should mention an address and port for you to
+enter into your miner. For example, `pool.xmr.pt:3333`.
 
->By default we will try to allocate large pages. This means you need to "Run As Administrator" on Windows
-You need to edit your system's group policies to enable locking large pages. Here are the steps from MSDN
-1. On the Start menu, click Run. In the Open box, type gpedit.msc.
+Next, open up the config.json you copied or extracted earlier in your
+favourite text editor. Scroll down to the line that says
+`donate.v2.xmrig.com:3333` and change the text inside the quotes to
+the address of your pool. The line below should contain
+`YOUR_WALLET_ADDRESS`. Change that to your actual wallet address.
+
+After these modifications, your configuration should look something like this:
+
+```
+{
+	// [...]
+	"pools": [
+		{
+			"url": "pool.xmr.pt:3333",
+			"user": "43YjW8SZov..."
+		}
+	],
+	// [...]
+}
+```
+
+## Starting the miner
+
+Windows users can double click on xmrig.exe. Users of other operating
+systems should `cd` into the directory that contains XMRig and then
+type `./xmrig` and press return.
+
+If you see green messages saying that shares have been accepted,
+congratulations, everything is working!
+
+## Troubleshooting
+
+### Anti-virus keeps removing XMRig
+
+Some anti-viruses flag XMRig as malware because it is often deployed
+to infected computers to mine without the owner's consent. As it is
+your computer and you are configuring the miner to mine for you, it is
+safe to add XMRig to your anti-virus whitelist.
+
+### Cannot read/set MSR
+
+On some CPUs, XMRig tries to increase performance by disabling certain
+features like your CPU's instruction prefetcher. These operations
+require root/administrator, so try right clicking xmrig.exe and
+running it as administrator, or running `sudo ./xmrig` on other
+systems.
+
+### Algo not known
+
+Find the line in config.json that says `algo: null` and change it to
+`algo: "rx/0"`. By default, XMRig expects the pool to tell it which
+hashing algorithm to use.
+
+### Huge Pages 0%
+
+#### Allowing large pages on Windows
+
+Taken from [the MSDN](https://docs.microsoft.com/en-us/sql/database-engine/configure-windows/enable-the-lock-pages-in-memory-option-windows?view=sql-server-ver15):
+
+>1. On the Start menu, click Run. In the Open box, type gpedit.msc.
 2. On the Local Group Policy Editor console, expand Computer Configuration, and then expand Windows Settings.
 3. Expand Security Settings, and then expand Local Policies.
 4. Select the User Rights Assignment folder.
@@ -113,3 +198,47 @@ You need to edit your system's group policies to enable locking large pages. Her
 7. In the Local Security Setting – Lock pages in memory dialog box, click Add User or Group.
 8. In the Select Users, Service Accounts, or Groups dialog box, add an account that you will run the miner on
 9. Reboot for change to take effect.
+
+You may also need to launch the miner as administrator.
+
+#### Allowing large pages on Linux
+
+Firstly stop the miner (if it's running), run the following commands to enable
+large pages and then start the miner as root:
+
+	sudo sysctl -w vm.nr_hugepages=1168
+	sudo ./xmrig
+
+You may have to increase 1168 depending on how many NUMA nodes your
+CPU(s) have.
+
+#### Allowing large pages on macOS
+
+Huge pages are not supported on macOS.
+
+### Balance Not Increasing
+
+Most pools are <abbr title="Pay Per Last N Shares">PPLNS</abbr> pools,
+which means that you only get paid when a miner on the pool finds a
+block. If the pool you are mining on is small, this can take a few
+days to weeks.
+
+Additionally, any blocks found must mature before they can be paid
+out. This takes 60 blocks (approx. 2 hours).
+
+## Getting Help
+
+An active Monero mining community on Reddit is
+[/r/MoneroSupport](https://www.reddit.com/r/MoneroSupport/). You can
+also join [#monero-pools on
+freenode](https://webchat.freenode.net/?channel=#monero-pools).
+
+## Going Futher
+
+* Consider using a subaddress just for mining, to prevent your address
+  being linked to different services.
+* [Consider using Tor to connect to the
+  pool](https://xmrig.com/docs/miner/tor) (or to a hidden service pool
+  like HashVault, RespectXMR and MoneroOcean). This hides mining
+  activity from your ISP, and prevents the pool from knowing who you
+  are.

_i18n/en.yml

@@ -494,7 +494,7 @@ user-guides:
   purchasing-storing: Securely purchasing and storing Monero
   verify-allos: Verify binaries on Linux, Mac, or Windows command line (advanced)
   verify-windows: Verify binaries on Windows (beginner)
-  mine-on-pool: How to mine on a pool with xmr-stak-cpu
+  mine-on-pool: How to mine on a pool with XMRig
   solo-mine: How to solo mine with the GUI
   locked-funds: How to fix locked up funds
   restore-account: How to restore your account

_i18n/en/resources/user-guides/mine-to-pool.md

@@ -1,111 +1,195 @@
 {% include disclaimer.html translated="no" translationOutdated="no" %}
 
+## Wallet
+
+Before starting, you already need to have a wallet configured and
+working. The pool needs to know your wallet address to be able to send
+payments there. See the [Accepting Monero guide]({{ site.baseurl
+}}/get-started/accepting) for more information.
+
+## Profitability
+
+Before mining, you should decide if it is worth it or not for you. You
+have to decide this for yourself, based on your power costs and the
+hardware that you have available. There are many sites, such as
+[CryptoCompare](https://www.cryptocompare.com/mining/calculator/xmr)
+that allow you to enter your miner's speed and power draw, and it will
+show you the profit (or loss) per week/month.
+
+## Download Miner
+
+The first step is to download mining software onto your computer.
+
+### Windows
+
+The XMRig developer provides pre-built binaries for Windows
+users. They are available on the [GitHub release
+page](https://github.com/xmrig/xmrig/releases/latest).
+
+Scroll down until you see `xmrig-VERSION-msvc-win64.zip`. Download
+this file and extract the archive somewhere memorable, like your desktop.
+
+### Ubuntu Linux
+
+The XMRig developer provides pre-built binaries for Ubuntu Xenial
+Xerus (16.04). They may work on other Ubuntu versions, and on other
+distributions, but this is not guaranteed.
+
+These binaries are available on the [GitHub release
+page](https://github.com/xmrig/xmrig/releases/latest).
+
+Scroll down until you see `xmrig-VERSION-xenial-x64.tar.gz`. Download
+this file, extract the archive somewhere memorable, like your desktop.
+
+### Other Linux
+
+Users of other Linux distributions can compile XMRig from
+source. Firstly, install the dependencies:
+
+```
+# For Debian-based distros
+sudo apt install \
+	build-essential \
+	cmake \
+	git \
+	libhwloc-dev \
+	libssl-dev \
+	libuv1-dev
+```
+
+Download the XMRig source code:
+
+```
+git clone https://github.com/xmrig/xmrig.git
+cd xmrig
+```
+
+Configure and compile XMRig:
+
+```
+cmake -Bbuild
+make -Cbuild -j$(nproc)
+```
+
+Copy binary and example configuration to your home directory:
+
+```
+cp build/xmrig ~/
+cp src/config.json ~/
+```
+
+### macOS Build
+
+Firstly, install XCode and [Homebrew](https://brew.sh).
+
+Use Homebrew to install dependencies:
+
+```
+brew install \
+	cmake \
+	hwloc \
+	libmicrohttpd \
+	libuv \
+	openssl
+```
+
+Download XMRig sources:
+
+```
+git clone https://github.com/xmrig/xmrig.git
+cd xmrig
+```
+
+Configure and compile XMRig:
+
+```
+cmake -Bbuild -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl
+make -Cbuild -j$(nproc)
+```
+
+Copy binary and example configuration to your home directory:
+
+```
+cp build/xmrig ~/
+cp src/config.json ~/
+```
+
 ## Selecting a pool
 
-There are many pools to choose from, a list is available at
-[moneropools.com](https://moneropools.com). Mining on a larger pool could mean
-more frequent payouts, but mining on a smaller pool helps to keep the network
-decentralized.
+There are lots of pools to choose from. You can find a list at
+[miningpoolstats.stream/monero](https://miningpoolstats.stream/monero).
 
-## Selecting a CPU miner
+Choosing a larger pool means that you will see more frequent (but
+smaller) payouts, but choosing a smaller pools helps keep the network
+decentralised. [Miners will not lose any revenue by mining on a
+smaller pool](https://redd.it/g6uh2l).
 
-Just like pools, there are a lot of miners to choose from. The one that you
-should pick depends on the hardware you want to mine on. This guide will only
-use a CPU miner, and will be using
-[xmr-stak-cpu](https://github.com/fireice-uk/xmr-stak-cpu).
-Alternatives include
-[xmrig](https://github.com/xmrig/xmrig) and
-[sgminer-gm](https://github.com/genesismining/sgminer-gm).
-However, their configuration is slightly different and will not be covered in this guide.
+## Configuring the miner
 
-### For Windows Systems
+Navigate to your chosen pool's webpage and read their
+documentation. They should mention an address and port for you to
+enter into your miner. For example, `pool.xmr.pt:3333`.
 
-If you are using a Windows system, the developer of xmr-stak-cpu provides
-binaries to download on the
-[GitHub release page](https://github.com/fireice-uk/xmr-stak-cpu/releases).
+Next, open up the config.json you copied or extracted earlier in your
+favourite text editor. Scroll down to the line that says
+`donate.v2.xmrig.com:3333` and change the text inside the quotes to
+the address of your pool. The line below should contain
+`YOUR_WALLET_ADDRESS`. Change that to your actual wallet address.
 
-Download `xmr-stak-cpu-win64.zip` and extract it somewhere you'll be able to
-find it again.
+After these modifications, your configuration should look something like this:
 
-### For Other Operating Systems
+```
+{
+	// [...]
+	"pools": [
+		{
+			"url": "pool.xmr.pt:3333",
+			"user": "43YjW8SZov..."
+		}
+	],
+	// [...]
+}
+```
 
-If you're not using Windows, you will have to compile xmr-stak-cpu for yourself,
-luckily this isn't as hard as it sounds. Before you can compile the miner, you
-will need to install some of its prerequisites.
+## Starting the miner
 
-For Debian-based distros:
+Windows users can double click on xmrig.exe. Users of other operating
+systems should `cd` into the directory that contains XMRig and then
+type `./xmrig` and press return.
 
-    sudo apt-get install libmicrohttpd-dev libssl-dev cmake build-essential
+If you see green messages saying that shares have been accepted,
+congratulations, everything is working!
 
-For Red Hat based distros:
+## Troubleshooting
 
-	sudo yum install openssl-devel cmake gcc-c++ libmicrohttpd-devel
+### Anti-virus keeps removing XMRig
 
-<!-- TODO: Add dependencies for other operating systems? -->
+Some anti-viruses flag XMRig as malware because it is often deployed
+to infected computers to mine without the owner's consent. As it is
+your computer and you are configuring the miner to mine for you, it is
+safe to add XMRig to your anti-virus whitelist.
 
-Following this, you just need to use cmake to generate the build files, run
-make and copy the config file:
+### Cannot read/set MSR
 
-    mkdir build-$(gcc -dumpmachine)
-	cd $_
-	cmake ../
-	make -j$(nproc)
-	cp ../config.txt bin/
-	cd bin
+On some CPUs, XMRig tries to increase performance by disabling certain
+features like your CPU's instruction prefetcher. These operations
+require root/administrator, so try right clicking xmrig.exe and
+running it as administrator, or running `sudo ./xmrig` on other
+systems.
 
-Don't celebrate just yet, as the miner needs to be configured. Running the miner
-now should give you a block of text to copy and paste:
+### Algo not known
 
-![image1](png/mine_to_pool/1.png)
+Find the line in config.json that says `algo: null` and change it to
+`algo: "rx/0"`. By default, XMRig expects the pool to tell it which
+hashing algorithm to use.
 
-Open `config.txt` and *replace* the two `"cpu_threads_conf"` lines with the text
-you just copied. It should look something like this afterwards:
+### Huge Pages 0%
 
-![image2](png/mine_to_pool/2.png)
+#### Allowing large pages on Windows
 
-Scroll down in the file until you see the lines containing `"pool_address"`.
-*Replace* the contents of the second set of quotes with the address and port of
-the pool you chose earlier. You can find this information on the pool's website.
+Taken from [the MSDN](https://docs.microsoft.com/en-us/sql/database-engine/configure-windows/enable-the-lock-pages-in-memory-option-windows?view=sql-server-ver15):
 
-Put your wallet address between the quotes on the wallet address. You may leave
-the password blank unless the pool specifies otherwise.
-
-After this, your config should look something like this:
-
-![image3](png/mine_to_pool/3.png)
-
-## Running the miner
-
-**Save the config** file and run the miner!
-
-![image4](png/mine_to_pool/4.png)
-
-Some pools allow you to monitor your hashrate by pasting your address into their
-website. You can also monitor your hashrate by pressing the `h` key.
-
-## Tuning the miner
-
-You might see nasty messages like this:
-
-	[2017-07-09 12:04:02] : MEMORY ALLOC FAILED: mmap failed
-
-This means that you can get around a 20% hashrate boost by enabling large pages.
-
-### Large pages on Linux
-
-Firstly stop the miner (if it's running), run the following commands to enable
-large pages and then start the miner as root:
-
-	sudo sysctl -w vm.nr_hugepages=128
-	sudo ./xmr-stak-cpu
-
-### Large pages on Windows
-
-Taken from `config.txt`:
-
->By default we will try to allocate large pages. This means you need to "Run As Administrator" on Windows
-You need to edit your system's group policies to enable locking large pages. Here are the steps from MSDN
-1. On the Start menu, click Run. In the Open box, type gpedit.msc.
+>1. On the Start menu, click Run. In the Open box, type gpedit.msc.
 2. On the Local Group Policy Editor console, expand Computer Configuration, and then expand Windows Settings.
 3. Expand Security Settings, and then expand Local Policies.
 4. Select the User Rights Assignment folder.
@@ -114,3 +198,47 @@ You need to edit your system's group policies to enable locking large pages. Her
 7. In the Local Security Setting – Lock pages in memory dialog box, click Add User or Group.
 8. In the Select Users, Service Accounts, or Groups dialog box, add an account that you will run the miner on
 9. Reboot for change to take effect.
+
+You may also need to launch the miner as administrator.
+
+#### Allowing large pages on Linux
+
+Firstly stop the miner (if it's running), run the following commands to enable
+large pages and then start the miner as root:
+
+	sudo sysctl -w vm.nr_hugepages=1168
+	sudo ./xmrig
+
+You may have to increase 1168 depending on how many NUMA nodes your
+CPU(s) have.
+
+#### Allowing large pages on macOS
+
+Huge pages are not supported on macOS.
+
+### Balance Not Increasing
+
+Most pools are <abbr title="Pay Per Last N Shares">PPLNS</abbr> pools,
+which means that you only get paid when a miner on the pool finds a
+block. If the pool you are mining on is small, this can take a few
+days to weeks.
+
+Additionally, any blocks found must mature before they can be paid
+out. This takes 60 blocks (approx. 2 hours).
+
+## Getting Help
+
+An active Monero mining community on Reddit is
+[/r/MoneroSupport](https://www.reddit.com/r/MoneroSupport/). You can
+also join [#monero-pools on
+freenode](https://webchat.freenode.net/?channel=#monero-pools).
+
+## Going Futher
+
+* Consider using a subaddress just for mining, to prevent your address
+  being linked to different services.
+* [Consider using Tor to connect to the
+  pool](https://xmrig.com/docs/miner/tor) (or to a hidden service pool
+  like HashVault, RespectXMR and MoneroOcean). This hides mining
+  activity from your ISP, and prevents the pool from knowing who you
+  are.

_i18n/es.yml

@@ -423,7 +423,7 @@ user-guides:
   purchasing-storing: Comprar y almacenar Monero de forma segura
   verify-allos: Verificar binarios en Linux, Mac o Windows en Consola de Comandos (avanzado)
   verify-windows: Verificar binarios en Windows (principiante)
-  mine-on-pool: Cómo minar en una pool con xmr-stak-cpu
+  mine-on-pool: Cómo minar en una pool con XMRig
   solo-mine: Cómo hacer minado en modo solo con la interfaz gráfica de usuario (GUI)
   mine-docker: Minar con Docker y XMRig
   locked-funds: Cómo recuperar/reparar fondos bloqueados

_i18n/es/resources/user-guides/mine-to-pool.md

@@ -1,115 +1,244 @@
-{% include disclaimer.html translated="yes" translationOutdated="no" %}
+{% include disclaimer.html translated="no" translationOutdated="no" %}
 
-# Seleccionando una pool
+## Wallet
 
-Hay muchas pools para escoger, una lista está disponible en
-[moneropools.com](https://moneropools.com). Minar en una pool grande puede significar
-pagos más frecuentes, pero minar en una pequeña ayuda a mantener la red
-descentralizada.
+Before starting, you already need to have a wallet configured and
+working. The pool needs to know your wallet address to be able to send
+payments there. See the [Accepting Monero guide]({{ site.baseurl
+}}/get-started/accepting) for more information.
 
-# Seleccionar un minero CPU
+## Profitability
 
-Al igual que las pools, hay muchos mineros para escoger. El que
-debes elegir depende del hardware que quieras utilizar para minar. Esta guía utilizará
-un minero CPU solamente, y será
-[xmr-stak-cpu](https://github.com/fireice-uk/xmr-stak-cpu). Otras alternativas son
-[wolf's CPUMiner](https://github.com/wolf9466/cpuminer-multi) y
-[sgminer-gm](https://github.com/genesismining/sgminer-gm). No obstante, su
-configuración es ligeramente distinta y no se estará cubriendo en esta guía.
+Before mining, you should decide if it is worth it or not for you. You
+have to decide this for yourself, based on your power costs and the
+hardware that you have available. There are many sites, such as
+[CryptoCompare](https://www.cryptocompare.com/mining/calculator/xmr)
+that allow you to enter your miner's speed and power draw, and it will
+show you the profit (or loss) per week/month.
 
-## Para sistemas Windows
+## Download Miner
 
-Si estás usando Windows, el desarrollador de xmr-stak-cpu provee los
-binarios para descargar en la página de lanzamientos en
-[GitHub](https://github.com/fireice-uk/xmr-stak-cpu/releases).
+The first step is to download mining software onto your computer.
 
-Descarga `xmr-stak-cpu-win64.zip` y extrae los archivos donde puedas
-encontrarlos después.
+### Windows
 
-## Para otros sistemas operativos
+The XMRig developer provides pre-built binaries for Windows
+users. They are available on the [GitHub release
+page](https://github.com/xmrig/xmrig/releases/latest).
 
-Si no estás usando Windows, tendrás que compilar xmr-stak-cpu tú mismo.
-Por suerte, esto no es tan difícil como suena. Antes de que compiles el minero,
-necesitarás instalar algunos prerrequisitos.
+Scroll down until you see `xmrig-VERSION-msvc-win64.zip`. Download
+this file and extract the archive somewhere memorable, like your desktop.
 
-Para distros basadas en Debian:
+### Ubuntu Linux
 
-    sudo apt-get install libmicrohttpd-dev libssl-dev cmake build-essential
+The XMRig developer provides pre-built binaries for Ubuntu Xenial
+Xerus (16.04). They may work on other Ubuntu versions, and on other
+distributions, but this is not guaranteed.
 
-Para distros basadas en Red Hat:
+These binaries are available on the [GitHub release
+page](https://github.com/xmrig/xmrig/releases/latest).
 
-	sudo yum install openssl-devel cmake gcc-c++ libmicrohttpd-devel
+Scroll down until you see `xmrig-VERSION-xenial-x64.tar.gz`. Download
+this file, extract the archive somewhere memorable, like your desktop.
 
-<!-- TODO: Add dependencies for other operating systems? -->
+### Other Linux
 
-A continuación, sólo necesitas utilizar cmake para generar los archivos de construcción, ejecutar
-make y copiar el archivo de configuración:
+Users of other Linux distributions can compile XMRig from
+source. Firstly, install the dependencies:
 
-	mkdir build-$(gcc -dumpmachine)
-	cd $_
-	cmake ../
-	make -j$(nproc)
-	cp ../config.txt bin/
-	cd bin
+```
+# For Debian-based distros
+sudo apt install \
+	build-essential \
+	cmake \
+	git \
+	libhwloc-dev \
+	libssl-dev \
+	libuv1-dev
+```
 
-Aún no es tiempo de celebrar, el minero necesita ser configurado. Ejecutar el minero
-ahora debe dar un bloque de texto para copiar y pegar:
+Download the XMRig source code:
 
-![image1](png/mine_to_pool/1.png)
+```
+git clone https://github.com/xmrig/xmrig.git
+cd xmrig
+```
 
-Abre `config.txt` y *reemplaza* las dos líneas `"cpu_threads_conf"` con el texto
-que acabas de copiar. Se debería ver como sigue:
+Configure and compile XMRig:
 
-![image2](png/mine_to_pool/2.png)
+```
+cmake -Bbuild
+make -Cbuild -j$(nproc)
+```
 
-Desplázate hacia abajo en el archivo hasta que veas las líneas que contienen `"pool_address"`.
-*Reemplaza* el contenido del segundo conjunto de comillas con la dirección y puerto de
-la pool que elegiste antes. Puedes encontrar esta información en el sitio web de la pool.
+Copy binary and example configuration to your home directory:
 
-Ingresa tu dirección de monedero entre las comillas en wallet_address. Puedes dejar
-la contraseña en blanco a no ser que la pool especifique lo contrario.
+```
+cp build/xmrig ~/
+cp src/config.json ~/
+```
 
-Después de esto, tu archivo config  se deberá ver algo así:
+### macOS Build
 
-![image3](png/mine_to_pool/3.png)
+Firstly, install XCode and [Homebrew](https://brew.sh).
 
-# Ejecutando el minero
+Use Homebrew to install dependencies:
 
-**Guarda el archivo config** y ejecuta el minero.
+```
+brew install \
+	cmake \
+	hwloc \
+	libmicrohttpd \
+	libuv \
+	openssl
+```
 
-![image4](png/mine_to_pool/4.png)
+Download XMRig sources:
 
-Algunas pools te permiten monitorear tu hashrate al pegar tu dirección en su
-sitio web. También puedes monitorear tu hashrate presionando la tecla `h`.
+```
+git clone https://github.com/xmrig/xmrig.git
+cd xmrig
+```
 
-# Optimizando el minero
+Configure and compile XMRig:
 
-Es posible que veas mensajes desagradables como este:
+```
+cmake -Bbuild -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl
+make -Cbuild -j$(nproc)
+```
 
-	[2017-07-09 12:04:02] : MEMORY ALLOC FAILED: mmap failed
+Copy binary and example configuration to your home directory:
 
-Esto significa que puedes obtener alrededor de un 20% extra de hashrate activando las páginas grandes.
+```
+cp build/xmrig ~/
+cp src/config.json ~/
+```
 
-## Páginas grandes en Linux
+## Selecting a pool
 
-En primer lugar, detén el minero (si está en ejecución), y ejecuta los siguientes comandos para activar las
-páginas grandes e iniciar el minero como root:
+There are lots of pools to choose from. You can find a list at
+[miningpoolstats.stream/monero](https://miningpoolstats.stream/monero).
 
-	sudo sysctl -w vm.nr_hugepages=128
-	sudo ./xmr-stak-cpu
+Choosing a larger pool means that you will see more frequent (but
+smaller) payouts, but choosing a smaller pools helps keep the network
+decentralised. [Miners will not lose any revenue by mining on a
+smaller pool](https://redd.it/g6uh2l).
 
-## Páginas grandes en Windows
+## Configuring the miner
 
-Tomado de `config.txt`:
+Navigate to your chosen pool's webpage and read their
+documentation. They should mention an address and port for you to
+enter into your miner. For example, `pool.xmr.pt:3333`.
 
->Por defecto trataremos de asignar páginas grandes. Esto significa que necesitas "Ejecutar como Administrador" en Windows.
-Necesitas editar las políticas de grupo del sistema para habilitar el bloqueo de páginas grandes. Aquí están los pasos de MSDN
-1. En el menú de inicio, haz clic en Ejecutar. En la ventana abierta, escribe gpedit.msc.
-2. En la consola de Editor de directivas de grupo local, expande Configuración del equipo, y luego expande Configuración de Windows.
-3. Expande Configuración de seguridad, y luego expande Directivas locales.
-4. Selecciona la carpeta Asignación de derechos de usuario.
-5. Las políticas serán mostradas en el panel de detalles.
-6. En el panel, haz doble clic en Bloquear páginas en la memoria.
-7. En la pestaña Configuración de seguridad local, haz clic en Agregar usuario o grupo.
-8. En el cuadro de dialogo Seleccionar Usuarios, Cuentas de Servicio o Grupos, agrega una cuenta con la que vas a ejecutar el minero.
-9. Reinicia para que el cambio haga efecto.
+Next, open up the config.json you copied or extracted earlier in your
+favourite text editor. Scroll down to the line that says
+`donate.v2.xmrig.com:3333` and change the text inside the quotes to
+the address of your pool. The line below should contain
+`YOUR_WALLET_ADDRESS`. Change that to your actual wallet address.
+
+After these modifications, your configuration should look something like this:
+
+```
+{
+	// [...]
+	"pools": [
+		{
+			"url": "pool.xmr.pt:3333",
+			"user": "43YjW8SZov..."
+		}
+	],
+	// [...]
+}
+```
+
+## Starting the miner
+
+Windows users can double click on xmrig.exe. Users of other operating
+systems should `cd` into the directory that contains XMRig and then
+type `./xmrig` and press return.
+
+If you see green messages saying that shares have been accepted,
+congratulations, everything is working!
+
+## Troubleshooting
+
+### Anti-virus keeps removing XMRig
+
+Some anti-viruses flag XMRig as malware because it is often deployed
+to infected computers to mine without the owner's consent. As it is
+your computer and you are configuring the miner to mine for you, it is
+safe to add XMRig to your anti-virus whitelist.
+
+### Cannot read/set MSR
+
+On some CPUs, XMRig tries to increase performance by disabling certain
+features like your CPU's instruction prefetcher. These operations
+require root/administrator, so try right clicking xmrig.exe and
+running it as administrator, or running `sudo ./xmrig` on other
+systems.
+
+### Algo not known
+
+Find the line in config.json that says `algo: null` and change it to
+`algo: "rx/0"`. By default, XMRig expects the pool to tell it which
+hashing algorithm to use.
+
+### Huge Pages 0%
+
+#### Allowing large pages on Windows
+
+Taken from [the MSDN](https://docs.microsoft.com/en-us/sql/database-engine/configure-windows/enable-the-lock-pages-in-memory-option-windows?view=sql-server-ver15):
+
+>1. On the Start menu, click Run. In the Open box, type gpedit.msc.
+2. On the Local Group Policy Editor console, expand Computer Configuration, and then expand Windows Settings.
+3. Expand Security Settings, and then expand Local Policies.
+4. Select the User Rights Assignment folder.
+5. The policies will be displayed in the details pane.
+6. In the pane, double-click Lock pages in memory.
+7. In the Local Security Setting – Lock pages in memory dialog box, click Add User or Group.
+8. In the Select Users, Service Accounts, or Groups dialog box, add an account that you will run the miner on
+9. Reboot for change to take effect.
+
+You may also need to launch the miner as administrator.
+
+#### Allowing large pages on Linux
+
+Firstly stop the miner (if it's running), run the following commands to enable
+large pages and then start the miner as root:
+
+	sudo sysctl -w vm.nr_hugepages=1168
+	sudo ./xmrig
+
+You may have to increase 1168 depending on how many NUMA nodes your
+CPU(s) have.
+
+#### Allowing large pages on macOS
+
+Huge pages are not supported on macOS.
+
+### Balance Not Increasing
+
+Most pools are <abbr title="Pay Per Last N Shares">PPLNS</abbr> pools,
+which means that you only get paid when a miner on the pool finds a
+block. If the pool you are mining on is small, this can take a few
+days to weeks.
+
+Additionally, any blocks found must mature before they can be paid
+out. This takes 60 blocks (approx. 2 hours).
+
+## Getting Help
+
+An active Monero mining community on Reddit is
+[/r/MoneroSupport](https://www.reddit.com/r/MoneroSupport/). You can
+also join [#monero-pools on
+freenode](https://webchat.freenode.net/?channel=#monero-pools).
+
+## Going Futher
+
+* Consider using a subaddress just for mining, to prevent your address
+  being linked to different services.
+* [Consider using Tor to connect to the
+  pool](https://xmrig.com/docs/miner/tor) (or to a hidden service pool
+  like HashVault, RespectXMR and MoneroOcean). This hides mining
+  activity from your ISP, and prevents the pool from knowing who you
+  are.

_i18n/fr.yml

@@ -424,7 +424,7 @@ user-guides:
   purchasing-storing: Acheter et Conserver Monero en toute sécurité
   verify-allos: Vérifier des binaires sur Linux, Mac ou Windows en ligne de commande (avancé)
   verify-windows: Vérifier des binaires sur Windows (Débutant)
-  mine-on-pool: Comment miner sur un pool avec xmr-stak-cpu
+  mine-on-pool: Comment miner sur un pool avec XMRig
   solo-mine: Comment miner en solo avec la GUI
   mine-docker: Miner avec Docker et XMRig
   locked-funds: Comment corriger un blocage de fonds

_i18n/fr/resources/user-guides/mine-to-pool.md

@@ -1,115 +1,195 @@
-{% include disclaimer.html translated="yes" translationOutdated="no" %}
+{% include disclaimer.html translated="no" translationOutdated="no" %}
 
-# Choisir un pool
+## Wallet
 
-Il y a de nombreux pool parmi lesquels choisir, une liste est disponible sur
-[moneropools.com](https://moneropools.com). Miner sur un grand pool signifie
-des paiements plus fréquent, mais miner sur un pool plus petit permet de
-maintenir la décentralisation du réseau.
+Before starting, you already need to have a wallet configured and
+working. The pool needs to know your wallet address to be able to send
+payments there. See the [Accepting Monero guide]({{ site.baseurl
+}}/get-started/accepting) for more information.
 
-# Choisir un mineur
+## Profitability
 
-Tout comme pour les pools, il y a de nombreuses applications d'extraction minière parmi lesquelles
-choisir. Celle que vous sélectionnerez dépendra du matériel sur lequel vous aller
-miner. Ce guide va se concentrer sur un mineur pour CPU, et utilisera
-[xmr-stak-cpu](https://github.com/fireice-uk/xmr-stak-cpu). Alternativement, vous
-pouvez utiliser [wolf's CPUMiner](https://github.com/wolf9466/cpuminer-multi) ou
-[sgminer-gm](https://github.com/genesismining/sgminer-gm). Cependant, leurs
-configurations sont légèrement différentes et ne seront pas abordés dans ce guide.
+Before mining, you should decide if it is worth it or not for you. You
+have to decide this for yourself, based on your power costs and the
+hardware that you have available. There are many sites, such as
+[CryptoCompare](https://www.cryptocompare.com/mining/calculator/xmr)
+that allow you to enter your miner's speed and power draw, and it will
+show you the profit (or loss) per week/month.
 
-## Pour Windows
+## Download Miner
 
-Si vous utilisez Windows, le développeur de xmr-stak-cpu fournit des binaires à
-télécharger sur page
-[GitHub Version](https://github.com/fireice-uk/xmr-stak-cpu/releases).
+The first step is to download mining software onto your computer.
 
-Téléchargez et décompressez `xmr-stak-cpu-win64.zip` à un endroit où vous pourrez
-le retrouver.
+### Windows
 
-## Pour d'autres systèmes d'exploitation
+The XMRig developer provides pre-built binaries for Windows
+users. They are available on the [GitHub release
+page](https://github.com/xmrig/xmrig/releases/latest).
 
-Si vous n'utilisez pas windows, vous devrez compiler xmr-stak-cpu vous-même,
-heureusement ce n'est pas si difficile qu'il n'y parait. Avant de pouvoir compiler
-le mineur, vous devez installer certains de ses prérequis.
+Scroll down until you see `xmrig-VERSION-msvc-win64.zip`. Download
+this file and extract the archive somewhere memorable, like your desktop.
 
-Pour les distributions basées sur Debian :
+### Ubuntu Linux
 
-    sudo apt-get install libmicrohttpd-dev libssl-dev cmake build-essential
+The XMRig developer provides pre-built binaries for Ubuntu Xenial
+Xerus (16.04). They may work on other Ubuntu versions, and on other
+distributions, but this is not guaranteed.
 
-Pour les distributions basées sur Red Hat :
+These binaries are available on the [GitHub release
+page](https://github.com/xmrig/xmrig/releases/latest).
 
-	sudo yum install openssl-devel cmake gcc-c++ libmicrohttpd-devel
+Scroll down until you see `xmrig-VERSION-xenial-x64.tar.gz`. Download
+this file, extract the archive somewhere memorable, like your desktop.
 
-<!-- TODO: Add dependencies for other operating systems? -->
+### Other Linux
 
-Après cela, vous n'avez plus qu'à utiliser cmake pour générer les fichier
-nécessaires, lancer make et copier le fichier de configuration :
+Users of other Linux distributions can compile XMRig from
+source. Firstly, install the dependencies:
 
-    mkdir build-$(gcc -dumpmachine)
-	cd $_
-	cmake ../
-	make -j$(nproc)
-	cp ../config.txt bin/
-	cd bin
+```
+# For Debian-based distros
+sudo apt install \
+	build-essential \
+	cmake \
+	git \
+	libhwloc-dev \
+	libssl-dev \
+	libuv1-dev
+```
 
-Ne criez pas victoire tout de suite, car le mineur doit encore être
-onfiguré. Lancer le mineur maintenant devrait vous donner un bloc de
-texte à copier et coller :
+Download the XMRig source code:
 
-![image1](png/mine_to_pool/1.png)
+```
+git clone https://github.com/xmrig/xmrig.git
+cd xmrig
+```
 
-Ouvrez `config.txt` et *remplacez* les deux lignes `"cpu_threads_conf"` avec le
-texte que vous venez de copier. Après-coup, voici à quoi cela devrait recembler :
+Configure and compile XMRig:
 
-![image2](png/mine_to_pool/2.png)
+```
+cmake -Bbuild
+make -Cbuild -j$(nproc)
+```
 
-Descendez dans le fichier jusqu'à trouver le ligne contenant `"pool_address"`.
-*Remplacez* le contenu du second jeux de guillemets avec l'adresse et le port du
-pool que vous avez précédemment choisis. Vous pourrez trouver ces informations sur
-le site web du pool.
+Copy binary and example configuration to your home directory:
 
-Saisissez l'adresse de votre portefeuille entre les guillemets sur la ligne "wallet
-address". Vous pouvez laisser le mot de passe vierge, sauf avis contraire du pool.
+```
+cp build/xmrig ~/
+cp src/config.json ~/
+```
 
-Après cela, votre configuration devrait ressembler à ceci :
+### macOS Build
 
-![image3](png/mine_to_pool/3.png)
+Firstly, install XCode and [Homebrew](https://brew.sh).
 
-# Lancer le mineur
+Use Homebrew to install dependencies:
 
-**Sauvegardez le fichier de configuration** et lancez le mineur !
+```
+brew install \
+	cmake \
+	hwloc \
+	libmicrohttpd \
+	libuv \
+	openssl
+```
 
-![image4](png/mine_to_pool/4.png)
+Download XMRig sources:
 
-Certains pools vous permettent d'observer votre taux de hachage en collant votre
-adresse sur leur site web. Vous pouvez également surveiller votre taux de hachage en
-tapant la touche `h`.
+```
+git clone https://github.com/xmrig/xmrig.git
+cd xmrig
+```
 
-# Ajuster le lgiciel d'extraction minière
+Configure and compile XMRig:
 
-Vous pourriez voir des messages désagréables comme ceci :
+```
+cmake -Bbuild -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl
+make -Cbuild -j$(nproc)
+```
 
-	[2017-07-09 12:04:02] : MEMORY ALLOC FAILED: mmap failed
+Copy binary and example configuration to your home directory:
 
-Cela signifie que vous pourriez obtenir une amélioration du taux de hachage d'environ
-20% en activant les pages larges.
+```
+cp build/xmrig ~/
+cp src/config.json ~/
+```
 
-## Pages larges sur linux
+## Selecting a pool
 
-Tout d'abord, arrêtez le mineur (s'il est en fonctionnement), lancez la
-commande suivante pour activer les pages larges puis redémarrez l'application
-d'extraction minière en tant que root :
+There are lots of pools to choose from. You can find a list at
+[miningpoolstats.stream/monero](https://miningpoolstats.stream/monero).
 
-	sudo sysctl -w vm.nr_hugepages=128
-	sudo ./xmr-stak-cpu
+Choosing a larger pool means that you will see more frequent (but
+smaller) payouts, but choosing a smaller pools helps keep the network
+decentralised. [Miners will not lose any revenue by mining on a
+smaller pool](https://redd.it/g6uh2l).
 
-## Pages larges sur Windows
+## Configuring the miner
 
-Comme expliqué dans `config.txt`:
+Navigate to your chosen pool's webpage and read their
+documentation. They should mention an address and port for you to
+enter into your miner. For example, `pool.xmr.pt:3333`.
 
->By default we will try to allocate large pages. This means you need to "Run As Administrator" on Windows
-You need to edit your system's group policies to enable locking large pages. Here are the steps from MSDN
-1. On the Start menu, click Run. In the Open box, type gpedit.msc.
+Next, open up the config.json you copied or extracted earlier in your
+favourite text editor. Scroll down to the line that says
+`donate.v2.xmrig.com:3333` and change the text inside the quotes to
+the address of your pool. The line below should contain
+`YOUR_WALLET_ADDRESS`. Change that to your actual wallet address.
+
+After these modifications, your configuration should look something like this:
+
+```
+{
+	// [...]
+	"pools": [
+		{
+			"url": "pool.xmr.pt:3333",
+			"user": "43YjW8SZov..."
+		}
+	],
+	// [...]
+}
+```
+
+## Starting the miner
+
+Windows users can double click on xmrig.exe. Users of other operating
+systems should `cd` into the directory that contains XMRig and then
+type `./xmrig` and press return.
+
+If you see green messages saying that shares have been accepted,
+congratulations, everything is working!
+
+## Troubleshooting
+
+### Anti-virus keeps removing XMRig
+
+Some anti-viruses flag XMRig as malware because it is often deployed
+to infected computers to mine without the owner's consent. As it is
+your computer and you are configuring the miner to mine for you, it is
+safe to add XMRig to your anti-virus whitelist.
+
+### Cannot read/set MSR
+
+On some CPUs, XMRig tries to increase performance by disabling certain
+features like your CPU's instruction prefetcher. These operations
+require root/administrator, so try right clicking xmrig.exe and
+running it as administrator, or running `sudo ./xmrig` on other
+systems.
+
+### Algo not known
+
+Find the line in config.json that says `algo: null` and change it to
+`algo: "rx/0"`. By default, XMRig expects the pool to tell it which
+hashing algorithm to use.
+
+### Huge Pages 0%
+
+#### Allowing large pages on Windows
+
+Taken from [the MSDN](https://docs.microsoft.com/en-us/sql/database-engine/configure-windows/enable-the-lock-pages-in-memory-option-windows?view=sql-server-ver15):
+
+>1. On the Start menu, click Run. In the Open box, type gpedit.msc.
 2. On the Local Group Policy Editor console, expand Computer Configuration, and then expand Windows Settings.
 3. Expand Security Settings, and then expand Local Policies.
 4. Select the User Rights Assignment folder.
@@ -118,3 +198,47 @@ You need to edit your system's group policies to enable locking large pages. Her
 7. In the Local Security Setting – Lock pages in memory dialog box, click Add User or Group.
 8. In the Select Users, Service Accounts, or Groups dialog box, add an account that you will run the miner on
 9. Reboot for change to take effect.
+
+You may also need to launch the miner as administrator.
+
+#### Allowing large pages on Linux
+
+Firstly stop the miner (if it's running), run the following commands to enable
+large pages and then start the miner as root:
+
+	sudo sysctl -w vm.nr_hugepages=1168
+	sudo ./xmrig
+
+You may have to increase 1168 depending on how many NUMA nodes your
+CPU(s) have.
+
+#### Allowing large pages on macOS
+
+Huge pages are not supported on macOS.
+
+### Balance Not Increasing
+
+Most pools are <abbr title="Pay Per Last N Shares">PPLNS</abbr> pools,
+which means that you only get paid when a miner on the pool finds a
+block. If the pool you are mining on is small, this can take a few
+days to weeks.
+
+Additionally, any blocks found must mature before they can be paid
+out. This takes 60 blocks (approx. 2 hours).
+
+## Getting Help
+
+An active Monero mining community on Reddit is
+[/r/MoneroSupport](https://www.reddit.com/r/MoneroSupport/). You can
+also join [#monero-pools on
+freenode](https://webchat.freenode.net/?channel=#monero-pools).
+
+## Going Futher
+
+* Consider using a subaddress just for mining, to prevent your address
+  being linked to different services.
+* [Consider using Tor to connect to the
+  pool](https://xmrig.com/docs/miner/tor) (or to a hidden service pool
+  like HashVault, RespectXMR and MoneroOcean). This hides mining
+  activity from your ISP, and prevents the pool from knowing who you
+  are.

_i18n/it.yml

@@ -423,7 +423,7 @@ user-guides:
   purchasing-storing: Acquistare e conservare Monero in modo sicuro
   verify-allos: Verificare i binari sulla riga di comando Linux, Mac, or Windows (avanzata)
   verify-windows: Verificare i binari su Windows (neofita)
-  mine-on-pool: Come minare su un pool con xmr-stak-cpu
+  mine-on-pool: Come minare su un pool con XMRig
   solo-mine: Solo-mine con la GUI
   mine-docker: Minare con Docker and XMRig
   locked-funds: Come sbloccare fondi bloccati

_i18n/it/resources/user-guides/mine-to-pool.md

@@ -1,110 +1,195 @@
 {% include disclaimer.html translated="no" translationOutdated="no" %}
 
-# Selecting a pool
+## Wallet
 
-There are many pools to choose from, a list is available at
-[moneropools.com](https://moneropools.com). Mining on a larger pool could mean
-more frequent payouts, but mining on a smaller pool helps to keep the network
-decentralized.
+Before starting, you already need to have a wallet configured and
+working. The pool needs to know your wallet address to be able to send
+payments there. See the [Accepting Monero guide]({{ site.baseurl
+}}/get-started/accepting) for more information.
 
-# Selecting a CPU miner
+## Profitability
 
-Just like pools, there are a lot of miners to choose from. The one that you
-should pick depends on the hardware you want to mine on. This guide will only
-use a CPU miner, and will be using
-[xmr-stak-cpu](https://github.com/fireice-uk/xmr-stak-cpu). Alternatives include
-[wolf's CPUMiner](https://github.com/wolf9466/cpuminer-multi) and
-[sgminer-gm](https://github.com/genesismining/sgminer-gm). However, their
-configuration is slightly different and will not be covered in this guide.
+Before mining, you should decide if it is worth it or not for you. You
+have to decide this for yourself, based on your power costs and the
+hardware that you have available. There are many sites, such as
+[CryptoCompare](https://www.cryptocompare.com/mining/calculator/xmr)
+that allow you to enter your miner's speed and power draw, and it will
+show you the profit (or loss) per week/month.
 
-## For Windows Systems
+## Download Miner
 
-If you are using a Windows system, the developer of xmr-stak-cpu provides
-binaries to download on the
-[GitHub release page](https://github.com/fireice-uk/xmr-stak-cpu/releases).
+The first step is to download mining software onto your computer.
 
-Download `xmr-stak-cpu-win64.zip` and extract it somewhere you'll be able to
-find it again.
+### Windows
 
-## For Other Operating Systems
+The XMRig developer provides pre-built binaries for Windows
+users. They are available on the [GitHub release
+page](https://github.com/xmrig/xmrig/releases/latest).
 
-If you're not using Windows, you will have to compile xmr-stak-cpu for yourself,
-luckily this isn't as hard as it sounds. Before you can compile the miner, you
-will need to install some of its prerequisites.
+Scroll down until you see `xmrig-VERSION-msvc-win64.zip`. Download
+this file and extract the archive somewhere memorable, like your desktop.
 
-For Debian-based distros:
+### Ubuntu Linux
 
-    sudo apt-get install libmicrohttpd-dev libssl-dev cmake build-essential
+The XMRig developer provides pre-built binaries for Ubuntu Xenial
+Xerus (16.04). They may work on other Ubuntu versions, and on other
+distributions, but this is not guaranteed.
 
-For Red Hat based distros:
+These binaries are available on the [GitHub release
+page](https://github.com/xmrig/xmrig/releases/latest).
 
-	sudo yum install openssl-devel cmake gcc-c++ libmicrohttpd-devel
+Scroll down until you see `xmrig-VERSION-xenial-x64.tar.gz`. Download
+this file, extract the archive somewhere memorable, like your desktop.
 
-<!-- TODO: Add dependencies for other operating systems? -->
+### Other Linux
 
-Following this, you just need to use cmake to generate the build files, run
-make and copy the config file:
+Users of other Linux distributions can compile XMRig from
+source. Firstly, install the dependencies:
 
-    mkdir build-$(gcc -dumpmachine)
-	cd $_
-	cmake ../
-	make -j$(nproc)
-	cp ../config.txt bin/
-	cd bin
+```
+# For Debian-based distros
+sudo apt install \
+	build-essential \
+	cmake \
+	git \
+	libhwloc-dev \
+	libssl-dev \
+	libuv1-dev
+```
 
-Don't celebrate just yet, as the miner needs to be configured. Running the miner
-now should give you a block of text to copy and paste:
+Download the XMRig source code:
 
-![image1](png/mine_to_pool/1.png)
+```
+git clone https://github.com/xmrig/xmrig.git
+cd xmrig
+```
 
-Open `config.txt` and *replace* the two `"cpu_threads_conf"` lines with the text
-you just copied. It should look something like this afterwards:
+Configure and compile XMRig:
 
-![image2](png/mine_to_pool/2.png)
+```
+cmake -Bbuild
+make -Cbuild -j$(nproc)
+```
 
-Scroll down in the file until you see the lines containing `"pool_address"`.
-*Replace* the contents of the second set of quotes with the address and port of
-the pool you chose earlier. You can find this information on the pool's website.
+Copy binary and example configuration to your home directory:
 
-Put your wallet address between the quotes on the wallet address. You may leave
-the password blank unless the pool specifies otherwise.
+```
+cp build/xmrig ~/
+cp src/config.json ~/
+```
 
-After this, your config should look something like this:
+### macOS Build
 
-![image3](png/mine_to_pool/3.png)
+Firstly, install XCode and [Homebrew](https://brew.sh).
 
-# Running the miner
+Use Homebrew to install dependencies:
 
-**Save the config** file and run the miner!
+```
+brew install \
+	cmake \
+	hwloc \
+	libmicrohttpd \
+	libuv \
+	openssl
+```
 
-![image4](png/mine_to_pool/4.png)
+Download XMRig sources:
 
-Some pools allow you to monitor your hashrate by pasting your address into their
-website. You can also monitor your hashrate by pressing the `h` key.
+```
+git clone https://github.com/xmrig/xmrig.git
+cd xmrig
+```
 
-# Tuning the miner
+Configure and compile XMRig:
 
-You might see nasty messages like this:
+```
+cmake -Bbuild -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl
+make -Cbuild -j$(nproc)
+```
 
-	[2017-07-09 12:04:02] : MEMORY ALLOC FAILED: mmap failed
+Copy binary and example configuration to your home directory:
 
-This means that you can get around a 20% hashrate boost by enabling large pages.
+```
+cp build/xmrig ~/
+cp src/config.json ~/
+```
 
-## Large pages on Linux
+## Selecting a pool
 
-Firstly stop the miner (if it's running), run the following commands to enable
-large pages and then start the miner as root:
+There are lots of pools to choose from. You can find a list at
+[miningpoolstats.stream/monero](https://miningpoolstats.stream/monero).
 
-	sudo sysctl -w vm.nr_hugepages=128
-	sudo ./xmr-stak-cpu
+Choosing a larger pool means that you will see more frequent (but
+smaller) payouts, but choosing a smaller pools helps keep the network
+decentralised. [Miners will not lose any revenue by mining on a
+smaller pool](https://redd.it/g6uh2l).
 
-## Large pages on Windows
+## Configuring the miner
 
-Taken from `config.txt`:
+Navigate to your chosen pool's webpage and read their
+documentation. They should mention an address and port for you to
+enter into your miner. For example, `pool.xmr.pt:3333`.
 
->By default we will try to allocate large pages. This means you need to "Run As Administrator" on Windows
-You need to edit your system's group policies to enable locking large pages. Here are the steps from MSDN
-1. On the Start menu, click Run. In the Open box, type gpedit.msc.
+Next, open up the config.json you copied or extracted earlier in your
+favourite text editor. Scroll down to the line that says
+`donate.v2.xmrig.com:3333` and change the text inside the quotes to
+the address of your pool. The line below should contain
+`YOUR_WALLET_ADDRESS`. Change that to your actual wallet address.
+
+After these modifications, your configuration should look something like this:
+
+```
+{
+	// [...]
+	"pools": [
+		{
+			"url": "pool.xmr.pt:3333",
+			"user": "43YjW8SZov..."
+		}
+	],
+	// [...]
+}
+```
+
+## Starting the miner
+
+Windows users can double click on xmrig.exe. Users of other operating
+systems should `cd` into the directory that contains XMRig and then
+type `./xmrig` and press return.
+
+If you see green messages saying that shares have been accepted,
+congratulations, everything is working!
+
+## Troubleshooting
+
+### Anti-virus keeps removing XMRig
+
+Some anti-viruses flag XMRig as malware because it is often deployed
+to infected computers to mine without the owner's consent. As it is
+your computer and you are configuring the miner to mine for you, it is
+safe to add XMRig to your anti-virus whitelist.
+
+### Cannot read/set MSR
+
+On some CPUs, XMRig tries to increase performance by disabling certain
+features like your CPU's instruction prefetcher. These operations
+require root/administrator, so try right clicking xmrig.exe and
+running it as administrator, or running `sudo ./xmrig` on other
+systems.
+
+### Algo not known
+
+Find the line in config.json that says `algo: null` and change it to
+`algo: "rx/0"`. By default, XMRig expects the pool to tell it which
+hashing algorithm to use.
+
+### Huge Pages 0%
+
+#### Allowing large pages on Windows
+
+Taken from [the MSDN](https://docs.microsoft.com/en-us/sql/database-engine/configure-windows/enable-the-lock-pages-in-memory-option-windows?view=sql-server-ver15):
+
+>1. On the Start menu, click Run. In the Open box, type gpedit.msc.
 2. On the Local Group Policy Editor console, expand Computer Configuration, and then expand Windows Settings.
 3. Expand Security Settings, and then expand Local Policies.
 4. Select the User Rights Assignment folder.
@@ -113,3 +198,47 @@ You need to edit your system's group policies to enable locking large pages. Her
 7. In the Local Security Setting – Lock pages in memory dialog box, click Add User or Group.
 8. In the Select Users, Service Accounts, or Groups dialog box, add an account that you will run the miner on
 9. Reboot for change to take effect.
+
+You may also need to launch the miner as administrator.
+
+#### Allowing large pages on Linux
+
+Firstly stop the miner (if it's running), run the following commands to enable
+large pages and then start the miner as root:
+
+	sudo sysctl -w vm.nr_hugepages=1168
+	sudo ./xmrig
+
+You may have to increase 1168 depending on how many NUMA nodes your
+CPU(s) have.
+
+#### Allowing large pages on macOS
+
+Huge pages are not supported on macOS.
+
+### Balance Not Increasing
+
+Most pools are <abbr title="Pay Per Last N Shares">PPLNS</abbr> pools,
+which means that you only get paid when a miner on the pool finds a
+block. If the pool you are mining on is small, this can take a few
+days to weeks.
+
+Additionally, any blocks found must mature before they can be paid
+out. This takes 60 blocks (approx. 2 hours).
+
+## Getting Help
+
+An active Monero mining community on Reddit is
+[/r/MoneroSupport](https://www.reddit.com/r/MoneroSupport/). You can
+also join [#monero-pools on
+freenode](https://webchat.freenode.net/?channel=#monero-pools).
+
+## Going Futher
+
+* Consider using a subaddress just for mining, to prevent your address
+  being linked to different services.
+* [Consider using Tor to connect to the
+  pool](https://xmrig.com/docs/miner/tor) (or to a hidden service pool
+  like HashVault, RespectXMR and MoneroOcean). This hides mining
+  activity from your ISP, and prevents the pool from knowing who you
+  are.

_i18n/nl.yml

@@ -424,7 +424,7 @@ user-guides:
   purchasing-storing: Monero kopen en veilig opslaan
   verify-allos: Binaries verifiëren op een opdrachtregel in Linux, Mac of Windows (geavanceerd)
   verify-windows: Binaries verifiëren in Windows (voor beginners)
-  mine-on-pool: Minen via een pool met xmr-stak-cpu
+  mine-on-pool: Minen via een pool met XMRig
   solo-mine: Solo minen met de grafische interface (GUI)
   mine-docker: Minen met Docker en XMRig
   locked-funds: Vergrendeld geld ontgrendelen

_i18n/nl/resources/user-guides/mine-to-pool.md

@@ -1,115 +1,244 @@
-{% include disclaimer.html translated="yes" translationOutdated="no" %}
+{% include disclaimer.html translated="no" translationOutdated="no" %}
 
-# Een pool selecteren
+## Wallet
 
-Je kunt uit allerlei pools kiezen. Er staat een lijst op
-[moneropools.com](https://moneropools.com). Als je bij een grotere pool minet, kun je
-vaker betaald worden, maar als je bij een kleinere pool minet, help je het netwerk
-gedecentraliseerd te houden.
+Before starting, you already need to have a wallet configured and
+working. The pool needs to know your wallet address to be able to send
+payments there. See the [Accepting Monero guide]({{ site.baseurl
+}}/get-started/accepting) for more information.
 
-# Een CPU-miningprogramma selecteren
+## Profitability
 
-Net als pools zijn er veel miningprogramma's waaruit je kunt kiezen. Welke soort software
-je nodig hebt hangt af van de hardware waarop je wilt minen. Deze handleiding gaat over
-minen op een CPU, en daarvoor gebruiken we
-[xmr-stak-cpu](https://github.com/fireice-uk/xmr-stak-cpu). Andere mogelijkheden zijn onder meer
-[wolf's CPUMiner](https://github.com/wolf9466/cpuminer-multi) en
-[sgminer-gm](https://github.com/genesismining/sgminer-gm). Maar de
-configuratie daarvan is net iets anders en wordt hier niet behandeld.
+Before mining, you should decide if it is worth it or not for you. You
+have to decide this for yourself, based on your power costs and the
+hardware that you have available. There are many sites, such as
+[CryptoCompare](https://www.cryptocompare.com/mining/calculator/xmr)
+that allow you to enter your miner's speed and power draw, and it will
+show you the profit (or loss) per week/month.
 
-## Voor Windows-systemen
+## Download Miner
 
-Als je een Windows-systeem gebruikt, kun je de binaries van xmr-stak-cpu
-downloaden op de
-[release-pagina op GitHub](https://github.com/fireice-uk/xmr-stak-cpu/releases).
+The first step is to download mining software onto your computer.
 
-Download `xmr-stak-cpu-win64.zip` en pak het uit op een plek waar je
-het kunt terugvinden.
+### Windows
 
-## Voor andere besturingssystemen
+The XMRig developer provides pre-built binaries for Windows
+users. They are available on the [GitHub release
+page](https://github.com/xmrig/xmrig/releases/latest).
 
-Als je niet Windows gebruikt, moet je zelf xmr-stak-cpu compileren.
-Gelukkig is dat niet zo moeilijk als het klinkt. Voordat je het miningprogramma kunt compileren,
-moet je een paar vereiste onderdelen installeren.
+Scroll down until you see `xmrig-VERSION-msvc-win64.zip`. Download
+this file and extract the archive somewhere memorable, like your desktop.
 
-Voor distributies op basis van Debian:
+### Ubuntu Linux
 
-    sudo apt-get install libmicrohttpd-dev libssl-dev cmake build-essential
+The XMRig developer provides pre-built binaries for Ubuntu Xenial
+Xerus (16.04). They may work on other Ubuntu versions, and on other
+distributions, but this is not guaranteed.
 
-Voor distributies op basis van Red Hat:
+These binaries are available on the [GitHub release
+page](https://github.com/xmrig/xmrig/releases/latest).
 
-	sudo yum install openssl-devel cmake gcc-c++ libmicrohttpd-devel
+Scroll down until you see `xmrig-VERSION-xenial-x64.tar.gz`. Download
+this file, extract the archive somewhere memorable, like your desktop.
 
-<!-- TODO: Add dependencies for other operating systems? -->
+### Other Linux
 
-Hierna hoef je alleen nog de build-bestanden te maken met cmake,
-make uit te voeren en het configuratiebestand te kopiëren:
+Users of other Linux distributions can compile XMRig from
+source. Firstly, install the dependencies:
 
-    mkdir build-$(gcc -dumpmachine)
-	cd $_
-	cmake ../
-	make -j$(nproc)
-	cp ../config.txt bin/
-	cd bin
+```
+# For Debian-based distros
+sudo apt install \
+	build-essential \
+	cmake \
+	git \
+	libhwloc-dev \
+	libssl-dev \
+	libuv1-dev
+```
 
-Juich niet te vroeg, want het miningprogramma moet nog worden geconfigureerd. Als je het miningprogramma nu uitvoert,
-wordt er een blok tekst weergegeven om te kopiëren en plakken:
+Download the XMRig source code:
 
-![image1](png/mine_to_pool/1.png)
+```
+git clone https://github.com/xmrig/xmrig.git
+cd xmrig
+```
 
-Open `config.txt` en *vervang* de twee regels `"cpu_threads_conf"` met de tekst
-die je net hebt gekopieerd. Daarna zou het er ongeveer zo uit moeten zien:
+Configure and compile XMRig:
 
-![image2](png/mine_to_pool/2.png)
+```
+cmake -Bbuild
+make -Cbuild -j$(nproc)
+```
 
-Schuif omlaag in het bestand tot je bij de regels met `"pool_address"` bent.
-*Vervang* de inhoud van het tweede stel aanhalingstekens met het adres en de poort van
-de pool die je eerder hebt gekozen. Je kunt deze informatie op de website van de pool vinden.
+Copy binary and example configuration to your home directory:
 
-Plak het adres van je portemonnee tussen de aanhalingstekens bij `wallet_address`. Je kunt het
-wachtwoord leeg laten, tenzij de pool een wachtwoord vereist.
+```
+cp build/xmrig ~/
+cp src/config.json ~/
+```
 
-Hierna zou je configuratie er ongeveer zo uit moeten zien:
+### macOS Build
 
-![image3](png/mine_to_pool/3.png)
+Firstly, install XCode and [Homebrew](https://brew.sh).
 
-# Het miningprogramma uitvoeren
+Use Homebrew to install dependencies:
 
-**Sla het configuratiebestand op** en voer het miningprogramma uit.
+```
+brew install \
+	cmake \
+	hwloc \
+	libmicrohttpd \
+	libuv \
+	openssl
+```
 
-![image4](png/mine_to_pool/4.png)
+Download XMRig sources:
 
-Bij sommige pools kun je je hashrate volgen door je adres in te voeren op hun
-website. Je kunt de hashrate ook zien door op de toets `h` te drukken.
+```
+git clone https://github.com/xmrig/xmrig.git
+cd xmrig
+```
 
-# Het miningprogramma afstellen
+Configure and compile XMRig:
 
-Mogelijk krijg je vervelende meldingen als deze te zien:
+```
+cmake -Bbuild -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl
+make -Cbuild -j$(nproc)
+```
 
-	[2017-07-09 12:04:02] : MEMORY ALLOC FAILED: mmap failed
+Copy binary and example configuration to your home directory:
 
-Dit betekent dat je je hashrate met ongeveer 20% kunt verhogen door grote pagina's in te schakelen.
+```
+cp build/xmrig ~/
+cp src/config.json ~/
+```
 
-## Grote pagina's in Linux
+## Selecting a pool
 
-Stop eerst het miningprogramma (als het aan staat), voer de volgende opdrachten uit om
-grote pagina's in te schakelen en start vervolgens het miningprogramma als root:
+There are lots of pools to choose from. You can find a list at
+[miningpoolstats.stream/monero](https://miningpoolstats.stream/monero).
 
-	sudo sysctl -w vm.nr_hugepages=128
-	sudo ./xmr-stak-cpu
+Choosing a larger pool means that you will see more frequent (but
+smaller) payouts, but choosing a smaller pools helps keep the network
+decentralised. [Miners will not lose any revenue by mining on a
+smaller pool](https://redd.it/g6uh2l).
 
-## Grote pagina's in Windows
+## Configuring the miner
 
-Geciteerd uit `config.txt`:
+Navigate to your chosen pool's webpage and read their
+documentation. They should mention an address and port for you to
+enter into your miner. For example, `pool.xmr.pt:3333`.
 
-Standaard proberen we grote pagina's toe te wijzen. Hiervoor moet je het programma als Administrator uitvoeren in Windows.
-Je moet het vergrendelen van grote pagina's inschakelen in het groepsbeleid van je systeem. Dit zijn de stappen volgens MSDN:
-1. Klik in het Startmenu op `Uitvoeren`. Typ gpedit.msc in het vak `Openen`.
-2. In de console van de `Editor voor lokaal groepsbeleid` vouw je `Computerconfiguratie` uit, en vervolgens `Windows-instellingen`.
-3. Vouw `Beveiligingsinstellingen` uit, en vervolgens `Lokaal beleid`.
-4. Selecteer de map `Toewijzing van gebruikersrechten`.
-5. De beleidsregels worden weergegeven in het detailvenster.
-6. Dubbelklik in het deelvenster op `Pagina's in het geheugen vergrendelen`.
-7. Klik in het dialoogvenster `Lokale beveiligingsinstelling` – `Pagina's in het geheugen vergrendelen` op `Gebruiker of groep toevoegen`.
-8. Voeg in het dialoogvenster `Gebruikers of groepen selecteren` een account toe waarop u het miningprogramma wilt uitvoeren.
-9. Start de computer opnieuw op om de wijziging door te voeren.
+Next, open up the config.json you copied or extracted earlier in your
+favourite text editor. Scroll down to the line that says
+`donate.v2.xmrig.com:3333` and change the text inside the quotes to
+the address of your pool. The line below should contain
+`YOUR_WALLET_ADDRESS`. Change that to your actual wallet address.
+
+After these modifications, your configuration should look something like this:
+
+```
+{
+	// [...]
+	"pools": [
+		{
+			"url": "pool.xmr.pt:3333",
+			"user": "43YjW8SZov..."
+		}
+	],
+	// [...]
+}
+```
+
+## Starting the miner
+
+Windows users can double click on xmrig.exe. Users of other operating
+systems should `cd` into the directory that contains XMRig and then
+type `./xmrig` and press return.
+
+If you see green messages saying that shares have been accepted,
+congratulations, everything is working!
+
+## Troubleshooting
+
+### Anti-virus keeps removing XMRig
+
+Some anti-viruses flag XMRig as malware because it is often deployed
+to infected computers to mine without the owner's consent. As it is
+your computer and you are configuring the miner to mine for you, it is
+safe to add XMRig to your anti-virus whitelist.
+
+### Cannot read/set MSR
+
+On some CPUs, XMRig tries to increase performance by disabling certain
+features like your CPU's instruction prefetcher. These operations
+require root/administrator, so try right clicking xmrig.exe and
+running it as administrator, or running `sudo ./xmrig` on other
+systems.
+
+### Algo not known
+
+Find the line in config.json that says `algo: null` and change it to
+`algo: "rx/0"`. By default, XMRig expects the pool to tell it which
+hashing algorithm to use.
+
+### Huge Pages 0%
+
+#### Allowing large pages on Windows
+
+Taken from [the MSDN](https://docs.microsoft.com/en-us/sql/database-engine/configure-windows/enable-the-lock-pages-in-memory-option-windows?view=sql-server-ver15):
+
+>1. On the Start menu, click Run. In the Open box, type gpedit.msc.
+2. On the Local Group Policy Editor console, expand Computer Configuration, and then expand Windows Settings.
+3. Expand Security Settings, and then expand Local Policies.
+4. Select the User Rights Assignment folder.
+5. The policies will be displayed in the details pane.
+6. In the pane, double-click Lock pages in memory.
+7. In the Local Security Setting – Lock pages in memory dialog box, click Add User or Group.
+8. In the Select Users, Service Accounts, or Groups dialog box, add an account that you will run the miner on
+9. Reboot for change to take effect.
+
+You may also need to launch the miner as administrator.
+
+#### Allowing large pages on Linux
+
+Firstly stop the miner (if it's running), run the following commands to enable
+large pages and then start the miner as root:
+
+	sudo sysctl -w vm.nr_hugepages=1168
+	sudo ./xmrig
+
+You may have to increase 1168 depending on how many NUMA nodes your
+CPU(s) have.
+
+#### Allowing large pages on macOS
+
+Huge pages are not supported on macOS.
+
+### Balance Not Increasing
+
+Most pools are <abbr title="Pay Per Last N Shares">PPLNS</abbr> pools,
+which means that you only get paid when a miner on the pool finds a
+block. If the pool you are mining on is small, this can take a few
+days to weeks.
+
+Additionally, any blocks found must mature before they can be paid
+out. This takes 60 blocks (approx. 2 hours).
+
+## Getting Help
+
+An active Monero mining community on Reddit is
+[/r/MoneroSupport](https://www.reddit.com/r/MoneroSupport/). You can
+also join [#monero-pools on
+freenode](https://webchat.freenode.net/?channel=#monero-pools).
+
+## Going Futher
+
+* Consider using a subaddress just for mining, to prevent your address
+  being linked to different services.
+* [Consider using Tor to connect to the
+  pool](https://xmrig.com/docs/miner/tor) (or to a hidden service pool
+  like HashVault, RespectXMR and MoneroOcean). This hides mining
+  activity from your ISP, and prevents the pool from knowing who you
+  are.

_i18n/pl.yml

@@ -424,7 +424,7 @@ user-guides:
   purchasing-storing: Bezpieczne kupowanie i przechowywanie Monero
   verify-allos: Verify binaries on Linux, Mac, or Windows command line (advanced)
   verify-windows: Verify binaries on Windows (beginner)
-  mine-on-pool: Jak wydobywać w zrzeszeniu za pomocą xmr-stak-cpu
+  mine-on-pool: Jak wydobywać w zrzeszeniu za pomocą XMRig
   solo-mine: Jak wydobywać samemu za pomocą Graficznego Interfejsu Użytkownika
   mine-docker: Wydobywanie za pomocą Dockera i XMRig
   locked-funds: Jak odzyskać zablokowane fundusze

_i18n/pl/resources/user-guides/mine-to-pool.md

@@ -1,92 +1,244 @@
-{% include disclaimer.html translated="yes" translationOutdated="no" %}
+{% include disclaimer.html translated="no" translationOutdated="no" %}
 
-# Wybieranie zrzeszenia
+## Wallet
 
-Istnieje wiele zrzeszeń do wyboru. Lista dostępna jest na stronie [moneropools.com](https://moneropools.com). Wydobywanie w większym zrzeszeniu może oznaczać częstszą wypłatę, ale to wydobywanie w mniejszej grupie pomaga utrzymać sieć zdecentralizowaną.
+Before starting, you already need to have a wallet configured and
+working. The pool needs to know your wallet address to be able to send
+payments there. See the [Accepting Monero guide]({{ site.baseurl
+}}/get-started/accepting) for more information.
 
-# Wybieranie koparki CPU
+## Profitability
 
-Tak jak i zrzeszenia, istnieje wiele koparek do wyboru. Twój wybór powinien zależeć od sprzętu, na którym chcesz wydobywać. Ten przewodnik opisuje jedynie koparki CPU i używa [xmr-stak-cpu](https://github.com/fireice-uk/xmr-stak-cpu). Inną opcją są [wolf's CPUMiner](https://github.com/wolf9466/cpuminer-multi) oraz [sgminer-gm](https://github.com/genesismining/sgminer-gm), jednak ich ustawienia są trochę inne i nie są włączone w ten przewodnik.
+Before mining, you should decide if it is worth it or not for you. You
+have to decide this for yourself, based on your power costs and the
+hardware that you have available. There are many sites, such as
+[CryptoCompare](https://www.cryptocompare.com/mining/calculator/xmr)
+that allow you to enter your miner's speed and power draw, and it will
+show you the profit (or loss) per week/month.
 
-## Dla Windowsa
+## Download Miner
 
-Jeżeli używasz Windowsa, deweloper xmr-stak-cpu dostarcza plików binarnych do ściągnięcia na [stronie GitHuba](https://github.com/fireice-uk/xmr-stak-cpu/releases).
+The first step is to download mining software onto your computer.
 
-Ściągnij plik `xmr-stak-cpu-win64.zip` i wypakuj do miejsca, które łatwo później odnajdziesz.
+### Windows
 
-## Pozostałe systemy operacyjne
+The XMRig developer provides pre-built binaries for Windows
+users. They are available on the [GitHub release
+page](https://github.com/xmrig/xmrig/releases/latest).
 
-Jeśli nie korzystasz z Windowsa, będziesz musiał skompilować xmr-stak-cpu samemu. Na szczęście to nie takie trudne, jak się wydaje. Zanim skompilujesz koparkę, będziesz musiał zainstalować kilka wymaganych komponentów.
+Scroll down until you see `xmrig-VERSION-msvc-win64.zip`. Download
+this file and extract the archive somewhere memorable, like your desktop.
 
-Dystrybucje oparte na Debianie:
+### Ubuntu Linux
 
-    sudo apt-get install libmicrohttpd-dev libssl-dev cmake build-essential
+The XMRig developer provides pre-built binaries for Ubuntu Xenial
+Xerus (16.04). They may work on other Ubuntu versions, and on other
+distributions, but this is not guaranteed.
 
-Dystrybucje oparte na Red Hat:
+These binaries are available on the [GitHub release
+page](https://github.com/xmrig/xmrig/releases/latest).
 
-	sudo yum install openssl-devel cmake gcc-c++ libmicrohttpd-devel
+Scroll down until you see `xmrig-VERSION-xenial-x64.tar.gz`. Download
+this file, extract the archive somewhere memorable, like your desktop.
 
-<!-- TODO: Add dependencies for other operating systems? -->
+### Other Linux
 
-Następnie wystarczy użyć cmake do wygenerowania plików kompilacji, uruchomić je i skopiować plik konfiguracyjny:
+Users of other Linux distributions can compile XMRig from
+source. Firstly, install the dependencies:
 
-    mkdir build-$(gcc -dumpmachine)
-	cd $_
-	cmake ../
-	make -j$(nproc)
-	cp ../config.txt bin/
-	cd bin
+```
+# For Debian-based distros
+sudo apt install \
+	build-essential \
+	cmake \
+	git \
+	libhwloc-dev \
+	libssl-dev \
+	libuv1-dev
+```
 
-Jeszcze nie świętuj. bo koparka musi zostać skonfigurowana. Uruchomienie jej w tym momencie powinno spowodować ukazanie się bloku tekstu do skopiowania i wklejenia:
+Download the XMRig source code:
 
-![image1](png/mine_to_pool/1.png)
+```
+git clone https://github.com/xmrig/xmrig.git
+cd xmrig
+```
 
-Otwórz plik `config.txt` i *zamień* dwie linie `"cpu_threads_conf"` na tekst, który właśnie skopiowałeś. Potem powinno wyglądać to tak:
+Configure and compile XMRig:
 
-![image2](png/mine_to_pool/2.png)
+```
+cmake -Bbuild
+make -Cbuild -j$(nproc)
+```
 
-Przewiń plik aż odnajdziesz linie zawierające `"pool_address"`. *Zamień* zawartość drugiego cudzysłowiu na adres i port zrzeszenia, które wcześniej wybrałeś. Znajdziesz tę informację na stronie zrzeszenia.
+Copy binary and example configuration to your home directory:
 
-Wstaw adres swojego portfela między cudzysłów z adresem. Hasło możesz zostawić puste, chyba że zrzeszenie sprecyzuje inaczej.
+```
+cp build/xmrig ~/
+cp src/config.json ~/
+```
 
-Po tym, twoja konfiguracja powinna wyglądać mniej więcej tak:
+### macOS Build
 
-![image3](png/mine_to_pool/3.png)
+Firstly, install XCode and [Homebrew](https://brew.sh).
 
-# Uruchomienie koparki
+Use Homebrew to install dependencies:
 
-**Zapisz plik konfiguracyjny** i uruchom koparkę!
+```
+brew install \
+	cmake \
+	hwloc \
+	libmicrohttpd \
+	libuv \
+	openssl
+```
 
-![image4](png/mine_to_pool/4.png)
+Download XMRig sources:
 
-Niektóre zrzeszenia pozwalają na monitorowanie twojej prędkości haszowania poprzez wklejenie twojego adresu na ich stronę. Możesz także śledzić ją, klikając klawisz `h`.
+```
+git clone https://github.com/xmrig/xmrig.git
+cd xmrig
+```
 
-# Ustawienia koparki
+Configure and compile XMRig:
 
-Możesz zobaczyć takie niemiłe wiadomości:
+```
+cmake -Bbuild -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl
+make -Cbuild -j$(nproc)
+```
 
-	[2017-07-09 12:04:02] : MEMORY ALLOC FAILED: mmap failed
+Copy binary and example configuration to your home directory:
 
-Oznacza to, że możesz zwiększyć swoją prędkość haszowania o około 20% poprzez włączenie dużych stron.
+```
+cp build/xmrig ~/
+cp src/config.json ~/
+```
 
-## Duże strony w Linuxie
+## Selecting a pool
 
-Najpierw zatrzymaj koparkę, jeśli jest włączona. Uruchom poniższą funkcję, aby włączyć duże strony, a następnie uruchom koparkę jako root:
+There are lots of pools to choose from. You can find a list at
+[miningpoolstats.stream/monero](https://miningpoolstats.stream/monero).
 
-	sudo sysctl -w vm.nr_hugepages=128
-	sudo ./xmr-stak-cpu
+Choosing a larger pool means that you will see more frequent (but
+smaller) payouts, but choosing a smaller pools helps keep the network
+decentralised. [Miners will not lose any revenue by mining on a
+smaller pool](https://redd.it/g6uh2l).
 
-## Duże strony w Windowsie
+## Configuring the miner
 
-Wzięte z `config.txt`:
+Navigate to your chosen pool's webpage and read their
+documentation. They should mention an address and port for you to
+enter into your miner. For example, `pool.xmr.pt:3333`.
 
->Opcja użycia dużych stron jest domyślnie wyłączona. Oznacza to, że musisz uruchomić Windowsa jako administrator i zmienić zasady grupy systemowej na pozwolenie użycia dużych stron. Poniżej znajdują się kroki według MSDN:
-1. W menu Start, kliknij "Uruchom". W otwartym okienku wpisz gpedit.msc.
-2. W edytorze zasad grupy systemowej rowziń Konfiguracje Komputera, a następnie rozwiń Ustawienia Windowsa.
-3. Rowziń Ustawienia Bezpieczeństwa, a następnie rowziń Lokalne Zasady.
-4. Wybierz folder Przypisanie Praw Użytkownika.
-5. Zasady zostaną wyświetlone w okienku ze szczegółami.
-6. W tym okienku kliknij dwukrotnie na Blokadę stron w pamięci.
-7. W Ustawieniach Lokalnego Bezpieczeństwa - okno dialogowe Blokada stron w pamięci kliknij Dodaj Użytkownika lub Grupę.
-8. W oknie dialogowym Wybierz Użytkownika, Konto Usługi lub Grupę dodaj konto, na którym uruchomisz koparkę.
-9. Zreinicjuj komputer, aby zmiany zostały zapisane.
+Next, open up the config.json you copied or extracted earlier in your
+favourite text editor. Scroll down to the line that says
+`donate.v2.xmrig.com:3333` and change the text inside the quotes to
+the address of your pool. The line below should contain
+`YOUR_WALLET_ADDRESS`. Change that to your actual wallet address.
+
+After these modifications, your configuration should look something like this:
+
+```
+{
+	// [...]
+	"pools": [
+		{
+			"url": "pool.xmr.pt:3333",
+			"user": "43YjW8SZov..."
+		}
+	],
+	// [...]
+}
+```
+
+## Starting the miner
+
+Windows users can double click on xmrig.exe. Users of other operating
+systems should `cd` into the directory that contains XMRig and then
+type `./xmrig` and press return.
+
+If you see green messages saying that shares have been accepted,
+congratulations, everything is working!
+
+## Troubleshooting
+
+### Anti-virus keeps removing XMRig
+
+Some anti-viruses flag XMRig as malware because it is often deployed
+to infected computers to mine without the owner's consent. As it is
+your computer and you are configuring the miner to mine for you, it is
+safe to add XMRig to your anti-virus whitelist.
+
+### Cannot read/set MSR
+
+On some CPUs, XMRig tries to increase performance by disabling certain
+features like your CPU's instruction prefetcher. These operations
+require root/administrator, so try right clicking xmrig.exe and
+running it as administrator, or running `sudo ./xmrig` on other
+systems.
+
+### Algo not known
+
+Find the line in config.json that says `algo: null` and change it to
+`algo: "rx/0"`. By default, XMRig expects the pool to tell it which
+hashing algorithm to use.
+
+### Huge Pages 0%
+
+#### Allowing large pages on Windows
+
+Taken from [the MSDN](https://docs.microsoft.com/en-us/sql/database-engine/configure-windows/enable-the-lock-pages-in-memory-option-windows?view=sql-server-ver15):
+
+>1. On the Start menu, click Run. In the Open box, type gpedit.msc.
+2. On the Local Group Policy Editor console, expand Computer Configuration, and then expand Windows Settings.
+3. Expand Security Settings, and then expand Local Policies.
+4. Select the User Rights Assignment folder.
+5. The policies will be displayed in the details pane.
+6. In the pane, double-click Lock pages in memory.
+7. In the Local Security Setting – Lock pages in memory dialog box, click Add User or Group.
+8. In the Select Users, Service Accounts, or Groups dialog box, add an account that you will run the miner on
+9. Reboot for change to take effect.
+
+You may also need to launch the miner as administrator.
+
+#### Allowing large pages on Linux
+
+Firstly stop the miner (if it's running), run the following commands to enable
+large pages and then start the miner as root:
+
+	sudo sysctl -w vm.nr_hugepages=1168
+	sudo ./xmrig
+
+You may have to increase 1168 depending on how many NUMA nodes your
+CPU(s) have.
+
+#### Allowing large pages on macOS
+
+Huge pages are not supported on macOS.
+
+### Balance Not Increasing
+
+Most pools are <abbr title="Pay Per Last N Shares">PPLNS</abbr> pools,
+which means that you only get paid when a miner on the pool finds a
+block. If the pool you are mining on is small, this can take a few
+days to weeks.
+
+Additionally, any blocks found must mature before they can be paid
+out. This takes 60 blocks (approx. 2 hours).
+
+## Getting Help
+
+An active Monero mining community on Reddit is
+[/r/MoneroSupport](https://www.reddit.com/r/MoneroSupport/). You can
+also join [#monero-pools on
+freenode](https://webchat.freenode.net/?channel=#monero-pools).
+
+## Going Futher
+
+* Consider using a subaddress just for mining, to prevent your address
+  being linked to different services.
+* [Consider using Tor to connect to the
+  pool](https://xmrig.com/docs/miner/tor) (or to a hidden service pool
+  like HashVault, RespectXMR and MoneroOcean). This hides mining
+  activity from your ISP, and prevents the pool from knowing who you
+  are.

_i18n/pt-br.yml

@@ -423,7 +423,7 @@ user-guides:
   purchasing-storing: Comprando e guardando Monero de forma segura
   verify-allos: Verifique os binários no Linux, Mac ou Windows via linha de comando (avançado)
   verify-windows: Verifique os binários no Windows (iniciante)
-  mine-on-pool: Como minerar numa pool usando o XMR-Stak-CPU
+  mine-on-pool: Como minerar numa pool usando o XMRig
   solo-mine: Como minerar solo usando a carteira GUI
   mine-docker: Minerando com o Docker e XMRig
   locked-funds: Como corrigir um saldo bloqueado/travado

_i18n/pt-br/resources/user-guides/mine-to-pool.md

@@ -1,110 +1,195 @@
 {% include disclaimer.html translated="no" translationOutdated="no" %}
 
-# Selecting a pool
+## Wallet
 
-There are many pools to choose from, a list is available at
-[moneropools.com](https://moneropools.com). Mining on a larger pool could mean
-more frequent payouts, but mining on a smaller pool helps to keep the network
-decentralized.
+Before starting, you already need to have a wallet configured and
+working. The pool needs to know your wallet address to be able to send
+payments there. See the [Accepting Monero guide]({{ site.baseurl
+}}/get-started/accepting) for more information.
 
-# Selecting a CPU miner
+## Profitability
 
-Just like pools, there are a lot of miners to choose from. The one that you
-should pick depends on the hardware you want to mine on. This guide will only
-use a CPU miner, and will be using
-[xmr-stak-cpu](https://github.com/fireice-uk/xmr-stak-cpu). Alternatives include
-[wolf's CPUMiner](https://github.com/wolf9466/cpuminer-multi) and
-[sgminer-gm](https://github.com/genesismining/sgminer-gm). However, their
-configuration is slightly different and will not be covered in this guide.
+Before mining, you should decide if it is worth it or not for you. You
+have to decide this for yourself, based on your power costs and the
+hardware that you have available. There are many sites, such as
+[CryptoCompare](https://www.cryptocompare.com/mining/calculator/xmr)
+that allow you to enter your miner's speed and power draw, and it will
+show you the profit (or loss) per week/month.
 
-## For Windows Systems
+## Download Miner
 
-If you are using a Windows system, the developer of xmr-stak-cpu provides
-binaries to download on the
-[GitHub release page](https://github.com/fireice-uk/xmr-stak-cpu/releases).
+The first step is to download mining software onto your computer.
 
-Download `xmr-stak-cpu-win64.zip` and extract it somewhere you'll be able to
-find it again.
+### Windows
 
-## For Other Operating Systems
+The XMRig developer provides pre-built binaries for Windows
+users. They are available on the [GitHub release
+page](https://github.com/xmrig/xmrig/releases/latest).
 
-If you're not using Windows, you will have to compile xmr-stak-cpu for yourself,
-luckily this isn't as hard as it sounds. Before you can compile the miner, you
-will need to install some of its prerequisites.
+Scroll down until you see `xmrig-VERSION-msvc-win64.zip`. Download
+this file and extract the archive somewhere memorable, like your desktop.
 
-For Debian-based distros:
+### Ubuntu Linux
 
-    sudo apt-get install libmicrohttpd-dev libssl-dev cmake build-essential
+The XMRig developer provides pre-built binaries for Ubuntu Xenial
+Xerus (16.04). They may work on other Ubuntu versions, and on other
+distributions, but this is not guaranteed.
 
-For Red Hat based distros:
+These binaries are available on the [GitHub release
+page](https://github.com/xmrig/xmrig/releases/latest).
 
-	sudo yum install openssl-devel cmake gcc-c++ libmicrohttpd-devel
+Scroll down until you see `xmrig-VERSION-xenial-x64.tar.gz`. Download
+this file, extract the archive somewhere memorable, like your desktop.
 
-<!-- TODO: Add dependencies for other operating systems? -->
+### Other Linux
 
-Following this, you just need to use cmake to generate the build files, run
-make and copy the config file:
+Users of other Linux distributions can compile XMRig from
+source. Firstly, install the dependencies:
 
-    mkdir build-$(gcc -dumpmachine)
-	cd $_
-	cmake ../
-	make -j$(nproc)
-	cp ../config.txt bin/
-	cd bin
+```
+# For Debian-based distros
+sudo apt install \
+	build-essential \
+	cmake \
+	git \
+	libhwloc-dev \
+	libssl-dev \
+	libuv1-dev
+```
 
-Don't celebrate just yet, as the miner needs to be configured. Running the miner
-now should give you a block of text to copy and paste:
+Download the XMRig source code:
 
-![image1](png/mine_to_pool/1.png)
+```
+git clone https://github.com/xmrig/xmrig.git
+cd xmrig
+```
 
-Open `config.txt` and *replace* the two `"cpu_threads_conf"` lines with the text
-you just copied. It should look something like this afterwards:
+Configure and compile XMRig:
 
-![image2](png/mine_to_pool/2.png)
+```
+cmake -Bbuild
+make -Cbuild -j$(nproc)
+```
 
-Scroll down in the file until you see the lines containing `"pool_address"`.
-*Replace* the contents of the second set of quotes with the address and port of
-the pool you chose earlier. You can find this information on the pool's website.
+Copy binary and example configuration to your home directory:
 
-Put your wallet address between the quotes on the wallet address. You may leave
-the password blank unless the pool specifies otherwise.
+```
+cp build/xmrig ~/
+cp src/config.json ~/
+```
 
-After this, your config should look something like this:
+### macOS Build
 
-![image3](png/mine_to_pool/3.png)
+Firstly, install XCode and [Homebrew](https://brew.sh).
 
-# Running the miner
+Use Homebrew to install dependencies:
 
-**Save the config** file and run the miner!
+```
+brew install \
+	cmake \
+	hwloc \
+	libmicrohttpd \
+	libuv \
+	openssl
+```
 
-![image4](png/mine_to_pool/4.png)
+Download XMRig sources:
 
-Some pools allow you to monitor your hashrate by pasting your address into their
-website. You can also monitor your hashrate by pressing the `h` key.
+```
+git clone https://github.com/xmrig/xmrig.git
+cd xmrig
+```
 
-# Tuning the miner
+Configure and compile XMRig:
 
-You might see nasty messages like this:
+```
+cmake -Bbuild -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl
+make -Cbuild -j$(nproc)
+```
 
-	[2017-07-09 12:04:02] : MEMORY ALLOC FAILED: mmap failed
+Copy binary and example configuration to your home directory:
 
-This means that you can get around a 20% hashrate boost by enabling large pages.
+```
+cp build/xmrig ~/
+cp src/config.json ~/
+```
 
-## Large pages on Linux
+## Selecting a pool
 
-Firstly stop the miner (if it's running), run the following commands to enable
-large pages and then start the miner as root:
+There are lots of pools to choose from. You can find a list at
+[miningpoolstats.stream/monero](https://miningpoolstats.stream/monero).
 
-	sudo sysctl -w vm.nr_hugepages=128
-	sudo ./xmr-stak-cpu
+Choosing a larger pool means that you will see more frequent (but
+smaller) payouts, but choosing a smaller pools helps keep the network
+decentralised. [Miners will not lose any revenue by mining on a
+smaller pool](https://redd.it/g6uh2l).
 
-## Large pages on Windows
+## Configuring the miner
 
-Taken from `config.txt`:
+Navigate to your chosen pool's webpage and read their
+documentation. They should mention an address and port for you to
+enter into your miner. For example, `pool.xmr.pt:3333`.
 
->By default we will try to allocate large pages. This means you need to "Run As Administrator" on Windows
-You need to edit your system's group policies to enable locking large pages. Here are the steps from MSDN
-1. On the Start menu, click Run. In the Open box, type gpedit.msc.
+Next, open up the config.json you copied or extracted earlier in your
+favourite text editor. Scroll down to the line that says
+`donate.v2.xmrig.com:3333` and change the text inside the quotes to
+the address of your pool. The line below should contain
+`YOUR_WALLET_ADDRESS`. Change that to your actual wallet address.
+
+After these modifications, your configuration should look something like this:
+
+```
+{
+	// [...]
+	"pools": [
+		{
+			"url": "pool.xmr.pt:3333",
+			"user": "43YjW8SZov..."
+		}
+	],
+	// [...]
+}
+```
+
+## Starting the miner
+
+Windows users can double click on xmrig.exe. Users of other operating
+systems should `cd` into the directory that contains XMRig and then
+type `./xmrig` and press return.
+
+If you see green messages saying that shares have been accepted,
+congratulations, everything is working!
+
+## Troubleshooting
+
+### Anti-virus keeps removing XMRig
+
+Some anti-viruses flag XMRig as malware because it is often deployed
+to infected computers to mine without the owner's consent. As it is
+your computer and you are configuring the miner to mine for you, it is
+safe to add XMRig to your anti-virus whitelist.
+
+### Cannot read/set MSR
+
+On some CPUs, XMRig tries to increase performance by disabling certain
+features like your CPU's instruction prefetcher. These operations
+require root/administrator, so try right clicking xmrig.exe and
+running it as administrator, or running `sudo ./xmrig` on other
+systems.
+
+### Algo not known
+
+Find the line in config.json that says `algo: null` and change it to
+`algo: "rx/0"`. By default, XMRig expects the pool to tell it which
+hashing algorithm to use.
+
+### Huge Pages 0%
+
+#### Allowing large pages on Windows
+
+Taken from [the MSDN](https://docs.microsoft.com/en-us/sql/database-engine/configure-windows/enable-the-lock-pages-in-memory-option-windows?view=sql-server-ver15):
+
+>1. On the Start menu, click Run. In the Open box, type gpedit.msc.
 2. On the Local Group Policy Editor console, expand Computer Configuration, and then expand Windows Settings.
 3. Expand Security Settings, and then expand Local Policies.
 4. Select the User Rights Assignment folder.
@@ -113,3 +198,47 @@ You need to edit your system's group policies to enable locking large pages. Her
 7. In the Local Security Setting – Lock pages in memory dialog box, click Add User or Group.
 8. In the Select Users, Service Accounts, or Groups dialog box, add an account that you will run the miner on
 9. Reboot for change to take effect.
+
+You may also need to launch the miner as administrator.
+
+#### Allowing large pages on Linux
+
+Firstly stop the miner (if it's running), run the following commands to enable
+large pages and then start the miner as root:
+
+	sudo sysctl -w vm.nr_hugepages=1168
+	sudo ./xmrig
+
+You may have to increase 1168 depending on how many NUMA nodes your
+CPU(s) have.
+
+#### Allowing large pages on macOS
+
+Huge pages are not supported on macOS.
+
+### Balance Not Increasing
+
+Most pools are <abbr title="Pay Per Last N Shares">PPLNS</abbr> pools,
+which means that you only get paid when a miner on the pool finds a
+block. If the pool you are mining on is small, this can take a few
+days to weeks.
+
+Additionally, any blocks found must mature before they can be paid
+out. This takes 60 blocks (approx. 2 hours).
+
+## Getting Help
+
+An active Monero mining community on Reddit is
+[/r/MoneroSupport](https://www.reddit.com/r/MoneroSupport/). You can
+also join [#monero-pools on
+freenode](https://webchat.freenode.net/?channel=#monero-pools).
+
+## Going Futher
+
+* Consider using a subaddress just for mining, to prevent your address
+  being linked to different services.
+* [Consider using Tor to connect to the
+  pool](https://xmrig.com/docs/miner/tor) (or to a hidden service pool
+  like HashVault, RespectXMR and MoneroOcean). This hides mining
+  activity from your ISP, and prevents the pool from knowing who you
+  are.

_i18n/ru/resources/user-guides/mine-to-pool.md

@@ -1,93 +1,244 @@
-{% include disclaimer.html translated="yes" translationOutdated="no" %}
+{% include disclaimer.html translated="no" translationOutdated="no" %}
 
-## Выбираем пул
+## Wallet
 
-Существует множество пулов, список которых можно найти на [moneropools.com](https://moneropools.com). Если выбрать для майнинга большой пул, то выплаты будут происходить чаще, но небольшие майнинговые пулы способствуют поддержанию децентрализации сети.
+Before starting, you already need to have a wallet configured and
+working. The pool needs to know your wallet address to be able to send
+payments there. See the [Accepting Monero guide]({{ site.baseurl
+}}/get-started/accepting) for more information.
 
-## Выбираем CPU майнер
+## Profitability
 
-Как и в случае с пулами, существует множество майнеров. В данном случае выбор зависит от того аппаратного обеспечения, которое пользователь собирается использовать для майнинга. Данное руководство предусматривает использование только центрального процессора (CPU) и майнера [xmr-stak-cpu](https://github.com/fireice-uk/xmr-stak-cpu). Как вариант, можно использовать [wolf's CPUMiner](https://github.com/wolf9466/cpuminer-multi) и [sgminer-gm](https://github.com/genesismining/sgminer-gm). Однако они имеют немного другую конфигурацию, и поэтому не будут рассмотрены в этом руководстве.
+Before mining, you should decide if it is worth it or not for you. You
+have to decide this for yourself, based on your power costs and the
+hardware that you have available. There are many sites, such as
+[CryptoCompare](https://www.cryptocompare.com/mining/calculator/xmr)
+that allow you to enter your miner's speed and power draw, and it will
+show you the profit (or loss) per week/month.
 
-### Для операционной системы Windows
+## Download Miner
 
-Для операционной системы Windows разработчик xmr-stak-cpu предоставляет двоичные файлы, которые можно скачать на странице [GitHub](https://github.com/fireice-uk/xmr-stak-cpu/releases).
+The first step is to download mining software onto your computer.
 
-Следует загрузить файл `xmr-stak-cpu-win64.zip` и распаковать его в папку, в которой вы сможете снова без труда найти его.
+### Windows
 
-### Для других операционных систем
+The XMRig developer provides pre-built binaries for Windows
+users. They are available on the [GitHub release
+page](https://github.com/xmrig/xmrig/releases/latest).
 
-В том случае, если используется операционная система, отличная от Windows, придётся скомпилировать xmr-stak-cpu самостоятельно. К счастью, всё не настолько сложно, насколько звучит. Перед тем как приступить непосредственно к компиляции майнера, понадобится установить некоторые файлы:
+Scroll down until you see `xmrig-VERSION-msvc-win64.zip`. Download
+this file and extract the archive somewhere memorable, like your desktop.
 
-Для дистрибутивов на основе Debian:
+### Ubuntu Linux
 
-    sudo apt-get install libmicrohttpd-dev libssl-dev cmake build-essential
+The XMRig developer provides pre-built binaries for Ubuntu Xenial
+Xerus (16.04). They may work on other Ubuntu versions, and on other
+distributions, but this is not guaranteed.
 
-Для дистрибутивов на основе Red Hat:
+These binaries are available on the [GitHub release
+page](https://github.com/xmrig/xmrig/releases/latest).
 
-	sudo yum install openssl-devel cmake gcc-c++ libmicrohttpd-devel
+Scroll down until you see `xmrig-VERSION-xenial-x64.tar.gz`. Download
+this file, extract the archive somewhere memorable, like your desktop.
 
-<!-- TODO: Add dependencies for other operating systems? -->
+### Other Linux
 
-После этого cmake используется исключительно для генерирования файлов сборки, проверки и копирования файла конфигурации:
+Users of other Linux distributions can compile XMRig from
+source. Firstly, install the dependencies:
 
-    mkdir build-$(gcc -dumpmachine)
-	cd $_
-	cmake ../
-	make -j$(nproc)
-	cp ../config.txt bin/
-	cd bin
+```
+# For Debian-based distros
+sudo apt install \
+	build-essential \
+	cmake \
+	git \
+	libhwloc-dev \
+	libssl-dev \
+	libuv1-dev
+```
 
-Но пока рано радоваться, ведь майнер ещё нужно конфигурировать. Сейчас при запуске майнера должен появиться текстовый блок, который необходимо скопировать и вставить:
+Download the XMRig source code:
 
-![image1](png/mine_to_pool/1.png)
+```
+git clone https://github.com/xmrig/xmrig.git
+cd xmrig
+```
 
-Теперь следует открыть файл `config.txt` и *заменить* две строки `"cpu_threads_conf"` только что скопированным текстом. После этого всё должно выглядеть примерно так:
+Configure and compile XMRig:
 
-![image2](png/mine_to_pool/2.png)
+```
+cmake -Bbuild
+make -Cbuild -j$(nproc)
+```
 
-После этого необходимо прокрутить содержимое файла до строк, содержащих `"pool_address"`.
-*Заменить* содержание вторых кавычек на адрес и порт пула, выбранного ранее. Эта информация обычно размещается на веб-сайте пула.
+Copy binary and example configuration to your home directory:
 
-В кавычках для указания адреса кошелька следует указать адрес вашего кошелька. Пароль можно не вводить, если пул не потребует сделать иначе.
+```
+cp build/xmrig ~/
+cp src/config.json ~/
+```
 
-После этого конфигурация должна выглядеть примерно так:
+### macOS Build
 
-![image3](png/mine_to_pool/3.png)
+Firstly, install XCode and [Homebrew](https://brew.sh).
 
-## Запуск майнера
+Use Homebrew to install dependencies:
 
-**Сохранить файл конфигурации** и запустить майнер!
+```
+brew install \
+	cmake \
+	hwloc \
+	libmicrohttpd \
+	libuv \
+	openssl
+```
 
-![image4](png/mine_to_pool/4.png)
+Download XMRig sources:
 
-Некоторые пулы позволяют отслеживать ваш хешрейт, для этого ваш адрес копируется на их веб-сайт. Также хешрейт можно просмотреть, нажав клавишу `h`.
+```
+git clone https://github.com/xmrig/xmrig.git
+cd xmrig
+```
 
-## Настройка майнера
+Configure and compile XMRig:
 
-Возможно, вы увидите неприятное сообщение, подобное этому:
+```
+cmake -Bbuild -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl
+make -Cbuild -j$(nproc)
+```
 
-	[2017-07-09 12:04:02] : MEMORY ALLOC FAILED: mmap failed
+Copy binary and example configuration to your home directory:
 
-Это означает, что вы можете повысить хешрейт примерно на 20%, если станете использовать большие страницы памяти (Large Pages).
+```
+cp build/xmrig ~/
+cp src/config.json ~/
+```
 
-### Настройка больших страниц в Linux
+## Selecting a pool
 
-Сначала необходимо остановить работу майнера (если он запущен), а затем ввести следующие команды, которые включат большие страницы, а затем следует запустить майнер в качестве корневой программы:
+There are lots of pools to choose from. You can find a list at
+[miningpoolstats.stream/monero](https://miningpoolstats.stream/monero).
 
-	sudo sysctl -w vm.nr_hugepages=128
-	sudo ./xmr-stak-cpu
+Choosing a larger pool means that you will see more frequent (but
+smaller) payouts, but choosing a smaller pools helps keep the network
+decentralised. [Miners will not lose any revenue by mining on a
+smaller pool](https://redd.it/g6uh2l).
 
-### Настройка больших страниц в Windows
+## Configuring the miner
 
-Взято из файла `config.txt`:
+Navigate to your chosen pool's webpage and read their
+documentation. They should mention an address and port for you to
+enter into your miner. For example, `pool.xmr.pt:3333`.
 
->Мы попытаемся по умолчанию включить большие страницы. Это означает, что вам понадобится запустить Windows с правами администратора (Run As Administrator). Для того чтобы включить блокировку больших страниц в памяти, понадобится отредактировать групповую политику в системе. MSDN предлагает сделать следующее:
-1. В меню Start (Пуск) выбрать команду Run (Выполнить). В окне Open (Открыть) ввести gpedit.msc.
-2. В консоли Local Group Policy Editor (Редактор локальных групповых политик) развернуть узел Computer Configuration (Конфигурация компьютера), а затем узел Windows Settings (Настройки Windows).
-3. Развернуть узлы Security Settings (Настройки безопасности) и Local Policies (Локальные политики).
-4. Выбрать папку User Rights Assignment (Назначение прав пользователя).
-5. Политики будут показаны на панели подробностей.
-6. На этой панели дважды щелкнуть параметр Lock pages in memory (Блокировка страниц в памяти).
-7. В диалоговом окне Local Security Setting — Lock pages in memory (Параметры локальной безопасности — блокировка страниц в памяти) щелкнуть Add User or Group (Добавить пользователя или группу).
-8. В диалоговом окне Select Users, Service Accounts, or Groups (Выбор пользователей, учетных записей служб или групп) выбрать учетную запись, которая будет использоваться с майнером.
-9. Чтобы этот параметр вступил в силу, необходимо перезагрузить компьютер.
+Next, open up the config.json you copied or extracted earlier in your
+favourite text editor. Scroll down to the line that says
+`donate.v2.xmrig.com:3333` and change the text inside the quotes to
+the address of your pool. The line below should contain
+`YOUR_WALLET_ADDRESS`. Change that to your actual wallet address.
+
+After these modifications, your configuration should look something like this:
+
+```
+{
+	// [...]
+	"pools": [
+		{
+			"url": "pool.xmr.pt:3333",
+			"user": "43YjW8SZov..."
+		}
+	],
+	// [...]
+}
+```
+
+## Starting the miner
+
+Windows users can double click on xmrig.exe. Users of other operating
+systems should `cd` into the directory that contains XMRig and then
+type `./xmrig` and press return.
+
+If you see green messages saying that shares have been accepted,
+congratulations, everything is working!
+
+## Troubleshooting
+
+### Anti-virus keeps removing XMRig
+
+Some anti-viruses flag XMRig as malware because it is often deployed
+to infected computers to mine without the owner's consent. As it is
+your computer and you are configuring the miner to mine for you, it is
+safe to add XMRig to your anti-virus whitelist.
+
+### Cannot read/set MSR
+
+On some CPUs, XMRig tries to increase performance by disabling certain
+features like your CPU's instruction prefetcher. These operations
+require root/administrator, so try right clicking xmrig.exe and
+running it as administrator, or running `sudo ./xmrig` on other
+systems.
+
+### Algo not known
+
+Find the line in config.json that says `algo: null` and change it to
+`algo: "rx/0"`. By default, XMRig expects the pool to tell it which
+hashing algorithm to use.
+
+### Huge Pages 0%
+
+#### Allowing large pages on Windows
+
+Taken from [the MSDN](https://docs.microsoft.com/en-us/sql/database-engine/configure-windows/enable-the-lock-pages-in-memory-option-windows?view=sql-server-ver15):
+
+>1. On the Start menu, click Run. In the Open box, type gpedit.msc.
+2. On the Local Group Policy Editor console, expand Computer Configuration, and then expand Windows Settings.
+3. Expand Security Settings, and then expand Local Policies.
+4. Select the User Rights Assignment folder.
+5. The policies will be displayed in the details pane.
+6. In the pane, double-click Lock pages in memory.
+7. In the Local Security Setting – Lock pages in memory dialog box, click Add User or Group.
+8. In the Select Users, Service Accounts, or Groups dialog box, add an account that you will run the miner on
+9. Reboot for change to take effect.
+
+You may also need to launch the miner as administrator.
+
+#### Allowing large pages on Linux
+
+Firstly stop the miner (if it's running), run the following commands to enable
+large pages and then start the miner as root:
+
+	sudo sysctl -w vm.nr_hugepages=1168
+	sudo ./xmrig
+
+You may have to increase 1168 depending on how many NUMA nodes your
+CPU(s) have.
+
+#### Allowing large pages on macOS
+
+Huge pages are not supported on macOS.
+
+### Balance Not Increasing
+
+Most pools are <abbr title="Pay Per Last N Shares">PPLNS</abbr> pools,
+which means that you only get paid when a miner on the pool finds a
+block. If the pool you are mining on is small, this can take a few
+days to weeks.
+
+Additionally, any blocks found must mature before they can be paid
+out. This takes 60 blocks (approx. 2 hours).
+
+## Getting Help
+
+An active Monero mining community on Reddit is
+[/r/MoneroSupport](https://www.reddit.com/r/MoneroSupport/). You can
+also join [#monero-pools on
+freenode](https://webchat.freenode.net/?channel=#monero-pools).
+
+## Going Futher
+
+* Consider using a subaddress just for mining, to prevent your address
+  being linked to different services.
+* [Consider using Tor to connect to the
+  pool](https://xmrig.com/docs/miner/tor) (or to a hidden service pool
+  like HashVault, RespectXMR and MoneroOcean). This hides mining
+  activity from your ISP, and prevents the pool from knowing who you
+  are.

_i18n/tr.yml

@@ -423,7 +423,7 @@ user-guides:
   purchasing-storing: Güvenli şekilde Monero alımı ve depolaması
   verify-allos: İkilileri Linux, Mac veya Windows komut satırında doğrulayın (ileri düzey)
   verify-windows: İkilileri Windows'da doğrulayın (başlangıç seviyesi)
-  mine-on-pool: xmr-stak-cpu ile bir havuzda madencilik yapımı
+  mine-on-pool: XMRig ile bir havuzda madencilik yapımı
   solo-mine: GUI ile tek başına madencilik yapımı
   mine-docker: Docker ve XMRig ile madencilik
   locked-funds: Kilitlenmiş fonlar düzeltilmesi

_i18n/tr/resources/user-guides/mine-to-pool.md

@@ -1,110 +1,195 @@
 {% include disclaimer.html translated="no" translationOutdated="no" %}
 
-# Selecting a pool
+## Wallet
 
-There are many pools to choose from, a list is available at
-[moneropools.com](https://moneropools.com). Mining on a larger pool could mean
-more frequent payouts, but mining on a smaller pool helps to keep the network
-decentralized.
+Before starting, you already need to have a wallet configured and
+working. The pool needs to know your wallet address to be able to send
+payments there. See the [Accepting Monero guide]({{ site.baseurl
+}}/get-started/accepting) for more information.
 
-# Selecting a CPU miner
+## Profitability
 
-Just like pools, there are a lot of miners to choose from. The one that you
-should pick depends on the hardware you want to mine on. This guide will only
-use a CPU miner, and will be using
-[xmr-stak-cpu](https://github.com/fireice-uk/xmr-stak-cpu). Alternatives include
-[wolf's CPUMiner](https://github.com/wolf9466/cpuminer-multi) and
-[sgminer-gm](https://github.com/genesismining/sgminer-gm). However, their
-configuration is slightly different and will not be covered in this guide.
+Before mining, you should decide if it is worth it or not for you. You
+have to decide this for yourself, based on your power costs and the
+hardware that you have available. There are many sites, such as
+[CryptoCompare](https://www.cryptocompare.com/mining/calculator/xmr)
+that allow you to enter your miner's speed and power draw, and it will
+show you the profit (or loss) per week/month.
 
-## For Windows Systems
+## Download Miner
 
-If you are using a Windows system, the developer of xmr-stak-cpu provides
-binaries to download on the
-[GitHub release page](https://github.com/fireice-uk/xmr-stak-cpu/releases).
+The first step is to download mining software onto your computer.
 
-Download `xmr-stak-cpu-win64.zip` and extract it somewhere you'll be able to
-find it again.
+### Windows
 
-## For Other Operating Systems
+The XMRig developer provides pre-built binaries for Windows
+users. They are available on the [GitHub release
+page](https://github.com/xmrig/xmrig/releases/latest).
 
-If you're not using Windows, you will have to compile xmr-stak-cpu for yourself,
-luckily this isn't as hard as it sounds. Before you can compile the miner, you
-will need to install some of its prerequisites.
+Scroll down until you see `xmrig-VERSION-msvc-win64.zip`. Download
+this file and extract the archive somewhere memorable, like your desktop.
 
-For Debian-based distros:
+### Ubuntu Linux
 
-    sudo apt-get install libmicrohttpd-dev libssl-dev cmake build-essential
+The XMRig developer provides pre-built binaries for Ubuntu Xenial
+Xerus (16.04). They may work on other Ubuntu versions, and on other
+distributions, but this is not guaranteed.
 
-For Red Hat based distros:
+These binaries are available on the [GitHub release
+page](https://github.com/xmrig/xmrig/releases/latest).
 
-	sudo yum install openssl-devel cmake gcc-c++ libmicrohttpd-devel
+Scroll down until you see `xmrig-VERSION-xenial-x64.tar.gz`. Download
+this file, extract the archive somewhere memorable, like your desktop.
 
-<!-- TODO: Add dependencies for other operating systems? -->
+### Other Linux
 
-Following this, you just need to use cmake to generate the build files, run
-make and copy the config file:
+Users of other Linux distributions can compile XMRig from
+source. Firstly, install the dependencies:
 
-    mkdir build-$(gcc -dumpmachine)
-	cd $_
-	cmake ../
-	make -j$(nproc)
-	cp ../config.txt bin/
-	cd bin
+```
+# For Debian-based distros
+sudo apt install \
+	build-essential \
+	cmake \
+	git \
+	libhwloc-dev \
+	libssl-dev \
+	libuv1-dev
+```
 
-Don't celebrate just yet, as the miner needs to be configured. Running the miner
-now should give you a block of text to copy and paste:
+Download the XMRig source code:
 
-![image1](png/mine_to_pool/1.png)
+```
+git clone https://github.com/xmrig/xmrig.git
+cd xmrig
+```
 
-Open `config.txt` and *replace* the two `"cpu_threads_conf"` lines with the text
-you just copied. It should look something like this afterwards:
+Configure and compile XMRig:
 
-![image2](png/mine_to_pool/2.png)
+```
+cmake -Bbuild
+make -Cbuild -j$(nproc)
+```
 
-Scroll down in the file until you see the lines containing `"pool_address"`.
-*Replace* the contents of the second set of quotes with the address and port of
-the pool you chose earlier. You can find this information on the pool's website.
+Copy binary and example configuration to your home directory:
 
-Put your wallet address between the quotes on the wallet address. You may leave
-the password blank unless the pool specifies otherwise.
+```
+cp build/xmrig ~/
+cp src/config.json ~/
+```
 
-After this, your config should look something like this:
+### macOS Build
 
-![image3](png/mine_to_pool/3.png)
+Firstly, install XCode and [Homebrew](https://brew.sh).
 
-# Running the miner
+Use Homebrew to install dependencies:
 
-**Save the config** file and run the miner!
+```
+brew install \
+	cmake \
+	hwloc \
+	libmicrohttpd \
+	libuv \
+	openssl
+```
 
-![image4](png/mine_to_pool/4.png)
+Download XMRig sources:
 
-Some pools allow you to monitor your hashrate by pasting your address into their
-website. You can also monitor your hashrate by pressing the `h` key.
+```
+git clone https://github.com/xmrig/xmrig.git
+cd xmrig
+```
 
-# Tuning the miner
+Configure and compile XMRig:
 
-You might see nasty messages like this:
+```
+cmake -Bbuild -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl
+make -Cbuild -j$(nproc)
+```
 
-	[2017-07-09 12:04:02] : MEMORY ALLOC FAILED: mmap failed
+Copy binary and example configuration to your home directory:
 
-This means that you can get around a 20% hashrate boost by enabling large pages.
+```
+cp build/xmrig ~/
+cp src/config.json ~/
+```
 
-## Large pages on Linux
+## Selecting a pool
 
-Firstly stop the miner (if it's running), run the following commands to enable
-large pages and then start the miner as root:
+There are lots of pools to choose from. You can find a list at
+[miningpoolstats.stream/monero](https://miningpoolstats.stream/monero).
 
-	sudo sysctl -w vm.nr_hugepages=128
-	sudo ./xmr-stak-cpu
+Choosing a larger pool means that you will see more frequent (but
+smaller) payouts, but choosing a smaller pools helps keep the network
+decentralised. [Miners will not lose any revenue by mining on a
+smaller pool](https://redd.it/g6uh2l).
 
-## Large pages on Windows
+## Configuring the miner
 
-Taken from `config.txt`:
+Navigate to your chosen pool's webpage and read their
+documentation. They should mention an address and port for you to
+enter into your miner. For example, `pool.xmr.pt:3333`.
 
->By default we will try to allocate large pages. This means you need to "Run As Administrator" on Windows
-You need to edit your system's group policies to enable locking large pages. Here are the steps from MSDN
-1. On the Start menu, click Run. In the Open box, type gpedit.msc.
+Next, open up the config.json you copied or extracted earlier in your
+favourite text editor. Scroll down to the line that says
+`donate.v2.xmrig.com:3333` and change the text inside the quotes to
+the address of your pool. The line below should contain
+`YOUR_WALLET_ADDRESS`. Change that to your actual wallet address.
+
+After these modifications, your configuration should look something like this:
+
+```
+{
+	// [...]
+	"pools": [
+		{
+			"url": "pool.xmr.pt:3333",
+			"user": "43YjW8SZov..."
+		}
+	],
+	// [...]
+}
+```
+
+## Starting the miner
+
+Windows users can double click on xmrig.exe. Users of other operating
+systems should `cd` into the directory that contains XMRig and then
+type `./xmrig` and press return.
+
+If you see green messages saying that shares have been accepted,
+congratulations, everything is working!
+
+## Troubleshooting
+
+### Anti-virus keeps removing XMRig
+
+Some anti-viruses flag XMRig as malware because it is often deployed
+to infected computers to mine without the owner's consent. As it is
+your computer and you are configuring the miner to mine for you, it is
+safe to add XMRig to your anti-virus whitelist.
+
+### Cannot read/set MSR
+
+On some CPUs, XMRig tries to increase performance by disabling certain
+features like your CPU's instruction prefetcher. These operations
+require root/administrator, so try right clicking xmrig.exe and
+running it as administrator, or running `sudo ./xmrig` on other
+systems.
+
+### Algo not known
+
+Find the line in config.json that says `algo: null` and change it to
+`algo: "rx/0"`. By default, XMRig expects the pool to tell it which
+hashing algorithm to use.
+
+### Huge Pages 0%
+
+#### Allowing large pages on Windows
+
+Taken from [the MSDN](https://docs.microsoft.com/en-us/sql/database-engine/configure-windows/enable-the-lock-pages-in-memory-option-windows?view=sql-server-ver15):
+
+>1. On the Start menu, click Run. In the Open box, type gpedit.msc.
 2. On the Local Group Policy Editor console, expand Computer Configuration, and then expand Windows Settings.
 3. Expand Security Settings, and then expand Local Policies.
 4. Select the User Rights Assignment folder.
@@ -113,3 +198,47 @@ You need to edit your system's group policies to enable locking large pages. Her
 7. In the Local Security Setting – Lock pages in memory dialog box, click Add User or Group.
 8. In the Select Users, Service Accounts, or Groups dialog box, add an account that you will run the miner on
 9. Reboot for change to take effect.
+
+You may also need to launch the miner as administrator.
+
+#### Allowing large pages on Linux
+
+Firstly stop the miner (if it's running), run the following commands to enable
+large pages and then start the miner as root:
+
+	sudo sysctl -w vm.nr_hugepages=1168
+	sudo ./xmrig
+
+You may have to increase 1168 depending on how many NUMA nodes your
+CPU(s) have.
+
+#### Allowing large pages on macOS
+
+Huge pages are not supported on macOS.
+
+### Balance Not Increasing
+
+Most pools are <abbr title="Pay Per Last N Shares">PPLNS</abbr> pools,
+which means that you only get paid when a miner on the pool finds a
+block. If the pool you are mining on is small, this can take a few
+days to weeks.
+
+Additionally, any blocks found must mature before they can be paid
+out. This takes 60 blocks (approx. 2 hours).
+
+## Getting Help
+
+An active Monero mining community on Reddit is
+[/r/MoneroSupport](https://www.reddit.com/r/MoneroSupport/). You can
+also join [#monero-pools on
+freenode](https://webchat.freenode.net/?channel=#monero-pools).
+
+## Going Futher
+
+* Consider using a subaddress just for mining, to prevent your address
+  being linked to different services.
+* [Consider using Tor to connect to the
+  pool](https://xmrig.com/docs/miner/tor) (or to a hidden service pool
+  like HashVault, RespectXMR and MoneroOcean). This hides mining
+  activity from your ISP, and prevents the pool from knowing who you
+  are.

_i18n/zh-cn.yml

@@ -422,7 +422,7 @@ user-guides:
   purchasing-storing: 安全地购买和存储门罗币
   verify-allos: 在Linux，Mac，或者Windows命令行上验证二进制文件(专家)
   verify-windows: 在Windows上验证二进制文件(新手)
-  mine-on-pool: 怎么用xmr-stak-cpu在矿池里挖矿
+  mine-on-pool: 怎么用XMRig在矿池里挖矿
   solo-mine: 怎么用GUI独立挖矿
   mine-docker: 用Docker和XMRig挖矿
   locked-funds: 如何解锁被锁定的资金

_i18n/zh-cn/resources/user-guides/mine-to-pool.md

@@ -1,110 +1,195 @@
 {% include disclaimer.html translated="no" translationOutdated="no" %}
 
-# Selecting a pool
+## Wallet
 
-There are many pools to choose from, a list is available at
-[moneropools.com](https://moneropools.com). Mining on a larger pool could mean
-more frequent payouts, but mining on a smaller pool helps to keep the network
-decentralized.
+Before starting, you already need to have a wallet configured and
+working. The pool needs to know your wallet address to be able to send
+payments there. See the [Accepting Monero guide]({{ site.baseurl
+}}/get-started/accepting) for more information.
 
-# Selecting a CPU miner
+## Profitability
 
-Just like pools, there are a lot of miners to choose from. The one that you
-should pick depends on the hardware you want to mine on. This guide will only
-use a CPU miner, and will be using
-[xmr-stak-cpu](https://github.com/fireice-uk/xmr-stak-cpu). Alternatives include
-[wolf's CPUMiner](https://github.com/wolf9466/cpuminer-multi) and
-[sgminer-gm](https://github.com/genesismining/sgminer-gm). However, their
-configuration is slightly different and will not be covered in this guide.
+Before mining, you should decide if it is worth it or not for you. You
+have to decide this for yourself, based on your power costs and the
+hardware that you have available. There are many sites, such as
+[CryptoCompare](https://www.cryptocompare.com/mining/calculator/xmr)
+that allow you to enter your miner's speed and power draw, and it will
+show you the profit (or loss) per week/month.
 
-## For Windows Systems
+## Download Miner
 
-If you are using a Windows system, the developer of xmr-stak-cpu provides
-binaries to download on the
-[GitHub release page](https://github.com/fireice-uk/xmr-stak-cpu/releases).
+The first step is to download mining software onto your computer.
 
-Download `xmr-stak-cpu-win64.zip` and extract it somewhere you'll be able to
-find it again.
+### Windows
 
-## For Other Operating Systems
+The XMRig developer provides pre-built binaries for Windows
+users. They are available on the [GitHub release
+page](https://github.com/xmrig/xmrig/releases/latest).
 
-If you're not using Windows, you will have to compile xmr-stak-cpu for yourself,
-luckily this isn't as hard as it sounds. Before you can compile the miner, you
-will need to install some of its prerequisites.
+Scroll down until you see `xmrig-VERSION-msvc-win64.zip`. Download
+this file and extract the archive somewhere memorable, like your desktop.
 
-For Debian-based distros:
+### Ubuntu Linux
 
-    sudo apt-get install libmicrohttpd-dev libssl-dev cmake build-essential
+The XMRig developer provides pre-built binaries for Ubuntu Xenial
+Xerus (16.04). They may work on other Ubuntu versions, and on other
+distributions, but this is not guaranteed.
 
-For Red Hat based distros:
+These binaries are available on the [GitHub release
+page](https://github.com/xmrig/xmrig/releases/latest).
 
-	sudo yum install openssl-devel cmake gcc-c++ libmicrohttpd-devel
+Scroll down until you see `xmrig-VERSION-xenial-x64.tar.gz`. Download
+this file, extract the archive somewhere memorable, like your desktop.
 
-<!-- TODO: Add dependencies for other operating systems? -->
+### Other Linux
 
-Following this, you just need to use cmake to generate the build files, run
-make and copy the config file:
+Users of other Linux distributions can compile XMRig from
+source. Firstly, install the dependencies:
 
-    mkdir build-$(gcc -dumpmachine)
-	cd $_
-	cmake ../
-	make -j$(nproc)
-	cp ../config.txt bin/
-	cd bin
+```
+# For Debian-based distros
+sudo apt install \
+	build-essential \
+	cmake \
+	git \
+	libhwloc-dev \
+	libssl-dev \
+	libuv1-dev
+```
 
-Don't celebrate just yet, as the miner needs to be configured. Running the miner
-now should give you a block of text to copy and paste:
+Download the XMRig source code:
 
-![image1](png/mine_to_pool/1.png)
+```
+git clone https://github.com/xmrig/xmrig.git
+cd xmrig
+```
 
-Open `config.txt` and *replace* the two `"cpu_threads_conf"` lines with the text
-you just copied. It should look something like this afterwards:
+Configure and compile XMRig:
 
-![image2](png/mine_to_pool/2.png)
+```
+cmake -Bbuild
+make -Cbuild -j$(nproc)
+```
 
-Scroll down in the file until you see the lines containing `"pool_address"`.
-*Replace* the contents of the second set of quotes with the address and port of
-the pool you chose earlier. You can find this information on the pool's website.
+Copy binary and example configuration to your home directory:
 
-Put your wallet address between the quotes on the wallet address. You may leave
-the password blank unless the pool specifies otherwise.
+```
+cp build/xmrig ~/
+cp src/config.json ~/
+```
 
-After this, your config should look something like this:
+### macOS Build
 
-![image3](png/mine_to_pool/3.png)
+Firstly, install XCode and [Homebrew](https://brew.sh).
 
-# Running the miner
+Use Homebrew to install dependencies:
 
-**Save the config** file and run the miner!
+```
+brew install \
+	cmake \
+	hwloc \
+	libmicrohttpd \
+	libuv \
+	openssl
+```
 
-![image4](png/mine_to_pool/4.png)
+Download XMRig sources:
 
-Some pools allow you to monitor your hashrate by pasting your address into their
-website. You can also monitor your hashrate by pressing the `h` key.
+```
+git clone https://github.com/xmrig/xmrig.git
+cd xmrig
+```
 
-# Tuning the miner
+Configure and compile XMRig:
 
-You might see nasty messages like this:
+```
+cmake -Bbuild -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl
+make -Cbuild -j$(nproc)
+```
 
-	[2017-07-09 12:04:02] : MEMORY ALLOC FAILED: mmap failed
+Copy binary and example configuration to your home directory:
 
-This means that you can get around a 20% hashrate boost by enabling large pages.
+```
+cp build/xmrig ~/
+cp src/config.json ~/
+```
 
-## Large pages on Linux
+## Selecting a pool
 
-Firstly stop the miner (if it's running), run the following commands to enable
-large pages and then start the miner as root:
+There are lots of pools to choose from. You can find a list at
+[miningpoolstats.stream/monero](https://miningpoolstats.stream/monero).
 
-	sudo sysctl -w vm.nr_hugepages=128
-	sudo ./xmr-stak-cpu
+Choosing a larger pool means that you will see more frequent (but
+smaller) payouts, but choosing a smaller pools helps keep the network
+decentralised. [Miners will not lose any revenue by mining on a
+smaller pool](https://redd.it/g6uh2l).
 
-## Large pages on Windows
+## Configuring the miner
 
-Taken from `config.txt`:
+Navigate to your chosen pool's webpage and read their
+documentation. They should mention an address and port for you to
+enter into your miner. For example, `pool.xmr.pt:3333`.
 
->By default we will try to allocate large pages. This means you need to "Run As Administrator" on Windows
-You need to edit your system's group policies to enable locking large pages. Here are the steps from MSDN
-1. On the Start menu, click Run. In the Open box, type gpedit.msc.
+Next, open up the config.json you copied or extracted earlier in your
+favourite text editor. Scroll down to the line that says
+`donate.v2.xmrig.com:3333` and change the text inside the quotes to
+the address of your pool. The line below should contain
+`YOUR_WALLET_ADDRESS`. Change that to your actual wallet address.
+
+After these modifications, your configuration should look something like this:
+
+```
+{
+	// [...]
+	"pools": [
+		{
+			"url": "pool.xmr.pt:3333",
+			"user": "43YjW8SZov..."
+		}
+	],
+	// [...]
+}
+```
+
+## Starting the miner
+
+Windows users can double click on xmrig.exe. Users of other operating
+systems should `cd` into the directory that contains XMRig and then
+type `./xmrig` and press return.
+
+If you see green messages saying that shares have been accepted,
+congratulations, everything is working!
+
+## Troubleshooting
+
+### Anti-virus keeps removing XMRig
+
+Some anti-viruses flag XMRig as malware because it is often deployed
+to infected computers to mine without the owner's consent. As it is
+your computer and you are configuring the miner to mine for you, it is
+safe to add XMRig to your anti-virus whitelist.
+
+### Cannot read/set MSR
+
+On some CPUs, XMRig tries to increase performance by disabling certain
+features like your CPU's instruction prefetcher. These operations
+require root/administrator, so try right clicking xmrig.exe and
+running it as administrator, or running `sudo ./xmrig` on other
+systems.
+
+### Algo not known
+
+Find the line in config.json that says `algo: null` and change it to
+`algo: "rx/0"`. By default, XMRig expects the pool to tell it which
+hashing algorithm to use.
+
+### Huge Pages 0%
+
+#### Allowing large pages on Windows
+
+Taken from [the MSDN](https://docs.microsoft.com/en-us/sql/database-engine/configure-windows/enable-the-lock-pages-in-memory-option-windows?view=sql-server-ver15):
+
+>1. On the Start menu, click Run. In the Open box, type gpedit.msc.
 2. On the Local Group Policy Editor console, expand Computer Configuration, and then expand Windows Settings.
 3. Expand Security Settings, and then expand Local Policies.
 4. Select the User Rights Assignment folder.
@@ -113,3 +198,47 @@ You need to edit your system's group policies to enable locking large pages. Her
 7. In the Local Security Setting – Lock pages in memory dialog box, click Add User or Group.
 8. In the Select Users, Service Accounts, or Groups dialog box, add an account that you will run the miner on
 9. Reboot for change to take effect.
+
+You may also need to launch the miner as administrator.
+
+#### Allowing large pages on Linux
+
+Firstly stop the miner (if it's running), run the following commands to enable
+large pages and then start the miner as root:
+
+	sudo sysctl -w vm.nr_hugepages=1168
+	sudo ./xmrig
+
+You may have to increase 1168 depending on how many NUMA nodes your
+CPU(s) have.
+
+#### Allowing large pages on macOS
+
+Huge pages are not supported on macOS.
+
+### Balance Not Increasing
+
+Most pools are <abbr title="Pay Per Last N Shares">PPLNS</abbr> pools,
+which means that you only get paid when a miner on the pool finds a
+block. If the pool you are mining on is small, this can take a few
+days to weeks.
+
+Additionally, any blocks found must mature before they can be paid
+out. This takes 60 blocks (approx. 2 hours).
+
+## Getting Help
+
+An active Monero mining community on Reddit is
+[/r/MoneroSupport](https://www.reddit.com/r/MoneroSupport/). You can
+also join [#monero-pools on
+freenode](https://webchat.freenode.net/?channel=#monero-pools).
+
+## Going Futher
+
+* Consider using a subaddress just for mining, to prevent your address
+  being linked to different services.
+* [Consider using Tor to connect to the
+  pool](https://xmrig.com/docs/miner/tor) (or to a hidden service pool
+  like HashVault, RespectXMR and MoneroOcean). This hides mining
+  activity from your ISP, and prevents the pool from knowing who you
+  are.

_i18n/zh-tw.yml

@@ -423,7 +423,7 @@ user-guides:
   purchasing-storing: 安全地購買與儲存門羅幣
   verify-allos: 在 Linux, Mac, 或 Windows 系統上驗證執行檔 (進階)
   verify-windows: 在 windows 系統上驗證執行檔 (入門)
-  mine-on-pool: 如何使用 xmr-stak-cpu 在礦池挖礦
+  mine-on-pool: 如何使用 XMRig 在礦池挖礦
   solo-mine: 如何使用 GUI 錢包進行 solo 挖礦
   mine-docker: 使用 Docker 與 XMRig 進行挖礦
   locked-funds: 如何修復被鎖定的資金

_i18n/zh-tw/resources/user-guides/mine-to-pool.md

@@ -1,110 +1,195 @@
 {% include disclaimer.html translated="no" translationOutdated="no" %}
 
-# Selecting a pool
+## Wallet
 
-There are many pools to choose from, a list is available at
-[moneropools.com](https://moneropools.com). Mining on a larger pool could mean
-more frequent payouts, but mining on a smaller pool helps to keep the network
-decentralized.
+Before starting, you already need to have a wallet configured and
+working. The pool needs to know your wallet address to be able to send
+payments there. See the [Accepting Monero guide]({{ site.baseurl
+}}/get-started/accepting) for more information.
 
-# Selecting a CPU miner
+## Profitability
 
-Just like pools, there are a lot of miners to choose from. The one that you
-should pick depends on the hardware you want to mine on. This guide will only
-use a CPU miner, and will be using
-[xmr-stak-cpu](https://github.com/fireice-uk/xmr-stak-cpu). Alternatives include
-[wolf's CPUMiner](https://github.com/wolf9466/cpuminer-multi) and
-[sgminer-gm](https://github.com/genesismining/sgminer-gm). However, their
-configuration is slightly different and will not be covered in this guide.
+Before mining, you should decide if it is worth it or not for you. You
+have to decide this for yourself, based on your power costs and the
+hardware that you have available. There are many sites, such as
+[CryptoCompare](https://www.cryptocompare.com/mining/calculator/xmr)
+that allow you to enter your miner's speed and power draw, and it will
+show you the profit (or loss) per week/month.
 
-## For Windows Systems
+## Download Miner
 
-If you are using a Windows system, the developer of xmr-stak-cpu provides
-binaries to download on the
-[GitHub release page](https://github.com/fireice-uk/xmr-stak-cpu/releases).
+The first step is to download mining software onto your computer.
 
-Download `xmr-stak-cpu-win64.zip` and extract it somewhere you'll be able to
-find it again.
+### Windows
 
-## For Other Operating Systems
+The XMRig developer provides pre-built binaries for Windows
+users. They are available on the [GitHub release
+page](https://github.com/xmrig/xmrig/releases/latest).
 
-If you're not using Windows, you will have to compile xmr-stak-cpu for yourself,
-luckily this isn't as hard as it sounds. Before you can compile the miner, you
-will need to install some of its prerequisites.
+Scroll down until you see `xmrig-VERSION-msvc-win64.zip`. Download
+this file and extract the archive somewhere memorable, like your desktop.
 
-For Debian-based distros:
+### Ubuntu Linux
 
-    sudo apt-get install libmicrohttpd-dev libssl-dev cmake build-essential
+The XMRig developer provides pre-built binaries for Ubuntu Xenial
+Xerus (16.04). They may work on other Ubuntu versions, and on other
+distributions, but this is not guaranteed.
 
-For Red Hat based distros:
+These binaries are available on the [GitHub release
+page](https://github.com/xmrig/xmrig/releases/latest).
 
-	sudo yum install openssl-devel cmake gcc-c++ libmicrohttpd-devel
+Scroll down until you see `xmrig-VERSION-xenial-x64.tar.gz`. Download
+this file, extract the archive somewhere memorable, like your desktop.
 
-<!-- TODO: Add dependencies for other operating systems? -->
+### Other Linux
 
-Following this, you just need to use cmake to generate the build files, run
-make and copy the config file:
+Users of other Linux distributions can compile XMRig from
+source. Firstly, install the dependencies:
 
-    mkdir build-$(gcc -dumpmachine)
-	cd $_
-	cmake ../
-	make -j$(nproc)
-	cp ../config.txt bin/
-	cd bin
+```
+# For Debian-based distros
+sudo apt install \
+	build-essential \
+	cmake \
+	git \
+	libhwloc-dev \
+	libssl-dev \
+	libuv1-dev
+```
 
-Don't celebrate just yet, as the miner needs to be configured. Running the miner
-now should give you a block of text to copy and paste:
+Download the XMRig source code:
 
-![image1](png/mine_to_pool/1.png)
+```
+git clone https://github.com/xmrig/xmrig.git
+cd xmrig
+```
 
-Open `config.txt` and *replace* the two `"cpu_threads_conf"` lines with the text
-you just copied. It should look something like this afterwards:
+Configure and compile XMRig:
 
-![image2](png/mine_to_pool/2.png)
+```
+cmake -Bbuild
+make -Cbuild -j$(nproc)
+```
 
-Scroll down in the file until you see the lines containing `"pool_address"`.
-*Replace* the contents of the second set of quotes with the address and port of
-the pool you chose earlier. You can find this information on the pool's website.
+Copy binary and example configuration to your home directory:
 
-Put your wallet address between the quotes on the wallet address. You may leave
-the password blank unless the pool specifies otherwise.
+```
+cp build/xmrig ~/
+cp src/config.json ~/
+```
 
-After this, your config should look something like this:
+### macOS Build
 
-![image3](png/mine_to_pool/3.png)
+Firstly, install XCode and [Homebrew](https://brew.sh).
 
-# Running the miner
+Use Homebrew to install dependencies:
 
-**Save the config** file and run the miner!
+```
+brew install \
+	cmake \
+	hwloc \
+	libmicrohttpd \
+	libuv \
+	openssl
+```
 
-![image4](png/mine_to_pool/4.png)
+Download XMRig sources:
 
-Some pools allow you to monitor your hashrate by pasting your address into their
-website. You can also monitor your hashrate by pressing the `h` key.
+```
+git clone https://github.com/xmrig/xmrig.git
+cd xmrig
+```
 
-# Tuning the miner
+Configure and compile XMRig:
 
-You might see nasty messages like this:
+```
+cmake -Bbuild -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl
+make -Cbuild -j$(nproc)
+```
 
-	[2017-07-09 12:04:02] : MEMORY ALLOC FAILED: mmap failed
+Copy binary and example configuration to your home directory:
 
-This means that you can get around a 20% hashrate boost by enabling large pages.
+```
+cp build/xmrig ~/
+cp src/config.json ~/
+```
 
-## Large pages on Linux
+## Selecting a pool
 
-Firstly stop the miner (if it's running), run the following commands to enable
-large pages and then start the miner as root:
+There are lots of pools to choose from. You can find a list at
+[miningpoolstats.stream/monero](https://miningpoolstats.stream/monero).
 
-	sudo sysctl -w vm.nr_hugepages=128
-	sudo ./xmr-stak-cpu
+Choosing a larger pool means that you will see more frequent (but
+smaller) payouts, but choosing a smaller pools helps keep the network
+decentralised. [Miners will not lose any revenue by mining on a
+smaller pool](https://redd.it/g6uh2l).
 
-## Large pages on Windows
+## Configuring the miner
 
-Taken from `config.txt`:
+Navigate to your chosen pool's webpage and read their
+documentation. They should mention an address and port for you to
+enter into your miner. For example, `pool.xmr.pt:3333`.
 
->By default we will try to allocate large pages. This means you need to "Run As Administrator" on Windows
-You need to edit your system's group policies to enable locking large pages. Here are the steps from MSDN
-1. On the Start menu, click Run. In the Open box, type gpedit.msc.
+Next, open up the config.json you copied or extracted earlier in your
+favourite text editor. Scroll down to the line that says
+`donate.v2.xmrig.com:3333` and change the text inside the quotes to
+the address of your pool. The line below should contain
+`YOUR_WALLET_ADDRESS`. Change that to your actual wallet address.
+
+After these modifications, your configuration should look something like this:
+
+```
+{
+	// [...]
+	"pools": [
+		{
+			"url": "pool.xmr.pt:3333",
+			"user": "43YjW8SZov..."
+		}
+	],
+	// [...]
+}
+```
+
+## Starting the miner
+
+Windows users can double click on xmrig.exe. Users of other operating
+systems should `cd` into the directory that contains XMRig and then
+type `./xmrig` and press return.
+
+If you see green messages saying that shares have been accepted,
+congratulations, everything is working!
+
+## Troubleshooting
+
+### Anti-virus keeps removing XMRig
+
+Some anti-viruses flag XMRig as malware because it is often deployed
+to infected computers to mine without the owner's consent. As it is
+your computer and you are configuring the miner to mine for you, it is
+safe to add XMRig to your anti-virus whitelist.
+
+### Cannot read/set MSR
+
+On some CPUs, XMRig tries to increase performance by disabling certain
+features like your CPU's instruction prefetcher. These operations
+require root/administrator, so try right clicking xmrig.exe and
+running it as administrator, or running `sudo ./xmrig` on other
+systems.
+
+### Algo not known
+
+Find the line in config.json that says `algo: null` and change it to
+`algo: "rx/0"`. By default, XMRig expects the pool to tell it which
+hashing algorithm to use.
+
+### Huge Pages 0%
+
+#### Allowing large pages on Windows
+
+Taken from [the MSDN](https://docs.microsoft.com/en-us/sql/database-engine/configure-windows/enable-the-lock-pages-in-memory-option-windows?view=sql-server-ver15):
+
+>1. On the Start menu, click Run. In the Open box, type gpedit.msc.
 2. On the Local Group Policy Editor console, expand Computer Configuration, and then expand Windows Settings.
 3. Expand Security Settings, and then expand Local Policies.
 4. Select the User Rights Assignment folder.
@@ -113,3 +198,47 @@ You need to edit your system's group policies to enable locking large pages. Her
 7. In the Local Security Setting – Lock pages in memory dialog box, click Add User or Group.
 8. In the Select Users, Service Accounts, or Groups dialog box, add an account that you will run the miner on
 9. Reboot for change to take effect.
+
+You may also need to launch the miner as administrator.
+
+#### Allowing large pages on Linux
+
+Firstly stop the miner (if it's running), run the following commands to enable
+large pages and then start the miner as root:
+
+	sudo sysctl -w vm.nr_hugepages=1168
+	sudo ./xmrig
+
+You may have to increase 1168 depending on how many NUMA nodes your
+CPU(s) have.
+
+#### Allowing large pages on macOS
+
+Huge pages are not supported on macOS.
+
+### Balance Not Increasing
+
+Most pools are <abbr title="Pay Per Last N Shares">PPLNS</abbr> pools,
+which means that you only get paid when a miner on the pool finds a
+block. If the pool you are mining on is small, this can take a few
+days to weeks.
+
+Additionally, any blocks found must mature before they can be paid
+out. This takes 60 blocks (approx. 2 hours).
+
+## Getting Help
+
+An active Monero mining community on Reddit is
+[/r/MoneroSupport](https://www.reddit.com/r/MoneroSupport/). You can
+also join [#monero-pools on
+freenode](https://webchat.freenode.net/?channel=#monero-pools).
+
+## Going Futher
+
+* Consider using a subaddress just for mining, to prevent your address
+  being linked to different services.
+* [Consider using Tor to connect to the
+  pool](https://xmrig.com/docs/miner/tor) (or to a hidden service pool
+  like HashVault, RespectXMR and MoneroOcean). This hides mining
+  activity from your ISP, and prevents the pool from knowing who you
+  are.

resources/user-guides/mine-to-pool.md

@@ -1,6 +1,6 @@
 ---
 layout: user-guide
-title: How to mine on a pool with xmr-stak-cpu
+title: How to mine on a pool with XMRig
 permalink: /resources/user-guides/mine-to-pool.html
 outdated: False
 ---