Merge !1225

Add technical info to 'About' page and remove 'technical specs' page

Closes #1035

See merge request monero-project/monero-site!1225

_data/lang/ar/footer-2.yml

@@ -2,5 +2,3 @@
   url: legal
 - name: شفره المصدر
   url: https://repo.getmonero.org
-- name: المواصفات التقنيه
-  url: technical-specs/

_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/

_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/

_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

_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/

_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/

_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/

_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/

_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/

_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/

_data/lang/ru/footer-2.yml

@@ -1,6 +1,4 @@
 - name: Юридическая информация
   url: legal
 - name: Исходный код
-  url: https://repo.getmonero.org
+  url: https://repo.getmonero.org
-- name: Техническая спецификация
-  url: technical-specs/

_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/

_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/

_data/lang/zh-tw/footer-2.yml

@@ -2,5 +2,3 @@
   url: legal
 - name: 原始碼
   url: https://repo.getmonero.org
-- name: 技術規格
-  url: technical-specs/

_i18n/en.yml

@@ -538,39 +538,25 @@ research-lab:
 
 
 specs:
-  fair_title: No premine, no instamine, no token
+  title: Technical Info
-  fair_premine: Monero had no premine or instamine
+  intro: Here are listed some basic technical info about Monero. For more in-depth details, consult
-  fair_token: Monero did not sell any token
+  intro_link: the library
-  fair_presale: Monero had no presale of any kind
+  intro1: or get in touch with the community
   pow_title: Proof of Work
-  pow_name: CryptoNight
+  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_disclaimer: may change in the future
+  pow_link: More info in the GitHub repo
-  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
   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
+  blocks_title: Blocks
-  block_emission_disclaimer_link: charts and details
+  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
-  supply_title: Max supply
+  privacytech_title: Main privacy enhancing technologies
-  supply_amount: infinite
+  privacytech_ringct: "@RingCT"
-  sender_privacy_title: Sender privacy
+  privacytech_sh: "@Stealth-Addresses"
-  sender_privacy_mode: Ring signatures
+  privacytech_rs: Ring Signatures
-  recipient_privacy_title: Recipient privacy
+  privacytech_tor-i2p: Transactions over Tor/I2P
-  recipient_privacy_mode: Stealth addresses
+  privacytech_dandelion: Dandelion++
-  amount_hidden_title: Amount obfuscation
-  amount_hidden_mode: Ring confidential transactions
 
 library:
   description: "Below are some publications, books or magazines available for you to download."

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>

technical-specs/index.md

@@ -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>