Merge remote-tracking branch 'origin/master' into development

cool-RR · cool-RR · commit 1a6a01c6a7fc · 2012-06-22T23:14:24.000+03:00
diff --git a/README.markdown b/README.markdown
@@ -28,6 +28,23 @@ CI server: https://jenkins.shiningpanda.com/python-toolbox/job/python_toolbox/
 Please keep in mind that Python Toolbox is still in alpha stage, and that backward compatibility would *not* be maintained in this phase. 
 
 
+# Roadmap #
+
+## Present ##
+
+Python Toolbox is at version 0.1, which is an alpha release. It's being used in production every day, but backward compatibility isn't guaranteed yet.
+
+## Next tasks ##
+
+Making Python Toolbox support Python 3.x, and the packaging arrangements necessary.
+
+Adding more useful tools.
+
+## Future ##
+
+Make a 1.0 release and start maintaining backward compatibility.
+
+
 # Mailing lists #
 
 All general discussion happens at **[the Python Toolbox Google Group](https://groups.google.com/forum/#!forum/python-toolbox)**. If you need help with the Python Toolbox, you're welcome to post your question and we'll try to help you.
diff --git a/docs/topics/cute-profile.txt b/docs/topics/cute-profile.txt
@@ -120,4 +120,4 @@ numbers.
   should be sorted.
 
 
-.. _perfect numbers: http://en.wikipedia.org/wiki/Perfect_number
+.. _perfect numbers: http://en.wikipedia.org/wiki/Perfect_number
diff --git a/setup.py b/setup.py
@@ -93,6 +93,26 @@ def get_packages():
 GitHub: https://github.com/cool-RR/python_toolbox
 
 CI server: https://jenkins.shiningpanda.com/python-toolbox/job/python_toolbox/
+
+Roadmap
+=======
+
+Present
+-------
+
+Python Toolbox is at version 0.1, which is an alpha release. It's being used in production every day, but backward compatibility isn't guaranteed yet.
+
+Next tasks
+----------
+
+Making Python Toolbox support Python 3.x, and the packaging arrangements necessary.
+
+Adding more useful tools.
+
+Future
+------
+
+Make a 1.0 release and start maintaining backward compatibility.
 '''
 
 my_classifiers = [

Original file line number	Diff line number	Diff line change
`@@ -120,4 +120,4 @@ numbers.`
`120`	`120`	`should be sorted.`
`121`	`121`
`122`	`122`
`123`		`-.. _perfect numbers: http://en.wikipedia.org/wiki/Perfect_number`
	`123`	`+.. _perfect numbers: http://en.wikipedia.org/wiki/Perfect_number`