Merge branch 'master' into nimrod

Makefile

@@ -12,6 +12,8 @@ PAPERSIZE = A4
 
 .PHONY: all clean publish test
 
+all: resume.html resume.pdf resume.docx resume.odt
+
 resume.html: $(RESUME)
 	pandoc -s -t html5 --email-obfuscation=none $(RESUME) -o resume.html
 
@@ -24,8 +26,6 @@ resume.docx: $(RESUME)
 resume.odt: $(RESUME)
 	pandoc $(RESUME) -V papersize=$(PAPERSIZE) -o resume.odt
 
-all: resume.html resume.pdf resume.docx resume.odt
-
 clean:
 	rm -f resume.html resume.pdf resume.docx resume.odt *.log
 

README.rst

@@ -7,6 +7,9 @@ available `here <https://www.shore.co.il/blog/pages/about-me.html>`_. The
 version in the master branch is generic and without my resume, in the nimrod
 branch are my resume and specific settings.
 
+My own resume is in the :code:`nimrod` branch, the outputed files can be found
+in my `about me <https://www.shore.co.il/blog/pages/about-me.html>`_ page.
+
 Dependencies
 ------------
 
@@ -50,4 +53,4 @@ Author
 Nimrod Adar, `contact me <nimrod@shore.co.il>`_ or visit my `website
 <https://www.shore.co.il/>`_. Patches are welcome via `git send-email
 <http://git-scm.com/book/en/v2/Git-Commands-Email>`_. The repository is located
-at: https://www.shore.co.il/cgit/.
+at: https://www.shore.co.il/git/.