Merge branch 'master' into site-improvements
This commit is contained in:
Jeferson Siqueira
GitHub
commit
a3ab57a5a4
11
Makefile
11
Makefile
|
|
@ -8,6 +8,7 @@ output:
|
|||
ikiwiki $(CURDIR) html -v --wikiname about --plugin=goodstuff \
|
||||
--templatedir=templates \
|
||||
--exclude=html --exclude=Makefile --exclude=README.md
|
||||
echo awesomewm.org > html/CNAME
|
||||
|
||||
ldoc:
|
||||
rm -f src/build
|
||||
|
|
@ -21,8 +22,8 @@ changelogs:
|
|||
git --git-dir=src/.git tag | grep -v rc | sort -n | \
|
||||
(while read v; do \
|
||||
test -z "$$pv" && pv="`git --git-dir=src/.git rev-list HEAD | tail -n1`" ; \
|
||||
git --git-dir=src/.git shortlog --no-merges $$pv..$$v > html/changelogs/short/$$v ; \
|
||||
git --git-dir=src/.git log --no-merges $$pv..$$v > html/changelogs/$$v ; \
|
||||
git --git-dir=src/.git shortlog --no-merges $$pv..$$v > html/changelogs/short/$$v.txt ; \
|
||||
git --git-dir=src/.git log --no-merges $$pv..$$v > html/changelogs/$$v.txt ; \
|
||||
pv=$$v; done)
|
||||
|
||||
manpages:
|
||||
|
|
@ -32,11 +33,11 @@ manpages:
|
|||
done
|
||||
|
||||
build_for_travis: all
|
||||
rsync -PaOvz --chmod=u=rwX,g=rwX,o=rX,Dg+s --exclude src html/ \
|
||||
rsync -PaOvz --delete --exclude=.git --chmod=u=rwX,g=rwX,o=rX,Dg+s --exclude src html/ \
|
||||
$${BUILD_WEB}
|
||||
rsync -PaOvz --chmod=u=rwX,g=rwX,o=rX,Dg+s --delete src/build/doc/ \
|
||||
rsync -PaOvz --delete --chmod=u=rwX,g=rwX,o=rX,Dg+s src/build/doc/ \
|
||||
$${BUILD_WEB}/doc/api
|
||||
rsync -PaOvz --chmod=u=rwX,g=rwX,o=rX,Dg+s /usr/share/asciidoc/icons \
|
||||
rsync -PaOvz --delete --chmod=u=rwX,g=rwX,o=rX,Dg+s /usr/share/asciidoc/icons \
|
||||
$${BUILD_WEB}/doc/manpages/icons
|
||||
|
||||
.PHONY: changelogs manpages
|
||||
|
|
|
|||
23
README.md
23
README.md
|
|
@ -5,9 +5,24 @@
|
|||
This is the main source of the
|
||||
[website for the awesome window manager](https://awesomewm.org/).
|
||||
|
||||
The website is based on [ikiwiki](https://ikiwiki.info/). You can build the web
|
||||
page locally by running `make`. The result will be in `html/`. Besides ikiwiki,
|
||||
you will also need [PerlMagick](https://www.imagemagick.org/script/perl-magick.php).
|
||||
## Requirements
|
||||
|
||||
- [ikiwiki](https://ikiwiki.info/)
|
||||
- [PerlMagick](https://www.imagemagick.org/script/perl-magick.php) (optional,
|
||||
for images)
|
||||
|
||||
## Hacking
|
||||
|
||||
You can build the web page locally by running `make`, which will generate the
|
||||
output in `html/`.
|
||||
|
||||
To view it, open `html/index.html` in your web browser.
|
||||
|
||||
You can simulate running a web server using Python, which will automatically
|
||||
open `index.html` when following a link to a directory:
|
||||
|
||||
$ cd html
|
||||
$ python3 -m http.server -b localhost 8000 &
|
||||
|
||||
## Contribution Guide
|
||||
|
||||
|
|
@ -27,7 +42,7 @@ through [Github's Organization Pages](https://github.com/awesomeWM/awesomeWM.git
|
|||
## Other resources
|
||||
|
||||
The API documentation for the master branch at
|
||||
[/apidoc](https://awesomewm.org/apidoc/) is served through [Github's Project
|
||||
[/apidoc](https://awesomewm.org/apidoc/) is viewable at [Github's Project
|
||||
Pages for the apidoc repo](https://github.com/awesomeWM/apidoc), where it gets
|
||||
pushed to from successful builds in [the awesome main
|
||||
repo](https://github.com/awesomeWM/awesome/).
|
||||
|
|
|
|||
|
|
@ -3,21 +3,30 @@
|
|||
**awesome** has an active and growing community.
|
||||
|
||||
# IRC
|
||||
You can join us on channel `#awesome` on the [`OFTC`](http://www.oftc.net) IRC network.
|
||||
You can join us in the `#awesome` channel on the [`OFTC`](http://www.oftc.net) IRC network.
|
||||
|
||||
[IRC Webchat](https://webchat.oftc.net/?channels=awesome)
|
||||
|
||||
# Stack Overflow
|
||||
|
||||
You can ask questions [on Stack Overflow](http://stackoverflow.com/questions/tagged/awesome-wm)
|
||||
You can ask questions on
|
||||
[Stack Overflow](http://stackoverflow.com/questions/tagged/awesome-wm).
|
||||
|
||||
# Reddit
|
||||
|
||||
We also have a [subreddit](https://www.reddit.com/r/awesomewm/) where you can share your work
|
||||
and ask questions.
|
||||
We also have a [awesome subreddit](https://www.reddit.com/r/awesomewm/) where
|
||||
you can share your work and ask questions.
|
||||
|
||||
# GitHub
|
||||
|
||||
Awesome is [developed on GitHub](https://github.com/awesomeWM/awesome/). You can follow (watch)
|
||||
us there, contribute to our decision making and help triage issues.
|
||||
Awesome is [developed on GitHub](https://github.com/awesomeWM/awesome/).
|
||||
You can follow (watch) us there, contribute to our decision making and help
|
||||
triage issues. Also pull requests and issues are welcome there.
|
||||
|
||||
This web page also is [on GitHub](https://github.com/awesomeWM/awesome-www) and
|
||||
can be changed via pull requests. To locally test your changes, the web page can
|
||||
be build with `make`. For this, you need to have
|
||||
[ikiwiki](https://ikiwiki.info/) installed.
|
||||
|
||||
# Old mailing list (now closed)
|
||||
|
||||
|
|
@ -26,5 +35,10 @@ us there, contribute to our decision making and help triage issues.
|
|||
* [Gmane developers list archive](http://dir.gmane.org/gmane.comp.window-managers.awesome.devel)
|
||||
* [The Mail Archive developers list](http://www.mail-archive.com/awesome-devel@naquadah.org/)
|
||||
|
||||
# Old wiki
|
||||
|
||||
The old wiki has been shut down, but can be still viewed at
|
||||
[archive.org](https://web.archive.org/web/20160701200046/https://awesome.naquadah.org/wiki/Main_Page).
|
||||
|
||||
# Authors
|
||||
[See our GitHub page](https://github.com/awesomeWM/awesome/graphs/contributors)
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
Latest stable version of **awesome** is version 4.0 (*Harder, Better, Faster,
|
||||
Stronger*) released on 25 December 2016.
|
||||
|
||||
* [v4.0 changelog](../changelogs/v4.0) ([short](../changelogs/short/v4.0))
|
||||
* [v4.0 changelog](../changelogs/v4.0.txt) ([short](../changelogs/short/v4.0.txt))
|
||||
* [awesome-4.0.tar.bz2](https://github.com/awesomeWM/awesome-releases/raw/master/awesome-4.0.tar.bz2) ([GPG sig](https://github.com/awesomeWM/awesome-releases/raw/master/awesome-4.0.tar.bz2.asc))
|
||||
* [awesome-4.0.tar.xz](https://github.com/awesomeWM/awesome-releases/raw/master/awesome-4.0.tar.xz) ([GPG sig](https://github.com/awesomeWM/awesome-releases/raw/master/awesome-4.0.tar.xz.asc))
|
||||
|
||||
|
|
@ -16,7 +16,7 @@ This branch of **awesome** is deprecated.
|
|||
Latest old stable version of **awesome** is version 3.5.9 (*Mighty Ravendark*)
|
||||
released on 6 March 2016.
|
||||
|
||||
* [v3.5.9 changelog](../changelogs/v3.5.9) ([short](../changelogs/short/v3.5.9))
|
||||
* [v3.5.9 changelog](../changelogs/v3.5.9.txt) ([short](../changelogs/short/v3.5.9.txt))
|
||||
* [awesome-3.5.9.tar.bz2](https://github.com/awesomeWM/awesome-releases/raw/master/awesome-3.5.9.tar.bz2)
|
||||
* [awesome-3.5.9.tar.xz](https://github.com/awesomeWM/awesome-releases/raw/master/awesome-3.5.9.tar.xz)
|
||||
|
||||
|
|
|
|||
|
|
@ -67,10 +67,6 @@
|
|||
<div id="content">
|
||||
<!-- <h1><TMPL_VAR TITLE></h1> -->
|
||||
<div id="left">
|
||||
<div class="flattr">
|
||||
<a class="FlattrButton" style="display:none;"
|
||||
href="https://awesomewm.org"></a>
|
||||
</div>
|
||||
<TMPL_VAR CONTENT>
|
||||
</div>
|
||||
<!--
|
||||
|
|
@ -105,27 +101,20 @@
|
|||
|
||||
<script type='text/javascript' src='https://www.openhub.net/p/awesome/widgets/project_factoids_stats?format=js'></script>
|
||||
|
||||
<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
|
||||
<input type="hidden" name="cmd" value="_donations">
|
||||
<input type="hidden" name="business" value="julien@danjou.info">
|
||||
<input type="hidden" name="item_name" value="awesome window manager">
|
||||
<input type="hidden" name="no_shipping" value="0">
|
||||
<input type="hidden" name="no_note" value="1">
|
||||
<input type="hidden" name="currency_code" value="EUR">
|
||||
<input type="hidden" name="tax" value="0">
|
||||
<input type="hidden" name="lc" value="FR">
|
||||
<input type="hidden" name="bn" value="PP-DonationsBF">
|
||||
<input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donate_SM.gif" border="0" name="submit" alt="PayPal - la solution de paiement en ligne la plus simple et la plus sécurisée !">
|
||||
<img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1">
|
||||
</form>
|
||||
<a class="FlattrButton" style="display:none;" rev="flattr;button:compact;"
|
||||
href="https//awesomewm.org"></a>
|
||||
<div id="donate">
|
||||
<strong>Donations:</strong>
|
||||
<div>
|
||||
<script id='fbirvwx'>(function(i){var f,s=document.getElementById(i);f=document.createElement('iframe');f.src='https://button.flattr.com/view/?fid=mqwonm&button=compact&url=https%3A%2F%2Fawesomewm.org%2F';f.title='Flattr';f.height=20;f.width=110;f.style.borderWidth=0;s.parentNode.insertBefore(f,s);})('fbirvwx');</script>
|
||||
</div>
|
||||
<p>Bitcoin: 1A2LsrF81rWEEJ7qnXdkCUJpdCYUxqfQoP</p>
|
||||
</div>
|
||||
|
||||
<div class="copyright">
|
||||
<a name="pagecopyright"></a>
|
||||
<TMPL_IF COPYRIGHT>
|
||||
<TMPL_VAR COPYRIGHT>
|
||||
</TMPL_IF>
|
||||
Copyleft 2007-2015, awesome project
|
||||
Copyleft 2007-2017, awesome project
|
||||
</div>
|
||||
<TMPL_IF LICENSE>
|
||||
<div class="license">
|
||||
|
|
|
|||
Loading…
Reference in New Issue