From 9a0f354f8636f47e6c8d5ba35d31c19c9f3e7c5c Mon Sep 17 00:00:00 2001
From: Gururaj Shetty <gururaj.shetty@huawei.com>
Date: Wed, 22 Sep 2021 22:08:14 +0530
Subject: [PATCH] Use definitions for project name
* All project name replaced with tag
* definitions.rst reference added
* Closes: #77
Signed-off-by: Gururaj Shetty <gururaj.shetty@huawei.com>
---
ci/device-testing.rst | 4 +++-
ci/docs.rst | 4 +++-
ci/index.rst | 4 +++-
ci/meta-ohos.rst | 4 +++-
community-chat-platform.rst | 4 +++-
contributing/gitlab.rst | 2 +-
overview/allscenarios-vision.rst | 4 ++--
repos/index.rst | 4 +++-
8 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/ci/device-testing.rst b/ci/device-testing.rst
index 64a3b54..32bbb8d 100644
--- a/ci/device-testing.rst
+++ b/ci/device-testing.rst
@@ -2,13 +2,15 @@
..
.. SPDX-License-Identifier: CC-BY-4.0
+.. include:: ../definitions.rst
+
On-device Testing
=================
Overview
--------
-All Scenarios OS implements distributed device testing using Linaro Automation
+|main_project_name| implements distributed device testing using Linaro Automation
and Validation Architecture (LAVA). This architecture creates an environment
where you can operate the necessary physical infrastructure responsible for
testing development on real devices, like operating system boot-loader and
diff --git a/ci/docs.rst b/ci/docs.rst
index c4cfd27..3a30c04 100644
--- a/ci/docs.rst
+++ b/ci/docs.rst
@@ -2,12 +2,14 @@
..
.. SPDX-License-Identifier: CC-BY-4.0
+.. include:: ../definitions.rst
+
The docs Repository
===================
.. _docs repository: https://git.ostc-eu.org/OSTC/OHOS/docs.git
-The `docs repository`_ contains the general documentation of the All Scenarios OS
+The `docs repository`_ contains the general documentation of the |main_project_name|
project. The documentation is normally written in reStructuredText, with an
important difference. Unlike in a regular project, the documentation here is not
standalone. Instead, the git repository contains symbolic links that are valid
diff --git a/ci/index.rst b/ci/index.rst
index 8c06784..99ae05c 100644
--- a/ci/index.rst
+++ b/ci/index.rst
@@ -2,10 +2,12 @@
..
.. SPDX-License-Identifier: CC-BY-4.0
+.. include:: ../definitions.rst
+
Continuous Integration
======================
-All Scenarios OS ``git`` repositories hosted on https://git.ostc-eu.org/OSTC use
+|main_project_name| ``git`` repositories hosted on https://git.ostc-eu.org/OSTC use
GitLab pipelines for building and testing changes before they are merged.
Individual pipelines are documented in each repository, but some general or more
important elements are described below.
diff --git a/ci/meta-ohos.rst b/ci/meta-ohos.rst
index d3c7750..2bf2eb7 100644
--- a/ci/meta-ohos.rst
+++ b/ci/meta-ohos.rst
@@ -2,12 +2,14 @@
..
.. SPDX-License-Identifier: CC-BY-4.0
+.. include:: ../definitions.rst
+
The meta-ohos Repository
========================
.. _meta-ohos repository: https://git.ostc-eu.org/OSTC/OHOS/meta-ohos.git
-The `meta-ohos repository`_ contains meta-layers specific to All Scenarios OS and is
+The `meta-ohos repository`_ contains meta-layers specific to |main_project_name| and is
the second most important repository after the manifest repository.
The CI pipeline is defined in the file ``.ostc-ci/gitlab-ci.yml``.
diff --git a/community-chat-platform.rst b/community-chat-platform.rst
index e84d8fd..68b0e3a 100644
--- a/community-chat-platform.rst
+++ b/community-chat-platform.rst
@@ -2,6 +2,8 @@
..
.. SPDX-License-Identifier: CC-BY-4.0
+.. include:: definitions.rst
+
Community Chat Platform
#######################
@@ -11,7 +13,7 @@ Community Chat Platform
Overview
********
-The All Scenarios OS project has a friendly community providing an open platform for
+The |main_project_name| project has a friendly community providing an open platform for
discussions. `The OSTC Mattermost instance <https://chat.ostc-eu.org>`_ is used
as the primary communication tool by project members, contributors, and the
community.
diff --git a/contributing/gitlab.rst b/contributing/gitlab.rst
index 6c5d535..1436b86 100644
--- a/contributing/gitlab.rst
+++ b/contributing/gitlab.rst
@@ -29,7 +29,7 @@ Commit Guidelines
If you are new to ``git``, start by reading the official
`Getting Started Document <https://git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup>`_.
-At its core, contributing to the All Scenarios OS project means *wrapping* your work as ``git``
+At its core, contributing to the |main_project_name| project means *wrapping* your work as ``git``
commits. How we handle this has an impact on rebasing, cherry-picking,
back-porting, and ultimately exposing consistent documentation through its
logs.
diff --git a/overview/allscenarios-vision.rst b/overview/allscenarios-vision.rst
index 865747a..c8252f6 100644
--- a/overview/allscenarios-vision.rst
+++ b/overview/allscenarios-vision.rst
@@ -4,8 +4,8 @@
.. include:: ../definitions.rst
-All Scenarios OS vision and aims
-================================
+|main_project_name| vision and aims
+===================================
System Positioning
------------------
diff --git a/repos/index.rst b/repos/index.rst
index c314c7e..eb33af3 100644
--- a/repos/index.rst
+++ b/repos/index.rst
@@ -2,10 +2,12 @@
..
.. SPDX-License-Identifier: CC-BY-4.0
+.. include:: ../definitions.rst
+
Git Repositories
================
-All Scenarios OS development is organized through a set of ``git`` repositories.
+|main_project_name| development is organized through a set of ``git`` repositories.
Some of those are documented below.
.. toctree::
--
GitLab