Skip to content

Commit

Permalink
save fix
Browse files Browse the repository at this point in the history
Signed-off-by: Sara <lira.lemur@gmail.com>
  • Loading branch information
LiraLemur committed Nov 22, 2019
1 parent 2da63b6 commit 1659bce
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions docs/source/develop/api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ We will overview commands and queries that the system has, and the set of client
Iroha API follows command-query separation `principle <https://en.wikipedia.org/wiki/Command%E2%80%93query_separation>`_.

Communication between Iroha peer and a client application is maintained via `gRPC <https://grpc.io/about/>`_ framework.
Client applications should follow described protocol and form transactions accordingly to their `description <../before_start/glossary.html#transaction>`_.
Client applications should follow described protocol and form transactions accordingly to their `description <../concepts_architecture/glossary.html#transaction>`_.


.. toctree::
Expand All @@ -18,9 +18,9 @@ Client applications should follow described protocol and form transactions accor
api/queries.rst
api/permissions.rst

Commands here are parts of `transaction <../before_start/glossary.html#transaction>`_ - a state-changing set of actions in the system. When a transaction passes validation and consensus stages, it is written in a `block <../before_start/glossary.html#block>`_ and saved in immutable block store (blockchain).
Commands here are parts of `transaction <../concepts_architecture/glossary.html#transaction>`_ - a state-changing set of actions in the system. When a transaction passes validation and consensus stages, it is written in a `block <../concepts_architecture/glossary.html#block>`_ and saved in immutable block store (blockchain).

Transactions consist of commands, performing an action over an `entity <../before_start/er_model.html>`_ in the system. The entity might be an account, asset, etc.
Transactions consist of commands, performing an action over an `entity <../concepts_architecture/er_model.html>`_ in the system. The entity might be an account, asset, etc.



12 changes: 6 additions & 6 deletions docs/source/develop/api/queries.rst
Original file line number Diff line number Diff line change
Expand Up @@ -258,8 +258,8 @@ Get Pending Transactions
Purpose
-------

GetPendingTransactions is used for retrieving a list of pending (not fully signed) `multisignature transactions <../../before_start/glossary.html#multisignature-transactions>`_
or `batches of transactions <../../before_start/glossary.html#batch-of-transactions>`__ issued by account of query creator.
GetPendingTransactions is used for retrieving a list of pending (not fully signed) `multisignature transactions <../../concepts_architecture/glossary.html#multisignature-transactions>`_
or `batches of transactions <../../concepts_architecture/glossary.html#batch-of-transactions>`__ issued by account of query creator.

.. note:: This query uses pagination for quicker and more convenient query responses.

Expand Down Expand Up @@ -328,7 +328,7 @@ Response Schema
Response Structure
------------------

The response contains a list of `pending transactions <../../before_start/glossary.html#pending-transactions>`_,
The response contains a list of `pending transactions <../../concepts_architecture/glossary.html#pending-transactions>`_,
the amount of all stored pending transactions for the user
and the information required to query the subsequent page (if exists).

Expand All @@ -352,8 +352,8 @@ Get Pending Transactions (deprecated)
Purpose
-------

GetPendingTransactions is used for retrieving a list of pending (not fully signed) `multisignature transactions <../../before_start/glossary.html#multisignature-transactions>`_
or `batches of transactions <../../before_start/glossary.html#batch-of-transactions>`__ issued by account of query creator.
GetPendingTransactions is used for retrieving a list of pending (not fully signed) `multisignature transactions <../../concepts_architecture/glossary.html#multisignature-transactions>`_
or `batches of transactions <../../concepts_architecture/glossary.html#batch-of-transactions>`__ issued by account of query creator.

Request Schema
--------------
Expand All @@ -375,7 +375,7 @@ Response Schema
Response Structure
------------------

The response contains a list of `pending transactions <../../before_start/glossary.html#pending-transactions>`_.
The response contains a list of `pending transactions <../../concepts_architecture/glossary.html#pending-transactions>`_.

.. csv-table::
:header: "Field", "Description", "Constraint", "Example"
Expand Down
2 changes: 1 addition & 1 deletion docs/source/faq/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Hello, newcomer! You are very welcome :)
There are 2 ways for you to start with Iroha:

1. You can see what Iroha is an how it works by building a simple example network following our `Getting Started Guide <../getting_started/index.html>`_
2. You can get acquainted with the `core concepts of Iroha <../before_start/index.html>`_ and start building your own `Iroha network <../deploy/index.html>`_
2. You can get acquainted with the `core concepts of Iroha <../concepts_architecture/index.html>`_ and start building your own `Iroha network <../deploy/index.html>`_

Now you have your Iroha blockchain! Congratulations!
If you have any questions on it, do not hesitate to contact our community here: https://chat.hyperledger.org/channel/iroha
Expand Down

0 comments on commit 1659bce

Please sign in to comment.