converted to asciidoc syntax

diff --git a/NEWS b/NEWS
index 016767e..6ee0a24 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,53 +5,74 @@ v1.0.0
 * fixed compilation issue with old json lib releases using
   boolean type and not defining json_bool.
 
-* v0.0.9
-** Fixed compilation issue related to 'boolean' type.
+<<<<<<< .mine
+v0.0.9
+------
+
+=======
+>>>>>>> .r1676
+* Fixed compilation issue related to 'boolean' type.
 
-* v0.0.8
-** set transfer encoding to gzip as recommended by LP documentation.
+v0.0.8
+------
+
+* set transfer encoding to gzip as recommended by LP documentation.
    Only supported since Curl 7.21.6
-** persistent cache for distro and arch information.
-** fixed a '"' in the html output of the package page.
-** added --get-bpph-size to specify the size of the requests to get
+* persistent cache for distro and arch information.
+* fixed a '"' in the html output of the package page.
+* added --get-bpph-size to specify the size of the requests to get
    the list of binary packages.
 
-* v0.0.7
-** More crash-resistant on network failure (patch from Peter
+v0.0.7
+------
+
+* More crash-resistant on network failure (patch from Peter
   Lekensteyn).
-** Retry HTTP request on LP Oops (patch from Peter Lekensteyn).
-** Added intl support.
-** Increased HTTP requests performance: group result for
+* Retry HTTP request on LP Oops (patch from Peter Lekensteyn).
+* Added intl support.
+* Increased HTTP requests performance: group result for
   getPublishedBinaries by 300 instead of 75 (patch from Peter
   Lekensteyn).
-** HTML template pages are now in [prefix]/share/psensor/www
+* HTML template pages are now in [prefix]/share/psensor/www
+
+v0.0.6
+------
+
+* added support of ie < 9.
+* fixed JSON not available in ie8. 
 
-* v0.0.6
-** added support of ie < 9.
-** fixed JSON not available in ie8. 
+v0.0.5
+------
 
-* v0.0.5
-** Added information about distribution in the package page.
-** Added distribution chart in the package page.
-** HTML output: data are generated in a separate JSON file.
-** HTML output: fixed pkg chart not displayed when distro with
+* Added information about distribution in the package page.
+* Added distribution chart in the package page.
+* HTML output: data are generated in a separate JSON file.
+* HTML output: fixed pkg chart not displayed when distro with
    download count of 0.
 
-* v0.0.4
-** Fixed memory issue (patch submitted by Lekensteyn).
-** Added help for -s option.
-** Don't generate manpage if help2man not present.
-** Generate html page for the PPA.
-** Renamed --output_dir option to --output-dir.
-** Added -S option (patch submitted by Lekensteyn).
+v0.0.4
+------
+
+* Fixed memory issue (patch submitted by Lekensteyn).
+* Added help for -s option.
+* Don't generate manpage if help2man not present.
+* Generate html page for the PPA.
+* Renamed --output_dir option to --output-dir.
+* Added -S option (patch submitted by Lekensteyn).
+
+v0.0.3
+------
 
-* v0.0.3
-** Generated HTML pages for package versions.
-** Added distro/arch information in package version page.
+* Generated HTML pages for package versions.
+* Added distro/arch information in package version page.
 
-* v0.0.2
-** Generated HTML pages are now using JQuery+JQPlot instead of Google Chart.
-** Added check target.
+v0.0.2
+------
+
+* Generated HTML pages are now using JQuery+JQPlot instead of Google Chart.
+* Added check target.
+
+v0.0.1
+------
 
-* v0.0.1
-** Initial release.
+* Initial release.