updated .yml

.readthedocs.yml

@@ -3,9 +3,36 @@
 # SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
 # Code is Apache-2.0 and docs are CC-BY-4.0
 
-build:
+#build:
-    image: latest
+#    image: latest
 
+#python:
+#    version: 3.9
+#    pip_install: true
+
+
+# Required
+version: 2
+
+# Set the version of Python and other tools you might need
+build:
+  os: ubuntu-20.04
+  tools:
+    python: "3.9"
+    # You can also specify other tool versions:
+    # nodejs: "16"
+    # rust: "1.55"
+    # golang: "1.17"
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+   configuration: docs/conf.py
+
+# If using Sphinx, optionally build your docs in additional formats such as PDF
+# formats:
+#    - pdf
+
+# Optionally declare the Python requirements required to build your docs
 python:
-    version: 3.9
+   install:
-    pip_install: true
+   - requirements: docs/requirements.txt

docs/root/generate_http_server_api_documentation.py

@@ -9,12 +9,8 @@ import json
 import os
 import os.path
 
-<<<<<<< Updated upstream
 from planetmint.transactions.common.input import Input
 from planetmint.transactions.common.transaction_link import TransactionLink
-=======
-from planetmint.common.transaction import Transaction, Input, TransactionLink
->>>>>>> Stashed changes
 from planetmint import lib
 from planetmint.transactions.types.assets.create import Create
 from planetmint.transactions.types.assets.transfer import Transfer

docs/root/source/installation/api/http-samples/api-index-response.http

@@ -4,11 +4,7 @@ Content-Type: application/json
 {
   "assets": "/assets/",
   "blocks": "/blocks/",
-<<<<<<< Updated upstream
+  "docs": "https://docs.planetmint.com/projects/server/en/v0.9.1/http-client-server-api.html",
-  "docs": "https://docs.planetmint.com/projects/server/en/v0.9.0/http-client-server-api.html",
-=======
-  "docs": "https://docs.bigchaindb.com/projects/server/en/v0.9.0/http-client-server-api.html",
->>>>>>> Stashed changes
   "metadata": "/metadata/",
   "outputs": "/outputs/",
   "streams": "ws://localhost:9985/api/v1/streams/valid_transactions",

docs/root/source/installation/api/http-samples/index-response.http

@@ -6,11 +6,7 @@ Content-Type: application/json
     "v1": {
       "assets": "/api/v1/assets/",
       "blocks": "/api/v1/blocks/",
-<<<<<<< Updated upstream
+      "docs": "https://docs.planetmint.com/projects/server/en/v0.9.1/http-client-server-api.html",
-      "docs": "https://docs.planetmint.com/projects/server/en/v0.9.0/http-client-server-api.html",
-=======
-      "docs": "https://docs.bigchaindb.com/projects/server/en/v0.9.0/http-client-server-api.html",
->>>>>>> Stashed changes
       "metadata": "/api/v1/metadata/",
       "outputs": "/api/v1/outputs/",
       "streams": "ws://localhost:9985/api/v1/streams/valid_transactions",
@@ -18,11 +14,7 @@ Content-Type: application/json
       "validators": "/api/v1/validators"
     }
   },
-<<<<<<< Updated upstream
+  "docs": "https://docs.planetmint.com/projects/server/en/v0.9.1/",
-  "docs": "https://docs.planetmint.com/projects/server/en/v0.9.0/",
-=======
-  "docs": "https://docs.bigchaindb.com/projects/server/en/v0.9.0/",
->>>>>>> Stashed changes
   "software": "Planetmint",
-  "version": "0.9.0"
+  "version": "0.9.1"
 }

docs/root/source/terminology.md

@@ -11,11 +11,9 @@ There is some specialized terminology associated with Planetmint. To get started
 
 ### Planetmint Node
 
-<<<<<<< HEAD
+**Planetmint node** is a machine (or logical machine) running [Planetmint Server](https://docs.planetmint.com/projects/server/en/latest/introduction.html) and related software. Each node is controlled by one person or organization.
-A **Planetmint node** is a machine (or logical machine) running [Planetmint Server](https://docs.planetmint.com/projects/server/en/latest/introduction.html) and related software. Each node is controlled by one person or organization.
+
-=======
+**Planetmint node** is a machine (or logical machine) running [Planetmint Server](https://docs.planetmint.io/projects/server/en/latest/introduction.html) and related software. Each node is controlled by one person or organization.
-A **Planetmint node** is a machine (or logical machine) running [Planetmint Server](https://docs.planetmint.io/projects/server/en/latest/introduction.html) and related software. Each node is controlled by one person or organization.
->>>>>>> 3bfc3298f8210b135084e823eedd47f213538088
 
 ### Planetmint Network
 
@@ -80,10 +78,7 @@ You could do more elaborate things too. As one example, each time someone writes
 
 ### Role-Based Access Control (RBAC)
 
-<<<<<<< HEAD
 In September 2017, we published a [blog post about how one can define an RBAC sub-system on top of Planetmint](https://blog.planetmint.com/role-based-access-control-for-planetmint-assets-b7cada491997).
-=======
+
-In September 2017, BigchainDB published a [blog post about how one can define an RBAC sub-system on top of Planetmint](https://blog.bigchaindb.com/role-based-access-control-for-planetmint-assets-b7cada491997).
->>>>>>> 3bfc3298f8210b135084e823eedd47f213538088
 At the time of writing (January 2018), doing so required the use of a plugin, so it's not possible using standard Planetmint (which is what's available on the [IPDB Testnet](https://test.ipdb.io/>). That may change in the future.
 If you're interested, `contact IPDB <contact@ipdb.global>`_.