Merge pull request 'Minor improvements before content' (#2) from prx/openbsd-webzine:main into main

Reviewed-on: #2
This commit is contained in:
solene 2021-09-28 19:31:44 +00:00
commit bed33f7af0
5 changed files with 60 additions and 8 deletions

View File

@ -27,7 +27,7 @@ Anyone can contribute by doing this:
There are many methods for contributing, here is the list by order of preference (more easier to handle):
1. make an account on tildegit, fork the project, create a new branch with changes and send us Merge Requests (it's easy once you get how this work).
1. make an account on tildegit, fork the project, create a new branch with changes and send us Merge Requests (it's easy once you get how this work. See "Git usage below").
2. make a local commit from a freshly updated cloned repository and use `git format-patch` to send an email to a contributor (currently solene) so your commit can be merged into the repository easily.
3. send a simple diff to a contributor.
4. open an issue.
@ -47,3 +47,32 @@ For each issue we will try to write about these topics:
- one piece of artwork
- a few interesting links to social medias
## Git usage
Fork this project and clone your own fork.
Then add the upstream repo.
```
$ git clone git@tildegit.org:foo/openbsd-webzine.git
$ cd openbsd-webzine
$ git remote add upstream https://tildegit.org/solene/openbsd-webzine.git
```
Keep your fork sync with upstream.
```
$ git pull upstream main
```
You can now edit files.
At last, add modified files and commit :
```
$ git add issue-*/
$ git commit -m "message"
$ git push
```
You can now ask for a merge request :
Menu > Projects > Merge request tab > New request button

View File

@ -6,9 +6,9 @@ clean:
rm ../dev/*html
test:
./make_issue.sh current ~/Downloads/current-issue.html
xdg-open ~/Downloads/current-issue.html
./make_issue.sh current /tmp/current-issue.html
xdg-open /tmp/current-issue.html
testsite:
cp -fr ../public ~/Downloads/
xdg-open ~/Downloads/public/index.html
cp -fr ../public /tmp/
xdg-open /tmp/public/index.html

View File

@ -0,0 +1,9 @@
<div class="puffies">🐡🐡🐡</div>
<!-- SECTION -->
<!--
<h2>Quote</h2>
<blockquote>
glub.
-- Puffy
</blockquote>
-->

View File

@ -1,6 +1,7 @@
<!-- SECTION -->
<!--div class="puffies">🐡🐡🐡</div>
<div class="puffies">🐡🐡🐡</div>
<h2>Going further</h2>
<ul>
<li><a href=""></a></li>
</ul-->
<li><a href="https://n.0x0.st/openbsdnow">OpenBSD Now! Unofficial OpenBSD news, updates and thoughts</a></li>
<li><a href="https://github.com/ligurio/awesome-openbsd">A curated list of awesome OpenBSD resources</a></li>
</ul>

View File

@ -0,0 +1,13 @@
<div class="puffies">🐡🐡🐡</div>
<!-- SECTION -->
<h2>Quote</h2>
<blockquote>
<ul>
<li>if you want something conceptualy less broken, give plan9 a try</li>
<li>if you want something more polished, give vim+coreutils a try </li>
<li>if you want something convivialist, obenbsd is the best trade off i seen (you can also give try to sbase or 9base)</li>
<li>if you want something more consistent, let's start our project :)</li>
<li>if you want something perfect, let it go :)</li>
</ul>
-- Marc Chantreux on misc@
</blockquote>