Skip to content

Commit 72f99cf

Browse files
author
pnathan
committed
Merge branch 'master' into devel
2 parents af5baff + 570cff5 commit 72f99cf

File tree

1 file changed

+17
-2
lines changed

1 file changed

+17
-2
lines changed

README.org

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,21 @@ P.S.: feel free to contact me for anything you like.
3030

3131
** Notes regarding build process.
3232

33-
Various site building tools are out there; I wanted one that was, above all, simple. Initially Jekyll was chosen, but Ruby proved contentious, and frankly, I wanted to ship the site. Pandoc was really easy to use and install on my OSX boxes. With a bit of hackery on the templates, I could generate a very nice page. With a bit more hackery, `make.lisp` got created, which included snippets automatically, as well as have a simplistic 1-level hierarchical menu for sections of the site based on filename. I use SBCL as the Lisp system for make.lisp.
33+
Various site building tools are out there; I wanted one that was, above all, simple. Initially Jekyll was chosen,
34+
but Ruby proved contentious, and frankly, I wanted to ship the site. Pandoc was really easy to use and install on my
35+
OSX boxes. With a bit of hackery on the templates, I could generate a very nice page. With a bit more hackery,
36+
`make.lisp` got created, which included snippets automatically, as well as have a simplistic 1-level hierarchical
37+
menu for sections of the site based on filename. I use SBCL as the Lisp system for make.lisp.
3438

35-
On the build side, the `master` branch is polled routinely by a Jenkins instance at home, which builds the site into the "site" folder and then uploads it to the [http://articulate-lisp.com](http://articulate-lisp.com) host.
39+
You can see this in action in the makefile for the system.
40+
41+
On the build side, the `master` branch is polled routinely by a Jenkins instance at home, which builds the site into
42+
the "site" folder and then uploads it to the http://articulate-lisp.com host.
43+
44+
** Contributions.
45+
46+
Please pull off the top of the `devel` branch for your contributions and use github Pull Requests for contributing.
47+
48+
My home Jenkins instance deploys that branch out to articulate-lisp.com/devel. This allows me to merge your PR and
49+
see the result quickly without being at a development machine: e.g., I can use my mobile phone to merge your work and
50+
keep the awesome flowing as fast as possible.

0 commit comments

Comments
 (0)