diff --git a/_data/lang/ar/footer-2.yml b/_data/lang/ar/footer-2.yml
index 63e646f69b6bdb090988d57f299882e241c8c0a3..577cfd177a2f7b8244299975f1f5740ea00c65f4 100644
--- a/_data/lang/ar/footer-2.yml
+++ b/_data/lang/ar/footer-2.yml
@@ -2,5 +2,3 @@
url: legal
- name: Ø´Ùره المصدر
url: https://repo.getmonero.org
-- name: المواصÙات التقنيه
- url: technical-specs/
diff --git a/_data/lang/de/footer-2.yml b/_data/lang/de/footer-2.yml
index c9b4ef09ad0806b4ee32727bd3267585103c40d8..34aea41eb2e39a93f9f3198ff33af9a7d2262687 100644
--- a/_data/lang/de/footer-2.yml
+++ b/_data/lang/de/footer-2.yml
@@ -2,5 +2,3 @@
url: legal
- name: Quellcode
url: https://repo.getmonero.org
-- name: Technische Spezifikationen
- url: technical-specs/
diff --git a/_data/lang/en/footer-2.yml b/_data/lang/en/footer-2.yml
index be041a12a539245e3875daa7461319e451f2bdb3..1ebb9a83c692842ef4beb611c2c4891f0de7c6b9 100644
--- a/_data/lang/en/footer-2.yml
+++ b/_data/lang/en/footer-2.yml
@@ -2,5 +2,3 @@
url: legal
- name: Source Code
url: https://repo.getmonero.org
-- name: Technical Specs
- url: technical-specs/
diff --git a/_data/lang/en/navigation.yml b/_data/lang/en/navigation.yml
index db194974a402de463814ccabf497d24b8ea973b1..8069811ec9561bae38f814dfc0f629acef0496aa 100644
--- a/_data/lang/en/navigation.yml
+++ b/_data/lang/en/navigation.yml
@@ -50,8 +50,6 @@
url: resources/user-guides
- page: Developer Guides
url: resources/developer-guides
- - page: Technical Specs
- url: technical-specs
- page: Library
url: library
- page: Press Kit
diff --git a/_data/lang/es/footer-2.yml b/_data/lang/es/footer-2.yml
index 8b6ee5db37671d740e50bcb1b5325478a3bc161b..ed71895ebd61f22591f28d5d22f099a2cea32c1d 100644
--- a/_data/lang/es/footer-2.yml
+++ b/_data/lang/es/footer-2.yml
@@ -2,5 +2,3 @@
url: legal
- name: Código Fuente
url: https://repo.getmonero.org
-- name: Especificaciones Técnicas
- url: technical-specs/
diff --git a/_data/lang/fr/footer-2.yml b/_data/lang/fr/footer-2.yml
index fbe8176523d32d8c91d27cb25e56dbfd04aa0ee7..c4152229a533cc7ee3bc739ae305380a84762f19 100644
--- a/_data/lang/fr/footer-2.yml
+++ b/_data/lang/fr/footer-2.yml
@@ -2,5 +2,3 @@
url: legal
- name: Code Source
url: https://repo.getmonero.org
-- name: Spécifications Techniques
- url: technical-specs/
diff --git a/_data/lang/it/footer-2.yml b/_data/lang/it/footer-2.yml
index d98183310f19426c0b7bbcc70371179f6d342ebc..8dd4b592eb944d0bb7c0876deee2e389334d75ad 100644
--- a/_data/lang/it/footer-2.yml
+++ b/_data/lang/it/footer-2.yml
@@ -2,5 +2,3 @@
url: legal
- name: Codice Sorgente
url: https://repo.getmonero.org
-- name: Specifiche Tecniche
- url: technical-specs/
diff --git a/_data/lang/nl/footer-2.yml b/_data/lang/nl/footer-2.yml
index c85a250db2f99ad6e16a9fa12e9e3d13acb9f381..167fd7e69bad64d041f719218057d3c4ba027669 100644
--- a/_data/lang/nl/footer-2.yml
+++ b/_data/lang/nl/footer-2.yml
@@ -2,5 +2,3 @@
url: legal
- name: Broncode
url: https://repo.getmonero.org
-- name: Technische specificaties
- url: technical-specs/
diff --git a/_data/lang/pl/footer-2.yml b/_data/lang/pl/footer-2.yml
index 583dea1c81731e2fd033d1939e40406b5a47b9fa..5db0c06abce5c03cb9d5bb13820f3fe65dea033b 100644
--- a/_data/lang/pl/footer-2.yml
+++ b/_data/lang/pl/footer-2.yml
@@ -2,5 +2,3 @@
url: legal
- name: Kod źródłowy
url: https://repo.getmonero.org
-- name: Właściwości techniczne
- url: technical-specs/
diff --git a/_data/lang/pt-br/footer-2.yml b/_data/lang/pt-br/footer-2.yml
index 4f00ea5ef901e582209fbb9f4ce956af7ff58a09..fa243d928c913e8a392bb84911cf624e25e3f61c 100644
--- a/_data/lang/pt-br/footer-2.yml
+++ b/_data/lang/pt-br/footer-2.yml
@@ -2,5 +2,3 @@
url: legal
- name: Código Fonte
url: https://repo.getmonero.org
-- name: Especificações Técnicas
- url: technical-specs/
diff --git a/_data/lang/ru/footer-2.yml b/_data/lang/ru/footer-2.yml
index ed97c4829d882b4419ab8ca92d8491b5ea246980..f144ba9033b97308e80df7511c0a52349e7587dc 100644
--- a/_data/lang/ru/footer-2.yml
+++ b/_data/lang/ru/footer-2.yml
@@ -1,6 +1,4 @@
- name: ЮридичеÑÐºÐ°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ
url: legal
- name: ИÑходный код
- url: https://repo.getmonero.org
-- name: ТехничеÑÐºÐ°Ñ ÑпецификациÑ
- url: technical-specs/
+ url: https://repo.getmonero.org
\ No newline at end of file
diff --git a/_data/lang/tr/footer-2.yml b/_data/lang/tr/footer-2.yml
index 09034815f74f2594fc375174253b114eb167c0f6..f9d77168aaf1adf034c6f63cad1e95511980bde5 100644
--- a/_data/lang/tr/footer-2.yml
+++ b/_data/lang/tr/footer-2.yml
@@ -2,5 +2,3 @@
url: legal
- name: Kaynak Kodu
url: https://repo.getmonero.org
-- name: Teknik Özellikler
- url: technical-specs/
diff --git a/_data/lang/zh-cn/footer-2.yml b/_data/lang/zh-cn/footer-2.yml
index be041a12a539245e3875daa7461319e451f2bdb3..1ebb9a83c692842ef4beb611c2c4891f0de7c6b9 100644
--- a/_data/lang/zh-cn/footer-2.yml
+++ b/_data/lang/zh-cn/footer-2.yml
@@ -2,5 +2,3 @@
url: legal
- name: Source Code
url: https://repo.getmonero.org
-- name: Technical Specs
- url: technical-specs/
diff --git a/_data/lang/zh-tw/footer-2.yml b/_data/lang/zh-tw/footer-2.yml
index 3796a1e97ada77b601b6d92dbf69a8d6a8e2db07..a183c14a1e7f635b87387e9e1c402823a6b1d631 100644
--- a/_data/lang/zh-tw/footer-2.yml
+++ b/_data/lang/zh-tw/footer-2.yml
@@ -2,5 +2,3 @@
url: legal
- name: 原始碼
url: https://repo.getmonero.org
-- name: 技術è¦æ ¼
- url: technical-specs/
diff --git a/_i18n/en.yml b/_i18n/en.yml
index e5428d220c63d57a1a1a334af88254d6f372f2eb..6db61b3580eecec7ce32436589f1462449416220 100644
--- a/_i18n/en.yml
+++ b/_i18n/en.yml
@@ -538,39 +538,25 @@ research-lab:
specs:
- fair_title: No premine, no instamine, no token
- fair_premine: Monero had no premine or instamine
- fair_token: Monero did not sell any token
- fair_presale: Monero had no presale of any kind
+ title: Technical Info
+ intro: Here are listed some basic technical info about Monero. For more in-depth details, consult
+ intro_link: the library
+ intro1: or get in touch with the community
pow_title: Proof of Work
- pow_name: CryptoNight
- pow_disclaimer: may change in the future
- diff_title: Difficulty retarget
- diff_freq: every block
- diff_base: based on the last 720 blocks, excluding 20% of the timestamp outliers
- block_time_title: Block time
- block_time_duration: 2 minutes
- block_time_disclaimer: may change in the future as long as emission curve is preserved
- block_reward_title: Block reward
- block_reward_amount: smoothly decreasing and subject to penalties for blocks greater than median size of the last 100 blocks (M100)
- block_reward_example1: see the
- block_reward_example_link: latest block
- block_reward_example2: coinbase transaction amount for current reward
- block_size_title: Block size
- block_size: dynamic, maximum of 2 * M100
+ pow: Monero uses RandomX, an ASIC-resistant and CPU-friendly POW algorithm created by Monero community members, designed to make the use of mining-specific hardware unfeasible. Monero previously used CryptoNight and variations of this algorithm
+ pow_link: More info in the GitHub repo
block_emission_title: Emission curve
+ block_emission_pre: "To make sure there will always be an incentive to mine Monero and keep it safe, the emission is infinite. There are two main emissions:"
block_emission_main: "first, main curve: ~18.132 million coins by the end of May 2022"
block_emission_tail: "then, tail curve: 0.6 XMR per 2-minute block, kicks in once main emission is done, translates to <1% inflation decreasing over time"
- block_emission_disclaimer1: see
- block_emission_disclaimer_link: charts and details
- supply_title: Max supply
- supply_amount: infinite
- sender_privacy_title: Sender privacy
- sender_privacy_mode: Ring signatures
- recipient_privacy_title: Recipient privacy
- recipient_privacy_mode: Stealth addresses
- amount_hidden_title: Amount obfuscation
- amount_hidden_mode: Ring confidential transactions
+ blocks_title: Blocks
+ blocks: A new @block is created every ~2 minutes. There is no maximum block size, but instead a block reward penality and a dynamic block size, to ensure a dynamic @scalability
+ privacytech_title: Main privacy enhancing technologies
+ privacytech_ringct: "@RingCT"
+ privacytech_sh: "@Stealth-Addresses"
+ privacytech_rs: Ring Signatures
+ privacytech_tor-i2p: Transactions over Tor/I2P
+ privacytech_dandelion: Dandelion++
library:
description: "Below are some publications, books or magazines available for you to download."
diff --git a/resources/about/index.md b/resources/about/index.md
index 16f789d8d79bbeb208c2a4d19ba0ddbfadd9912c..02a2374cc5e32457779e0cf9595534fe3e4d50a4 100644
--- a/resources/about/index.md
+++ b/resources/about/index.md
@@ -46,5 +46,35 @@ permalink: /resources/about/index.html
</div>
<!-- end right one-third block-->
</div>
+ <div class="row">
+ <!-- 'Technical info' block -->
+ <div class="full col-xs-12">
+ <div class="info-block text-adapt">
+ <div class="row center-xs">
+ <div class="col">
+ <h2>{% t specs.title %}</h2>
+ </div>
+ </div>
+ <div>
+ <p>{% t specs.intro %} <a href="{{ site.baseurl }}/library/">{% t specs.intro_link %}</a> {% t specs.intro1 %}.</p>
+ <h3>{% t specs.pow_title %}</h3>
+ <p>{% t specs.pow %}. <a href="https://github.com/tevador/randomx">{% t specs.pow_link %}</a>.</p>
+ <h3>{% t specs.block_emission_title %}</h3>
+ <p>{% t specs.block_emission_pre %} {% t specs.block_emission_main %}, {% t specs.block_emission_tail %} (@Tail-Emission).</p>
+ <h3>{% t specs.blocks_title %}</h3>
+ <p>{% t specs.blocks %}.</p>
+ <h3>{% t specs.privacytech_title %}</h3>
+ <ul>
+ <li>{% t specs.privacytech_ringct %}</li>
+ <li>{% t specs.privacytech_sh %}</li>
+ <li>{% t specs.privacytech_rs%}</li>
+ <li>{% t specs.privacytech_tor-i2p %}</li>
+ <!-- <li>{% t specs.privacytech_dandelion %}</li> -->
+ </ul>
+ </div>
+ </div>
+ </div>
+ <!-- End 'Technical info' block -->
+ </div>
</section>
</div>
diff --git a/technical-specs/index.md b/technical-specs/index.md
deleted file mode 100644
index 45d4ed6ac1ba720051a103b4d09d8c4e918f4703..0000000000000000000000000000000000000000
--- a/technical-specs/index.md
+++ /dev/null
@@ -1,136 +0,0 @@
----
-layout: custom
-title: titles.technicalspecs
-permalink: /technical-specs/index.html
----
-{% t global.lang_tag %}
-<div class="about-monero">
- <section class="container">
- <div class="row">
- <!-- left two-thirds block-->
- <div class="full col-xs-12">
- <div class="info-block text-adapt">
- <div class="row">
- <div class="col">
- <h3>{% t specs.fair_title %}</h3>
- </div>
- </div>
- <div>
- <ul>
- <li>{% t specs.fair_premine %}</li>
- <li>{% t specs.fair_token %}</li>
- <li>{% t specs.fair_presale %}</li>
- </ul>
- </div>
- <div class="row">
- <div class="col">
- <h3>{% t specs.pow_title %}</h3>
- </div>
- </div>
- <div>
- <ul>
- <li>{% t specs.pow_name %}</li>
- <li>{% t specs.pow_disclaimer %}</li>
- </ul>
- </div>
- <div class="row">
- <div class="col">
- <h3>{% t specs.diff_title %}</h3>
- </div>
- </div>
- <div>
- <ul>
- <li>{% t specs.diff_freq %}</li>
- <li>{% t specs.diff_base %}</li>
- </ul>
- </div>
- <div class="row">
- <div class="col">
- <h3>{% t specs.block_time_title %}</h3>
- </div>
- </div>
- <div>
- <ul>
- <li>{% t specs.block_time_duration %}</li>
- <li>{% t specs.block_time_disclaimer %}</li>
- </ul>
- </div>
- <div class="row">
- <div class="col">
- <h3>{% t specs.block_reward_title %}</h3>
- </div>
- </div>
- <div>
- <ul>
- <li>{% t specs.block_reward_amount %}</li>
- <li>{% t specs.block_reward_example1 %} <a href="https://moneroblocks.info/">{% t specs.block_reward_example_link %}</a> {% t specs.block_reward_example2 %}</li>
- </ul>
- </div>
- <div class="row">
- <div class="col">
- <h3>{% t specs.block_size_title %}</h3>
- </div>
- </div>
- <div>
- <ul>
- <li>{% t specs.block_size %}</li>
- </ul>
- </div>
- <div class="row">
- <div class="col">
- <h3>{% t specs.block_emission_title %}</h3>
- </div>
- </div>
- <div>
- <ul>
- <li>{% t specs.block_emission_main %}</li>
- <li>{% t specs.block_emission_tail %}</li>
- <li>{% t specs.block_emission_disclaimer1 %} <a href="https://www.reddit.com/r/Monero/comments/512kwh/useful_for_learning_about_monero_coin_emission/">{% t specs.block_emission_disclaimer_link %}</a></li>
- </ul>
- </div>
- <div class="row">
- <div class="col">
- <h3>{% t specs.supply_title %}</h3>
- </div>
- </div>
- <div>
- <ul>
- <li>{% t specs.supply_amount %}</li>
- </ul>
- </div>
- <div class="row">
- <div class="col">
- <h3>{% t specs.sender_privacy_title %}</h3>
- </div>
- </div>
- <div>
- <ul>
- <li>{% t specs.sender_privacy_mode %}</li>
- </ul>
- </div>
- <div class="row">
- <div class="col">
- <h3>{% t specs.recipient_privacy_title %}</h3>
- </div>
- </div>
- <div>
- <ul>
- <li>{% t specs.recipient_privacy_mode %}</li>
- </ul>
- </div>
- <div class="row">
- <div class="col">
- <h3>{% t specs.amount_hidden_title %}</h3>
- </div>
- </div>
- <div>
- <ul>
- <li>{% t specs.amount_hidden_mode %}</li>
- </ul>
- </div>
- </div>
- </div>
- <!-- end right one-third block-->
- </div>
- </section>
-</div>