Merge branch 'master' of git+ssh://git.taler.net/docs

4 files changed, 60 insertions, 7 deletions

diff --git a/design-documents/007-payment.rst b/design-documents/007-payment.rst
index 432816a0..115ac3f8 100644
--- a/design-documents/007-payment.rst
+++ b/design-documents/007-payment.rst
@@ -187,11 +187,11 @@ The following example uses a detached wallet:
    B: -> GET https://shop.demo.taler.net/books/moby-dick
       (content-type: application/html)
 
-     S: [Assigns session sess01 to browser]
+     S: [Assigns session ID ``sess01`` to browser]
      S: -> POST https://merchant-backend.demo.taler.net/orders
-     S: -> GET https://merchant-backend.demo.taler.net/orders/ord01?session_id-sess01
+     S: -> GET https://merchant-backend.demo.taler.net/orders/ord01?session_id=sess01
 
-   B: <- HTTP 307, redirect to https://merchant-backend.demo.taler.net/orders/ord01?token=ct01&session=sess01
+   B: <- HTTP 307, redirect to https://merchant-backend.demo.taler.net/orders/ord01?token=ct01&session_id=sess01
 
    B: -> GET https://merchant-backend.demo.taler.net/orders/ord01?token=ct01
       (content-type: application/html)
@@ -199,7 +199,7 @@ The following example uses a detached wallet:
       taler://pay/shop.demo.taler.net/ord01/sess01?c=ct01
 
    B: [via JavaScript on page]
-   B: -> GET https://merchant-backend.demo.taler.net/orders/ord01?token=ct01&session=sess01
+   B: -> GET https://merchant-backend.demo.taler.net/orders/ord01?token=ct01&session_id=sess01
       (content-type: application/json)
    B: <- HTTP status 402 Payment Required
 
@@ -207,14 +207,14 @@ The following example uses a detached wallet:
    W: POST https://shop.demo.taler.net/orders/ord01/claim
 
    B: [via JavaScript on page]
-   B: -> GET https://merchant-backend.demo.taler.net/orders/ord01?token=ct01&session=sess01
+   B: -> GET https://merchant-backend.demo.taler.net/orders/ord01?token=ct01&session_id=sess01
       (content-type: application/json)
    B: <- HTTP status 402 Payment Required
 
    W: POST https://shop.demo.taler.net/orders/ord01/pay
 
    B: [via JavaScript on page]
-   B: -> GET https://merchant-backend.demo.taler.net/orders/ord01?token=ct01&session=sess01
+   B: -> GET https://merchant-backend.demo.taler.net/orders/ord01?token=ct01&session_id=sess01
       (content-type: application/json)
    B: <- HTTP status 202 Accepted
    B: [redirects to fulfillment URL of ord01 baked into the JavaScript code]
diff --git a/taler-developer-manual.rst b/taler-developer-manual.rst
index 3b018e6a..a1148474 100644
--- a/taler-developer-manual.rst
+++ b/taler-developer-manual.rst
@@ -880,14 +880,20 @@ https://weblate.taler.net/projects/gnu-taler/
 To update translations, enter the taler-android git repository
 and ensure that the weblate remote exists:
 
+.. code-block:: console
+
   $ git config -l | grep weblate
 
 If it does not yet exist (empty output), you can add it like this:
 
+.. code-block:: console
+
   $ git remote add weblate https://weblate.taler.net/git/gnu-taler/wallet-android/
 
 Then you can merge in translations commit from the weblate remote:
 
+.. code-block:: console
+
   # ensure you have latest version
   $ git fetch weblate
 
@@ -897,6 +903,51 @@ Then you can merge in translations commit from the weblate remote:
 Afterwards, build the entire project from source and test the UI
 to ensure that no erroneous translations (missing placeholders) are breaking things.
 
+Release process
+---------------
+
+After extensive testing, the code making up a new release should get a signed git tag.
+The current tag format is:
+
+* cashier-$VERSION
+* pos-$VERSION
+* wallet-$VERSION (where $VERSION has a v prefix)
+
+.. code-block:: console
+
+  $ git tag -s $APP-$VERSION
+
+F-Droid
+^^^^^^^
+Nightly builds get published automatically (see above) after pushing code to the official repo.
+Actual releases get picked up by F-Droid's official repository via git tags.
+So ensure that all releases get tagged properly.
+
+Some information for F-Droid official repository debugging:
+
+* Wallet: [`metadata <https://gitlab.com/fdroid/fdroiddata/-/blob/master/metadata/net.taler.wallet.fdroid.yml>`__] [`build log <https://f-droid.org/wiki/page/net.taler.wallet.fdroid/lastbuild>`__]
+* Cashier: [`metadata <https://gitlab.com/fdroid/fdroiddata/-/blob/master/metadata/net.taler.cashier.yml>`__] [`build log <https://f-droid.org/wiki/page/net.taler.cashier/lastbuild>`__]
+* PoS: [`metadata <https://gitlab.com/fdroid/fdroiddata/-/blob/master/metadata/net.taler.merchantpos.yml>`__] [`build log <https://f-droid.org/wiki/page/net.taler.merchantpos/lastbuild>`__]
+
+Google Play
+^^^^^^^^^^^
+Google Play uploads are managed via `Fastlane <https://docs.fastlane.tools/getting-started/android/setup/>`__.
+Before proceeding, ensure that this is properly set up
+and that you have access to the Google Play API.
+
+To release an app, enter into its respective folder and run fastlane:
+
+.. code-block:: console
+
+  $ bundle exec fastlane
+
+Then select the deploy option.
+Note this requires access to the Google Play upload signing key
+set via the various environment variables in $app/fastlane/Fastfile.
+
+All uploads are going to the beta track by default.
+These can be promoted to production later or immediately after upload if you feel daring.
+
 .. _Code-coverage:
 
 Code Coverage
diff --git a/taler-merchant-manual.rst b/taler-merchant-manual.rst
index ad8b5130..8e2c7fa0 100644
--- a/taler-merchant-manual.rst
+++ b/taler-merchant-manual.rst
@@ -182,7 +182,7 @@ merchant, where the merchant specifies the specific terms of the order.
 After an order is created, it is *claimed* by a wallet. Once an order is
 claimed by a specific wallet, only that wallet will be able to pay for this
 order, to the exclusion of other wallets even if they see the same order URL.
-Sharing order URLs is explicitly allowed: if a user shares and order URL
+Sharing order URLs is explicitly allowed: if a user shares an order URL
 with another user, that other user should be given the opportunity to
 purchase the same product.
 
diff --git a/taler-wallet-cli-manual.rst b/taler-wallet-cli-manual.rst
index 8007f6b0..0758f9ef 100644
--- a/taler-wallet-cli-manual.rst
+++ b/taler-wallet-cli-manual.rst
@@ -28,6 +28,8 @@ Now the wallet CLI can be installed without requiring elevated permissions:
 .. code-block:: console
 
   $ npm set prefix $HOME/.npm-global
+  $ npm install -g @gnu-taler/taler-wallet-cli
+  $ taler-wallet-cli --version
 
 
 Getting Help