Commit Graph

7 Commits

Author SHA1 Message Date
Michael Haggerty
3c5ab35445
Merge pull request #175 from pabs3/makefile
Move Makefile to the talk directory
2020-10-27 14:29:52 +01:00
Paul Wise
5f84eaf168
Add a clean target to the talk Makefile
So that it is easier to force a rebuild of the talk HTML.
2020-10-26 07:02:22 +08:00
Paul Wise
5c1b6f1552
Move Makefile to the talk directory
It is no longer needed outside this directory
since it has mostly been replaced by setup.py.

Always build the talk HTML, now that the Makefile is in a subdir,
since subdir builds only happen when explicitly requested.

Update the documentation to match the new build setup.
2020-10-26 06:59:42 +08:00
Paul Wise
b70eacc3d9
Update links from http to https
Reduces the chance of network attackers modifying the HTML.

Don't modify the embedded copy of the docutils small-white theme,
since rebuilding the talk HTML will also revert the changes,
if the theme is not yet present on disk.

Suggested-by: check-all-the-things
2020-10-25 16:12:17 +08:00
Michael Haggerty
3bc89fb280 Fix the diagram for rebase-with-history.
The "branch" reference should be moved, not the "master" reference.

Reported-by: Christoffer Hammarström
2013-07-15 10:42:52 +02:00
Michael Haggerty
e7e4b9acee Add the talk that I presented at GitMerge 2013. 2013-05-11 18:01:12 +02:00
Michael Haggerty
34ad88aebf Add the files used automatically by "rst2s5 --theme=small-white".
These files are in the public domain, except for iepngfix.htc, which
is under LGPL 2.1+ (see notice in file).

This command adds the pristine versions of the files, so that the
small changes that I made in the files in the next commit will be
documented.
2013-05-11 17:57:08 +02:00