Merge branch 'master' into 1.2.0

# Conflicts:
#	AUTHORS
#	ChangeLog

ChangeLog

@@ -2,10 +2,15 @@
 
 - TI-100  :lastquarter throws exception in first quarter
           (thanks to Andreas Poisel)
+
+------ current release ---------------------------
+
+1.1.1 (2018-02-03) ef26ebd6fec8472d4b91644806f48b546bb35747
+
 - TI-102  Exclusions stopped working
           (thanks to Christian Decker)
 
------- current release ---------------------------
+------ old release -------------------------------
 
 1.1.0 (2018-01-13) 836bc41014018ab333e6ea73412ee09d015beb4e
 
@@ -88,8 +93,6 @@
   'soq' and 'soy'. Similarly the 'eocw' etc are modified. The 'c' is now
   implicit.
 
------- old release -------------------------------
-
 1.0.0 (2016-08-17) 6428ce89fcf2a5665d9351c50c2a84c98543206c
 
 - WWW-12  yesterday tag not recognized

README.md

@@ -1,31 +1,67 @@
+# Timewarrior
+
 Thank you for taking a look at Timewarrior!
 
-Timewarrior is a time tracking utility that offers simple stopwatch features as
+Timewarrior is a time tracking utility that offers simple stopwatch features as well as sophisticated calendar-base backfill, along with flexible reporting.
-well as sophisticated calendar-base backfill, along with flexible reporting. It
+It is a portable, well supported and very active Open Source project.
-is a portable, well supported and very active Open Source project.
 
-Although Timewarrior is a new project there is extensive online documentation.
+## Installing
+
+### From Package
+
+Thanks to the community, there are binary packages available [here](https://taskwarrior.org/docs/timewarrior/download.html#Distributions).
+
+### From Tarball
+
+Building Timewarrior yourself requires
+
+* git
+* cmake
+* make
+* C++ compiler, currently gcc 4.7+ or clang 3.3+ for full C++11 support
+
+You can download the tarball with curl, as an example of just one of many ways to download the tarball.
+
+    $ curl -O https://taskwarrior.org/download/timew-1.1.1.tar.gz
+
+Expand the tarball, build Timewarrior, optionally run the test suite, and install it.
+This copies files into the right place, and installs man pages.
+
+    $ tar xzf timew-1.1.1.tar.gz
+    $ cd timew-1.1.1
+    $ cmake -DCMAKE_BUILD_TYPE=release .
+    ...
+    $ make
+    ...
+    [$ make test]
+    ...
+    $ sudo make install
+    
+## Documentation
+
+There is extensive online documentation.
 You'll find all the details at:
 
     http://taskwarrior.org/docs/timewarrior
 
 At the site you'll find online documentation, downloads, news and more.
 
-Your contributions are especially welcome. Whether it comes in the form of code
+## Contributing
-patches, ideas, discussion, bug reports, encouragement or criticism, your input
+
-is needed.
+Your contributions are especially welcome.
+Whether it comes in the form of code patches, ideas, discussion, bug reports, encouragement or criticism, your input is needed.
 
 For support options, take a look at:
 
     http://taskwarrior.org/support
 
-Please send your code patches to:
+Please use pull requests, or send your code patches to:
 
-    support@taskwarrior.org
+    support@gothenburgbitfactory.org
 
-Consider joining bug.tasktools.org and participating in the future of Timewarrior.
+Visit https://github.com/GothenburgBitFactory/timewarrior and participate in the future of Timewarrior.
 
----
+## License
 
-Timewarrior is released under the MIT license. For details check the LICENSE
+Timewarrior is released under the MIT license.
-file.
+For details check the [LICENSE](LICENSE) file.

doc/man/timew.1.in

@@ -1,4 +1,4 @@
-.TH timew 1 2018-01-13 "${PACKAGE_STRING}" "User Manuals"
+.TH timew 1 2018-02-03 "${PACKAGE_STRING}" "User Manuals"
 
 .SH NAME
 timew \- A command line time tracker.