Skip to content

Commit 2c0d18f

Browse files
committed
update intro
Signed-off-by: maxwolfs <[email protected]>
1 parent 002ea2a commit 2c0d18f

File tree

1 file changed

+43
-9
lines changed

1 file changed

+43
-9
lines changed

docs/intro.md

Lines changed: 43 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,25 @@ The aim of this documentation is to give operators, cloud service provides and o
1616

1717
## Structure
1818

19-
In order to get all the different docs into one place and to render a comprehensive static page for best Developer Epxerience, the subprojects need to be consumed by this main docs repository. This is will be managed by git's subtree feature and not as submodule. TODO: Why?
19+
### Conceptual Structure
2020

21-
[The Power of Git Subtree by Nicola Paolucci](https://blog.developer.atlassian.com/the-power-of-git-subtree/?_ga=2-71978451-1385799339-1568044055-1068396449-1567112770)
21+
We follow the [Diataxis Framework](https://diataxis.fr/) to structure our documentation, in order respond best to our users needs.
2222

23-
```bash
24-
git subtree add --prefix {local directory being pulled into} {remote repo URL} {remote branch} --squash
25-
```
23+
### Directory Structure
2624

27-
## Implications to subtree repositories structure
25+
In order to get all the different docs into one place and to render a comprehensive static page for best Developer Epxerience, the subprojects need to be consumed by this main docs repository. This is will be managed by git's subtree feature and not as submodule.
2826

29-
As the final output in this repository will be a statically generated website, the subtree docs repositories should only contain markdown and static files for visualisation.
27+
As the final output in this repository will be a statically generated website, the subtree docs repositories should only contain markdown and static files. If a sub repository should reside within a repository which code it is documenting, it should also be imported as subtree or submodule. This is a bit more management overhead, but also enbables the freedom of choice for rendering the content in another output repository as a static page with any docs renderer. But furthermore this enables this SCS Docs repository to inherit all the different docs rendered into one page for the best user experience.
3028

31-
## Directory Structure
29+
#### SCS project repo strucutre
3230

3331
```jsx
3432
project
3533
├── static // static content
3634
├── blog // optional blog
3735
├── src // source files
3836
├── docs // the folder where all individual docs reside as subtree modules
39-
│ └── @osism/openstack-image-manager
37+
│ └── @osism/openstack-image-manager-docs
4038
│ ├── overiew.md
4139
│ ├── usage.md
4240
│ ├── requirements.md
@@ -60,3 +58,39 @@ project
6058
. .
6159
. .
6260
```
61+
62+
```jsx
63+
@osism/openstack-image-manager
64+
├── code // static content
65+
├── blog // optional blog
66+
├── src // source files
67+
├── docs // the folder where all individual docs reside as subtree modules
68+
│ └── @osism/openstack-image-manager-docs
69+
│ ├── overiew.md
70+
│ ├── usage.md
71+
│ ├── requirements.md
72+
│ ├── images
73+
│ │ ├── logo.png
74+
│ │ └── image.svg
75+
│ └── support
76+
│ ├── index.js
77+
│ └── styles.module.css
78+
```
79+
80+
### Git subtree
81+
82+
[The Power of Git Subtree by Nicola Paolucci](https://blog.developer.atlassian.com/the-power-of-git-subtree/?_ga=2-71978451-1385799339-1568044055-1068396449-1567112770)
83+
84+
[Git Subtree Basics Gist](https://gist.github.com/SKempin/b7857a6ff6bddb05717cc17a44091202)
85+
86+
In order to add a docs repository we use the following git commmand:
87+
88+
```bash
89+
git subtree add --prefix /docs/{repo name} {remote repo URL} {remote branch} --squash
90+
```
91+
92+
For updating the repo we use the following git commmand:
93+
94+
```bash
95+
git subtree pull --prefix /docs/{repo name} {remote repo URL} {remote branch} --squash
96+
```

0 commit comments

Comments
 (0)