Merge branch 'planetmint:main' into main

docs/root/generate_http_server_api_documentation.py

@@ -9,7 +9,7 @@ import json
 import os
 import os.path
 
-from planetmint.iomon.transaction import Transaction, Input, TransactionLink
+from planetmint.common.transaction import Transaction, Input, TransactionLink
 from planetmint import lib
 from planetmint.web import server
 

docs/root/source/contributing/cross-project-policies/code-of-conduct.md

@@ -42,7 +42,7 @@ This Code of Conduct applies both within project spaces and in public spaces
 when an individual is representing the project or its community.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior directed at yourself or another community member may be
-reported by contacting a project maintainer at [contact@ipdb.global](mailto:contact@ipdb.global). All
+reported by contacting a project maintainer at [contact@planetmint.com](mailto:contact@planetmint.com). All
 complaints will be reviewed and investigated and will result in a response that
 is appropriate to the circumstances. Maintainers are
 obligated to maintain confidentiality with regard to the reporter of an

docs/root/source/contributing/cross-project-policies/release-process.md

@@ -27,7 +27,7 @@ We use `0.9` and `0.9.0` as example version and short-version values below. You
 
 We follow [BEP-1](https://github.com/planetmint/BEPs/tree/master/1), which is our variant of C4, the Collective Code Construction Contract, so a release is just a [tagged commit](https://git-scm.com/book/en/v2/Git-Basics-Tagging) on the `master` branch, i.e. a label for a particular Git commit.
 
-The following steps are what we do to release a new version of _Planetmint Server_. The steps to release the Python Driver are similar but not the same.
+The following steps are what we do to release a new version of _BigchainDB Server_. The steps to release the Python Driver are similar but not the same.
 
 ## Steps
 

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

@@ -4,7 +4,7 @@ Content-Type: application/json
 {
   "assets": "/assets/",
   "blocks": "/blocks/",
-  "docs": "https://docs.planetmint.io/projects/server/en/v0.9.0/http-client-server-api.html",
+  "docs": "https://docs.planetmint.com/projects/server/en/v0.9.0/http-client-server-api.html",
   "metadata": "/metadata/",
   "outputs": "/outputs/",
   "streams": "ws://localhost:9985/api/v1/streams/valid_transactions",

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

@@ -6,7 +6,7 @@ Content-Type: application/json
     "v1": {
       "assets": "/api/v1/assets/",
       "blocks": "/api/v1/blocks/",
-      "docs": "https://docs.planetmint.io/projects/server/en/v0.9.0/http-client-server-api.html",
+      "docs": "https://docs.planetmint.com/projects/server/en/v0.9.0/http-client-server-api.html",
       "metadata": "/api/v1/metadata/",
       "outputs": "/api/v1/outputs/",
       "streams": "ws://localhost:9985/api/v1/streams/valid_transactions",
@@ -14,7 +14,7 @@ Content-Type: application/json
       "validators": "/api/v1/validators"
     }
   },
-  "docs": "https://docs.planetmint.io/projects/server/en/v0.9.0/",
+  "docs": "https://docs.planetmint.com/projects/server/en/v0.9.0/",
   "software": "Planetmint",
   "version": "0.9.0"
 }

docs/root/source/installation/network-setup/k8s-deployment-template/node-on-kubernetes.rst

@@ -166,11 +166,7 @@ Step 5: Assign DNS Name to the NGINX Public IP
 
   * This step is required only if you are planning to set up multiple
     `Planetmint nodes
-<<<<<<< HEAD
-    <https://docs.planetmint.com/en/latest/terminology.html>`_ or are using
-=======
     <https://docs.planetmint.io/en/latest/terminology.html>`_ or are using
->>>>>>> 3bfc3298f8210b135084e823eedd47f213538088
     HTTPS certificates tied to a domain.
 
   * The following command can help you find out if the NGINX service started

docs/root/source/korean/index.rst

@@ -56,24 +56,6 @@ Planetmint 문서
    </style>
 
    <div class="buttondiv">
-<<<<<<< HEAD
-     <a class="button" href="http://planetmint.com/http-api">HTTP API 문서</a>
-   </div>
-   <div class="buttondiv">
-     <a class="button" href="http://docs.planetmint.com/projects/contributing/en/latest/index.html">BigchainDB에 기여하는 법</a>
-   </div>
-   <div class="buttondiv">
-     <a class="button" href="http://docs.planetmint.com/projects/py-driver/en/latest/index.html">파이썬 드라이버 문서</a>
-   </div>
-   <div class="buttondiv">
-     <a class="button" href="https://docs.planetmint.com/projects/js-driver/en/latest/index.html">자바스크립트 드라이버 문서</a>
-   </div>
-   <div class="buttondiv">
-     <a class="button" href="http://docs.planetmint.com/projects/server/en/latest/index.html">서버 문서</a>
-   </div>
-   <div class="buttondiv">
-     <a class="button" href="http://docs.planetmint.com/projects/server/en/latest/quickstart.html">서버 빠른 시작</a>
-=======
      <a class="button" href="http://planetmint.io/http-api">HTTP API 문서</a>
    </div>
    <div class="buttondiv">
@@ -90,7 +72,6 @@ Planetmint 문서
    </div>
    <div class="buttondiv">
      <a class="button" href="http://docs.planetmint.io/projects/server/en/latest/quickstart.html">서버 빠른 시작</a>
->>>>>>> 3bfc3298f8210b135084e823eedd47f213538088
    </div>
 
 
@@ -114,8 +95,4 @@ Planetmint에 대한 추가 정보
    store-files_ko
    permissions-ko
    private-data-ko
-<<<<<<< HEAD
-   Data Models <https://docs.planetmint.com/projects/server/en/latest/data-models/index.html>
-=======
    Data Models <https://docs.planetmint.io/projects/server/en/latest/data-models/index.html>
->>>>>>> 3bfc3298f8210b135084e823eedd47f213538088