From 33a62f780bf76ccac9581abd287d78eba3d7d023 Mon Sep 17 00:00:00 2001 From: erciccione Date: Sun, 16 Feb 2020 19:04:05 +0100 Subject: [PATCH] Add technical info to 'About' page and remove 'technical specs' page This commits removes the page 'Technical specs' and adds some technical info to the 'About' page. The 'technical specs' folder and page were removed from the repo, from the navigation menu and the footer (for all languages) --- _data/lang/ar/footer-2.yml | 2 - _data/lang/de/footer-2.yml | 2 - _data/lang/en/footer-2.yml | 2 - _data/lang/en/navigation.yml | 2 - _data/lang/es/footer-2.yml | 2 - _data/lang/fr/footer-2.yml | 2 - _data/lang/it/footer-2.yml | 2 - _data/lang/nl/footer-2.yml | 2 - _data/lang/pl/footer-2.yml | 2 - _data/lang/pt-br/footer-2.yml | 2 - _data/lang/ru/footer-2.yml | 4 +- _data/lang/tr/footer-2.yml | 2 - _data/lang/zh-cn/footer-2.yml | 2 - _data/lang/zh-tw/footer-2.yml | 2 - _i18n/en.yml | 44 ++++------- resources/about/index.md | 30 ++++++++ technical-specs/index.md | 136 ---------------------------------- 17 files changed, 46 insertions(+), 194 deletions(-) delete mode 100644 technical-specs/index.md diff --git a/_data/lang/ar/footer-2.yml b/_data/lang/ar/footer-2.yml index 63e646f6..577cfd17 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 c9b4ef09..34aea41e 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 be041a12..1ebb9a83 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 1a7f1118..7cb0765f 100644 --- a/_data/lang/en/navigation.yml +++ b/_data/lang/en/navigation.yml @@ -48,8 +48,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 8b6ee5db..ed71895e 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 fbe81765..c4152229 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 d9818331..8dd4b592 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 c85a250d..167fd7e6 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 583dea1c..5db0c06a 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 4f00ea5e..fa243d92 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 ed97c482..f144ba90 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 09034815..f9d77168 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 be041a12..1ebb9a83 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 3796a1e9..a183c14a 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 7af33bd0..ced66461 100644 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -534,39 +534,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 16f789d8..02a2374c 100644 --- a/resources/about/index.md +++ b/resources/about/index.md @@ -46,5 +46,35 @@ permalink: /resources/about/index.html +
+ +
+
+
+
+

{% t specs.title %}

+
+
+
+

{% t specs.intro %} {% t specs.intro_link %} {% t specs.intro1 %}.

+

{% t specs.pow_title %}

+

{% t specs.pow %}. {% t specs.pow_link %}.

+

{% t specs.block_emission_title %}

+

{% t specs.block_emission_pre %} {% t specs.block_emission_main %}, {% t specs.block_emission_tail %} (@Tail-Emission).

+

{% t specs.blocks_title %}

+

{% t specs.blocks %}.

+

{% t specs.privacytech_title %}

+
    +
  • {% t specs.privacytech_ringct %}
    • +
  • {% t specs.privacytech_sh %}
    • +
  • {% t specs.privacytech_rs%}
    • +
  • {% t specs.privacytech_tor-i2p %}
    • + +
+
+
+
+ +
diff --git a/technical-specs/index.md b/technical-specs/index.md deleted file mode 100644 index 45d4ed6a..00000000 --- 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 %} -
-
-
- -
-
-
-
-

{% t specs.fair_title %}

-
-
-
-
    -
  • {% t specs.fair_premine %}
    • -
  • {% t specs.fair_token %}
    • -
  • {% t specs.fair_presale %}
    • -
-
-
-
-

{% t specs.pow_title %}

-
-
-
-
    -
  • {% t specs.pow_name %}
    • -
  • {% t specs.pow_disclaimer %}
    • -
-
-
-
-

{% t specs.diff_title %}

-
-
-
-
    -
  • {% t specs.diff_freq %}
    • -
  • {% t specs.diff_base %}
    • -
-
-
-
-

{% t specs.block_time_title %}

-
-
-
-
    -
  • {% t specs.block_time_duration %}
    • -
  • {% t specs.block_time_disclaimer %}
    • -
-
-
-
-

{% t specs.block_reward_title %}

-
-
-
- -
-
-
-

{% t specs.block_size_title %}

-
-
-
-
    -
  • {% t specs.block_size %}
    • -
-
-
-
-

{% t specs.block_emission_title %}

-
-
-
- -
-
-
-

{% t specs.supply_title %}

-
-
-
-
    -
  • {% t specs.supply_amount %}
    • -
-
-
-
-

{% t specs.sender_privacy_title %}

-
-
-
-
    -
  • {% t specs.sender_privacy_mode %}
    • -
-
-
-
-

{% t specs.recipient_privacy_title %}

-
-
-
-
    -
  • {% t specs.recipient_privacy_mode %}
    • -
-
-
-
-

{% t specs.amount_hidden_title %}

-
-
-
-
    -
  • {% t specs.amount_hidden_mode %}
    • -
-
-
-
- -
-
-