Skip to content

Commit ebce359

Browse files
committed
docs: restructure general guidelines
move all general guidance documents into one folder tutorial
1 parent 964cbd8 commit ebce359

23 files changed

+173
-107
lines changed

docs/guidance/index.rst renamed to docs/contribute/ci/index.rst

+3-4
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@
1212
# SPDX-License-Identifier: Apache-2.0
1313
# *******************************************************************************
1414
15-
Guidance
16-
========
15+
CI
16+
##
1717

1818
.. toctree::
19-
:maxdepth: 2
19+
:maxdepth: 1
2020

21-
docs-as-code
2221
publishing-gh-pages

docs/process/guidance/contribution_request/index.rst renamed to docs/contribute/contribution_request/contribution_request.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
# SPDX-License-Identifier: Apache-2.0
1313
# *******************************************************************************
1414
15-
###############################
16-
Contribution Request Guideline
17-
###############################
15+
16+
Contribution Request Guideline
17+
##############################
1818

1919
.. gd_guidl:: Contribution Request Guideline
2020
:id: gd_guidl__contr_request_guideline

docs/process/guidance/index.rst renamed to docs/contribute/contribution_request/index.rst

+3-11
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,10 @@
1212
# SPDX-License-Identifier: Apache-2.0
1313
# *******************************************************************************
1414
15-
.. _process_guidance:
16-
17-
#########
18-
Guidance
19-
#########
15+
Contribution Request
16+
####################
2017

2118
.. toctree::
2219
:maxdepth: 1
23-
:glob:
2420

25-
git/index.rst
26-
branch/index.rst
27-
feature_flags/index.rst
28-
general/index.rst
29-
contribution_request/index.rst
21+
contribution_request

docs/process/guidance/contribution_request/templates/feature_request_template.rst renamed to docs/contribute/contribution_request/templates/feature_request_template.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ To activate this feature, use the following feature flag:
5555

5656
.. note::
5757
The feature flag must reflect the feature name in snake_case. Further, it is prepended with ``experimental_``, as
58-
long as the feature is not yet stable. See :doc:`/process/guidance/feature_flags/index` for more information.
58+
long as the feature is not yet stable. See :ref:`feature_flags` for more information.
5959

6060

6161
Abstract

docs/process/guidance/contribution_request/templates/index.rst renamed to docs/contribute/contribution_request/templates/index.rst

+2-4
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,10 @@
1414
1515
.. _contribution_templates:
1616

17-
#######################
18-
Contribution Templates
19-
#######################
17+
Contribution Templates
18+
######################
2019

2120
.. toctree::
2221
:maxdepth: 1
23-
:glob:
2422

2523
feature_request_template.rst

docs/contribute/development/index.rst

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
..
2+
# *******************************************************************************
3+
# Copyright (c) 2024 Contributors to the Eclipse Foundation
4+
#
5+
# See the NOTICE file(s) distributed with this work for additional
6+
# information regarding copyright ownership.
7+
#
8+
# This program and the accompanying materials are made available under the
9+
# terms of the Apache License Version 2.0 which is available at
10+
# https://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# SPDX-License-Identifier: Apache-2.0
13+
# *******************************************************************************
14+
15+
Development
16+
###########
17+
18+
.. toctree::
19+
:maxdepth: 1
20+

docs/guidance/docs-as-code.rst renamed to docs/contribute/documentation/docs-as-code.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
# SPDX-License-Identifier: Apache-2.0
1313
# *******************************************************************************
1414
15-
Guidance: Docs-As-Code
16-
======================
15+
Docs-As-Code
16+
============
1717

1818
Introduction
1919
------------
+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
..
2+
# *******************************************************************************
3+
# Copyright (c) 2024 Contributors to the Eclipse Foundation
4+
#
5+
# See the NOTICE file(s) distributed with this work for additional
6+
# information regarding copyright ownership.
7+
#
8+
# This program and the accompanying materials are made available under the
9+
# terms of the Apache License Version 2.0 which is available at
10+
# https://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# SPDX-License-Identifier: Apache-2.0
13+
# *******************************************************************************
14+
15+
Documentation
16+
#############
17+
18+
.. toctree::
19+
:maxdepth: 1
20+
21+
docs-as-code

docs/process/guidance/feature_flags/index.rst renamed to docs/contribute/general/feature_flags.rst

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
# SPDX-License-Identifier: Apache-2.0
1313
# *******************************************************************************
1414
15+
.. _feature_flags:
16+
1517
Feature Flags
1618
=============
1719

docs/process/guidance/general/index.rst renamed to docs/contribute/general/folder.rst

+1-46
Original file line numberDiff line numberDiff line change
@@ -12,51 +12,10 @@
1212
# SPDX-License-Identifier: Apache-2.0
1313
# *******************************************************************************
1414
15-
General
16-
=======
17-
18-
.. _naming_convention_files:
19-
20-
Naming Conventions of Files
21-
---------------------------
22-
23-
The overall naming convention is to use snake case for all files and folders (all files are named lowercase and spaces are replaced by underscores).
24-
25-
.. _naming_convention_needs:
26-
27-
Naming Convention for UIDs
28-
--------------------------
29-
30-
The naming convention for the UIDs of **all** elements shall be defined as follows:
31-
32-
* It should not exceed 30 characters
33-
* It shall show a meaningful name
34-
* It shall only consist of lowercase, digits and underscores
35-
36-
For the naming of the UIDs also following convention shall be applied:
37-
38-
* It shall consist of 3 parts separated by double underscore
39-
* | prefix
40-
| (defined in the Metamodel)
41-
* | structural element
42-
| (e.g. abbreviation for the feature / subfeature)
43-
* | keyword (s)
44-
| (keyword(s) referring the the description, separated by underscore)
45-
46-
As examples:
47-
48-
* feat_req__ipc__e2e_protection
49-
* comp_req__kvs__storage
50-
51-
Only for **process UIDs** the structural element is optional:
52-
53-
* gd_temp__review
54-
* gd_req__req__structure
55-
5615
.. _Platform_Folder_Structure:
5716

5817
Folder Structure of Platform Repository
59-
---------------------------------------
18+
=======================================
6019

6120
The following shows the folder structure of the platform repository (ordered alphabetically). The ordering of the documentation in the rendered documentation
6221
can be in a different order.
@@ -138,7 +97,3 @@ can be in a different order.
13897
registry/ -> infrastructure configuration
13998
14099
README.md -> Entrypoint of the repository.
141-
142-
.. toctree::
143-
:maxdepth: 1
144-
:glob:
File renamed without changes.

docs/contribute/general/index.rst

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
..
2+
# *******************************************************************************
3+
# Copyright (c) 2024 Contributors to the Eclipse Foundation
4+
#
5+
# See the NOTICE file(s) distributed with this work for additional
6+
# information regarding copyright ownership.
7+
#
8+
# This program and the accompanying materials are made available under the
9+
# terms of the Apache License Version 2.0 which is available at
10+
# https://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# SPDX-License-Identifier: Apache-2.0
13+
# *******************************************************************************
14+
15+
General
16+
#######
17+
18+
.. toctree::
19+
:maxdepth: 1
20+
21+
naming
22+
git
23+
folder
24+
feature_flags

docs/contribute/general/naming.rst

+75
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
..
2+
# *******************************************************************************
3+
# Copyright (c) 2024 Contributors to the Eclipse Foundation
4+
#
5+
# See the NOTICE file(s) distributed with this work for additional
6+
# information regarding copyright ownership.
7+
#
8+
# This program and the accompanying materials are made available under the
9+
# terms of the Apache License Version 2.0 which is available at
10+
# https://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# SPDX-License-Identifier: Apache-2.0
13+
# *******************************************************************************
14+
15+
Naming Conventions
16+
==================
17+
18+
.. _naming_convention_files:
19+
20+
Naming Conventions of Files
21+
---------------------------
22+
23+
The overall naming convention is to use snake case for all files and folders (all files are named lowercase and spaces are replaced by underscores).
24+
25+
.. _naming_convention_needs:
26+
27+
Naming Convention for UIDs
28+
--------------------------
29+
30+
The naming convention for the UIDs of **all** elements shall be defined as follows:
31+
32+
* It should not exceed 30 characters
33+
* It shall show a meaningful name
34+
* It shall only consist of lowercase, digits and underscores
35+
36+
For the naming of the UIDs also following convention shall be applied:
37+
38+
* It shall consist of 3 parts separated by double underscore
39+
* | prefix
40+
| (defined in the Metamodel)
41+
* | structural element
42+
| (e.g. abbreviation for the feature / subfeature)
43+
* | keyword (s)
44+
| (keyword(s) referring the the description, separated by underscore)
45+
46+
As examples:
47+
48+
* feat_req__ipc__e2e_protection
49+
* comp_req__kvs__storage
50+
51+
Only for **process UIDs** the structural element is optional:
52+
53+
* gd_temp__review
54+
* gd_req__req__structure
55+
56+
.. _branch_naming:
57+
58+
Naming convention for git branches
59+
----------------------------------
60+
61+
In order to keep an overview which branch belongs to whom the branch
62+
name also should be descriptive. The following rules shall apply:
63+
64+
#. The branch name shall start with your github username. This will make
65+
it easier for everybody to identify the owner of the branch.
66+
#. Branch names must be lower case.
67+
#. Concatenation is done by underscores _.
68+
69+
An example could look like this:
70+
71+
Mustermann, GitHub Name: maximuster
72+
73+
.. code::
74+
75+
maximuster_my_awesome_branch_name

docs/process/guidance/branch/index.rst renamed to docs/contribute/index.rst

+10-21
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,17 @@
1212
# SPDX-License-Identifier: Apache-2.0
1313
# *******************************************************************************
1414
15-
##########
16-
Branches
17-
##########
18-
19-
.. _branch_naming:
20-
21-
*******************
22-
Naming Convention
23-
*******************
15+
.. _contribute:
2416

25-
In order to keep an overview which branch belongs to whom the branch
26-
name also should be descriptive. The following rules shall apply:
27-
28-
#. The branch name shall start with your github username. This will make
29-
it easier for everybody to identify the owner of the branch.
30-
#. Branch names must be lower case.
31-
#. Concatenation is done by underscores _.
32-
33-
An example could look like this:
17+
Contribute
18+
##########
3419

35-
Mustermann, GitHub Name: maximuster
20+
.. toctree::
21+
:maxdepth: 2
3622

37-
.. code::
23+
general/index
24+
contribution_request/index
25+
documentation/index
26+
development/index
27+
ci/index
3828

39-
maximuster_my_awesome_branch_name

docs/index.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ Project structure and processes
118118
^^^
119119
Understand how we work, by reading our :ref:`Process description <process_description>`.
120120
And receive tips & tricks for our used tool stack by reading the
121-
:ref:`Guidance <process_guidance>`.
121+
:ref:`contribute`.
122122

123123
.. grid-item-card::
124124

@@ -131,11 +131,11 @@ Project structure and processes
131131
.. dropdown:: Click to see the complete sitemap
132132

133133
.. toctree::
134-
:maxdepth: 3
134+
:maxdepth: 1
135135

136136
requirements/index
137137
features/index
138-
guidance/index
138+
contribute/index
139139
Releases <score_releases/index.rst>
140140
process/index
141141
PMP <platform_management_plan/index.rst>

0 commit comments

Comments
 (0)