Skip to content

Commit 484a180

Browse files
greg-fercarlescufi
authored andcommitted
doc: update release versions
Updated release version for 1.2.0 release. Signed-off-by: Grzegorz Ferenc <[email protected]>
1 parent 9f80e17 commit 484a180

File tree

6 files changed

+12
-13
lines changed

6 files changed

+12
-13
lines changed

doc/nrf/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@
9696
# built documents.
9797
#
9898
# The short X.Y version.
99-
version = '1.1.99'
99+
version = '1.2.0'
100100
# The full version, including alpha/beta/rc tags.
101-
release = '1.1.99'
101+
release = '1.2.0'
102102

103103
# The language for content autogenerated by Sphinx. Refer to documentation
104104
# for a list of supported languages.

doc/nrf/gs_ins_windows.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ To clone the repositories, complete the following steps:
160160
west init -m https\://github.com/NordicPlayground/fw-nrfconnect-nrf --mr *NCS_revision*
161161
162162
.. note::
163-
*NCS_revision* can be a branch (eg. ``master``), a tag (for example, ``v1.1.0``), or even a SHA (for example, ``224bee9055d986fe2677149b8cbda0ff10650a6e``). When not specified, it defaults to ``master``.
163+
*NCS_revision* can be a branch (eg. ``master``), a tag (for example, ``v1.2.0``), or even a SHA (for example, ``224bee9055d986fe2677149b8cbda0ff10650a6e``). When not specified, it defaults to ``master``.
164164

165165
This will clone the manifest repository `fw-nrfconnect-nrf`_ into :file:`nrf`.
166166

@@ -189,10 +189,10 @@ To manage the ``nrf`` repository (the manifest repository), use Git.
189189
To make sure that you have the latest changes, run ``git fetch origin`` to :ref:`fetch the latest code <dm-wf-update-ncs>` from the `fw-nrfconnect-nrf`_ repository.
190190
Checking out a branch or tag in the ``nrf`` repository gives you a different version of the manifest file.
191191
Running ``west update`` will then update the project repositories to the state specified in this manifest file.
192-
For example, to switch to release v1.1.0 of the |NCS|, enter the following commands in the ``ncs/nrf`` directory::
192+
For example, to switch to release v1.2.0 of the |NCS|, enter the following commands in the ``ncs/nrf`` directory::
193193

194194
git fetch origin
195-
git checkout v1.1.0
195+
git checkout v1.2.0
196196
west update
197197

198198
To update to a particular revision (SHA), make sure that you have that particular revision locally before you check it out (by running ``git fetch origin``)::

doc/nrf/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ The |NCS| includes the Zephyr™ real-time operating system (RTOS), which is bui
1313
Documentation for different versions of the |NCS| is available at the following links:
1414

1515
* `nRF Connect SDK latest documentation`_ (from the master branch)
16+
* `nRF Connect SDK v1.2.0 documentation`_
1617
* `nRF Connect SDK v1.1.0 documentation`_
1718
* `nRF Connect SDK v1.0.0 documentation`_
1819
* `nRF Connect SDK v0.4.0 documentation`_

doc/nrf/links.txt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@
1919
.. |ncs_repo| replace:: https://github.com/NordicPlayground/fw-nrfconnect-nrf
2020
.. _`fw-nrfconnect-nrf`: https://github.com/NordicPlayground/fw-nrfconnect-nrf
2121

22-
.. |ncs_zephyr_repo| replace:: https://github.com/NordicPlayground/fw-nrfconnect-zephyr
2322
.. _`fw-nrfconnect-zephyr`: https://github.com/NordicPlayground/fw-nrfconnect-zephyr
2423

25-
.. |ncs_mcuboot_repo| replace:: https://github.com/NordicPlayground/fw-nrfconnect-mcuboot
2624
.. _`fw-nrfconnect-mcuboot`: https://github.com/NordicPlayground/fw-nrfconnect-mcuboot
2725

2826
.. |ncs_nrfxlib_repo| replace:: https://github.com/NordicPlayground/nrfxlib
@@ -34,6 +32,8 @@
3432

3533
.. ### Links to Nordic documentation
3634

35+
.. _`nRF Connect SDK v1.2.0 documentation`: https://developer.nordicsemi.com/nRF_Connect_SDK/doc/1.2.0/nrf/index.html
36+
3737
.. _`nRF Connect SDK v1.1.0 documentation`: https://developer.nordicsemi.com/nRF_Connect_SDK/doc/1.1.0/nrf/index.html
3838

3939
.. _`nRF Connect SDK v1.0.0 documentation`: https://developer.nordicsemi.com/nRF_Connect_SDK/doc/1.0.0/nrf/index.html
@@ -189,7 +189,6 @@
189189
.. _`Battery Service Specification`: https://www.bluetooth.org/docman/handlers/downloaddoc.ashx?doc_id=245138
190190

191191

192-
193192
.. ### Links to NFC specs
194193

195194
.. _`Bluetooth Secure Simple Pairing Using NFC`: http://nfc-forum.org/our-work/specifications-and-application-documents/application-documents
@@ -220,11 +219,10 @@
220219
.. _`AWS IoT jobs`:
221220
.. _`AWS IoT Developer Guide: Jobs`: https://docs.aws.amazon.com/iot/latest/developerguide/iot-jobs.html
222221

222+
.. _`AWS Simple Storage Service (S3)`: https://docs.aws.amazon.com/s3/index.html
223223
.. _`AWS S3 Developer Guide: Using Bucket Policies and User Policies`: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-iam-policies.html
224224
.. _`AWS S3 Developer Guide: Bucket Policy Examples`: https://docs.aws.amazon.com/AmazonS3/latest/dev/example-bucket-policies.html
225225

226-
.. _`AWS Simple Storage Service (S3)`: https://docs.aws.amazon.com/s3/index.html
227-
228226
.. ### Links to specific files on GitHub
229227

230228
.. _`nrf9160_pca10090_partition_conf.dts`: https://github.com/NordicPlayground/fw-nrfconnect-zephyr/blob/master/boards/arm/nrf9160_pca10090/nrf9160_pca10090_partition_conf.dts

doc/nrf/ug_dev_model.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ In order to obtain a fresh copy of the |NCS| at revision ``{revision}`` and plac
194194
west update
195195

196196
Replace ``{revision}`` with any revision you wish to obtain.
197-
This can be ``master`` if you want the latest state, or any released version (e.g. ``v1.1.0``).
197+
This can be ``master`` if you want the latest state, or any released version (e.g. ``v1.2.0``).
198198
If you omit the ``--mr`` parameter, west defaults to ``master``.
199199

200200
.. _dm-wf-update-ncs:

doc/nrfxlib/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@
6868
# built documents.
6969
#
7070
# The short X.Y version.
71-
version = '1.1.99'
71+
version = '1.2.0'
7272
# The full version, including alpha/beta/rc tags.
73-
release = '1.1.99'
73+
release = '1.2.0'
7474

7575
# The language for content autogenerated by Sphinx. Refer to documentation
7676
# for a list of supported languages.

0 commit comments

Comments
 (0)