Merge branch 'release/0.2.4'

* release/0.2.4:
  DOC: README.rst: Bookmarks Bar Folders table (Riv.vim)
  RLS: version=0.2.4, keywords
  DOC: pip install -e git+, Bookmarks Bar Folders RST Table (Riv.vim)

Author: westurner

HISTORY.rst

@@ -3,21 +3,25 @@
 History
 -------
 
+0.2.4 (2014-12-13
+------------------
+
+* DOC: README.rst, setup.py: fix pip install editable command, keywords
+
 0.2.3 (2014-12-13)
 -------------------
+
 * DOC: README.rst: link to PyPI package
 
 0.2.2 (2014-12-13)
 -------------------
 
-* BLD: Update MANIFEST.in (``exclude tests/data *.bkp``)
-
+* BLD: MANIFEST.in: ``exclude tests/data *.bkp``
 
 0.2.1 (2014-12-13)
 -------------------
 
-* DOC: Update description and trove classifiers
-
+* DOC: README.rst, setup.py: Update description and trove classifiers
 
 0.2.0 (2014-12-13)
 ---------------------

README.rst

@@ -25,17 +25,26 @@ Features
 
 * List Chrome and Chromium Bookmarks JSON files (``-l`` / ``-L``)
 * Print all bookmarks (``--print-all``)
-* Reorganize all bookmarks into the Bookmarks Bar
+* Reorganize all bookmarks into the Bookmarks Bar (``--overwrite``)
 
 
-* Default folders:
+Bookmarks Bar Folders
+~~~~~~~~~~~~~~~~~~~~~~~
+
++------------------+-------------------------------------------------------------+
+|   Name           | Description                                                 |
++------------------+-------------------------------------------------------------+
+| yearly           | date-based folders: ``YYYY`` > ``YYYY-MM`` > ``YYYY-MM-DD`` |
++------------------+-------------------------------------------------------------+
+| ``bookmarklets`` | bookmarklets (additions will be merged with a default set)  |
++------------------+-------------------------------------------------------------+
+| ``chrome``       | select ``chrome://`` URLs                                   |
++------------------+-------------------------------------------------------------+
+| ``quicklinks``   | custom quicklinks (optional; copied as-is)                  |
++------------------+-------------------------------------------------------------+
+| ``queue``        | default folder for new bookmarks                            |
++------------------+-------------------------------------------------------------+
 
-  * ``2014`` -- year, year-month, year-month-day folders
-  * ``bookmarklets`` -- bookmarklets (additions will be merged with a default
-    set)
-  * ``chrome`` -- select ``chrome://`` URLs
-  * ``quicklinks`` -- custom quicklinks (optional; will not be modified)
-  * ``queue`` -- default folder for new bookmarks
 
 Installation
 --------------
@@ -49,7 +58,7 @@ Development:
 
 .. code:: bash
 
-   pip install -e https://github.com/westurner/promiumbookmarks#egg=promiumbookmarks
+   pip install -e git+ssh://git@github.com/westurner/promiumbookmarks#egg=promiumbookmarks
 
 
 Usage

setup.py

@@ -19,7 +19,7 @@
 
 setup(
     name='promiumbookmarks',
-    version='0.2.3',
+    version='0.2.4',
     description=(
         'promiumbookmarks works with Chrome and Chromium bookmarks JSON.'),
     long_description=readme + '\n\n' + history,
@@ -35,7 +35,7 @@
     install_requires=requirements,
     license="BSD",
     zip_safe=False,
-    keywords='promiumbookmarks',
+    keywords='promiumbookmarks chrome chromium bookmarks',
     classifiers=[
         "Programming Language :: Python :: 2",
         'Development Status :: 4 - Beta',