Merge branch 'master' into stable

cool-RR · cool-RR · commit 36012388fb8c · 2011-09-29T13:41:04.000+02:00
diff --git a/garlicsim/docs/index.txt b/garlicsim/docs/index.txt
@@ -1,7 +1,7 @@
 ..
    Copyright 2009-2011 Ram Rachum. This work is licensed under a Creative
    Commons Attribution-ShareAlike 3.0 Unported License, with attribution to
-   "Ram Rachum at cool-rr.com" including link. The license may be obtained
+   "Ram Rachum at ram.rachum.com" including link. The license may be obtained
    at http://creativecommons.org/licenses/by-sa/3.0/
 
 .. _index:
diff --git a/garlicsim/docs/intro/index.txt b/garlicsim/docs/intro/index.txt
@@ -1,7 +1,7 @@
 ..
    Copyright 2009-2011 Ram Rachum. This work is licensed under a Creative
    Commons Attribution-ShareAlike 3.0 Unported License, with attribution to
-   "Ram Rachum at cool-rr.com" including link. The license may be obtained
+   "Ram Rachum at ram.rachum.com" including link. The license may be obtained
    at http://creativecommons.org/licenses/by-sa/3.0/
 
 .. _intro-index:
diff --git a/garlicsim/docs/intro/installation/developers/index.txt b/garlicsim/docs/intro/installation/developers/index.txt
@@ -1,7 +1,7 @@
 ..
    Copyright 2009-2011 Ram Rachum. This work is licensed under a Creative
    Commons Attribution-ShareAlike 3.0 Unported License, with attribution to
-   "Ram Rachum at cool-rr.com" including link. The license may be obtained
+   "Ram Rachum at ram.rachum.com" including link. The license may be obtained
    at http://creativecommons.org/licenses/by-sa/3.0/
 
 .. _intro-installation-developers-index:
diff --git a/garlicsim/docs/intro/installation/developers/python-2.x.txt b/garlicsim/docs/intro/installation/developers/python-2.x.txt
@@ -1,7 +1,7 @@
 ..
    Copyright 2009-2011 Ram Rachum. This work is licensed under a Creative
    Commons Attribution-ShareAlike 3.0 Unported License, with attribution to
-   "Ram Rachum at cool-rr.com" including link. The license may be obtained
+   "Ram Rachum at ram.rachum.com" including link. The license may be obtained
    at http://creativecommons.org/licenses/by-sa/3.0/
 
 .. _intro-installation-developers-python-2.x:
@@ -119,4 +119,4 @@ like this::
 .. _Python for Windows Extensions: http://sourceforge.net/projects/pywin32
 .. _Psyco: http://psyco.sourceforge.net
 .. _wxPython 2.8.10.1 or above (but below 2.9): http://wxpython.org/download.php
-.. _Docutils 0.7 or above: http://pypi.python.org/pypi/docutils/
+.. _Docutils 0.7 or above: http://pypi.python.org/pypi/docutils/
diff --git a/garlicsim/docs/intro/installation/developers/python-3.x.txt b/garlicsim/docs/intro/installation/developers/python-3.x.txt
@@ -1,7 +1,7 @@
 ..
    Copyright 2009-2011 Ram Rachum. This work is licensed under a Creative
    Commons Attribution-ShareAlike 3.0 Unported License, with attribution to
-   "Ram Rachum at cool-rr.com" including link. The license may be obtained
+   "Ram Rachum at ram.rachum.com" including link. The license may be obtained
    at http://creativecommons.org/licenses/by-sa/3.0/
 
 .. _intro-installation-developers-python-3.x:
diff --git a/garlicsim/docs/intro/installation/end_users/index.txt b/garlicsim/docs/intro/installation/end_users/index.txt
@@ -1,7 +1,7 @@
 ..
    Copyright 2009-2011 Ram Rachum. This work is licensed under a Creative
    Commons Attribution-ShareAlike 3.0 Unported License, with attribution to
-   "Ram Rachum at cool-rr.com" including link. The license may be obtained
+   "Ram Rachum at ram.rachum.com" including link. The license may be obtained
    at http://creativecommons.org/licenses/by-sa/3.0/
 
 .. _intro-installation-end-users-index:
diff --git a/garlicsim/docs/intro/installation/index.txt b/garlicsim/docs/intro/installation/index.txt
@@ -1,7 +1,7 @@
 ..
    Copyright 2009-2011 Ram Rachum. This work is licensed under a Creative
    Commons Attribution-ShareAlike 3.0 Unported License, with attribution to
-   "Ram Rachum at cool-rr.com" including link. The license may be obtained
+   "Ram Rachum at ram.rachum.com" including link. The license may be obtained
    at http://creativecommons.org/licenses/by-sa/3.0/
 
 .. _intro-installation-index:
diff --git a/garlicsim/docs/intro/tutorial1.txt b/garlicsim/docs/intro/tutorial1.txt
@@ -1,7 +1,7 @@
 ..
    Copyright 2009-2011 Ram Rachum. This work is licensed under a Creative
    Commons Attribution-ShareAlike 3.0 Unported License, with attribution to
-   "Ram Rachum at cool-rr.com" including link. The license may be obtained
+   "Ram Rachum at ram.rachum.com" including link. The license may be obtained
    at http://creativecommons.org/licenses/by-sa/3.0/
 
 .. _intro-tutorial1:
diff --git a/garlicsim/docs/intro/tutorial2.txt b/garlicsim/docs/intro/tutorial2.txt
@@ -1,7 +1,7 @@
 ..
    Copyright 2009-2011 Ram Rachum. This work is licensed under a Creative
    Commons Attribution-ShareAlike 3.0 Unported License, with attribution to
-   "Ram Rachum at cool-rr.com" including link. The license may be obtained
+   "Ram Rachum at ram.rachum.com" including link. The license may be obtained
    at http://creativecommons.org/licenses/by-sa/3.0/
 
 .. _intro-tutorial2:
diff --git a/garlicsim/docs/intro/tutorial3.txt b/garlicsim/docs/intro/tutorial3.txt
@@ -1,7 +1,7 @@
 ..
    Copyright 2009-2011 Ram Rachum. This work is licensed under a Creative
    Commons Attribution-ShareAlike 3.0 Unported License, with attribution to
-   "Ram Rachum at cool-rr.com" including link. The license may be obtained
+   "Ram Rachum at ram.rachum.com" including link. The license may be obtained
    at http://creativecommons.org/licenses/by-sa/3.0/
 
 .. _intro-tutorial3:
diff --git a/garlicsim/docs/misc/faq.txt b/garlicsim/docs/misc/faq.txt
@@ -1,7 +1,7 @@
 ..
    Copyright 2009-2011 Ram Rachum. This work is licensed under a Creative
    Commons Attribution-ShareAlike 3.0 Unported License, with attribution to
-   "Ram Rachum at cool-rr.com" including link. The license may be obtained
+   "Ram Rachum at ram.rachum.com" including link. The license may be obtained
    at http://creativecommons.org/licenses/by-sa/3.0/
 
 .. _misc-faq:
diff --git a/garlicsim/docs/misc/garlicsim_wx.txt b/garlicsim/docs/misc/garlicsim_wx.txt
@@ -1,7 +1,7 @@
 ..
    Copyright 2009-2011 Ram Rachum. This work is licensed under a Creative
    Commons Attribution-ShareAlike 3.0 Unported License, with attribution to
-   "Ram Rachum at cool-rr.com" including link. The license may be obtained
+   "Ram Rachum at ram.rachum.com" including link. The license may be obtained
    at http://creativecommons.org/licenses/by-sa/3.0/
 
 .. _misc-garlicsim_wx:
diff --git a/garlicsim/docs/misc/index.txt b/garlicsim/docs/misc/index.txt
@@ -1,7 +1,7 @@
 ..
    Copyright 2009-2011 Ram Rachum. This work is licensed under a Creative
    Commons Attribution-ShareAlike 3.0 Unported License, with attribution to
-   "Ram Rachum at cool-rr.com" including link. The license may be obtained
+   "Ram Rachum at ram.rachum.com" including link. The license may be obtained
    at http://creativecommons.org/licenses/by-sa/3.0/
 
 .. _misc-index:
diff --git a/garlicsim/docs/misc/mailing-lists.txt b/garlicsim/docs/misc/mailing-lists.txt
@@ -1,7 +1,7 @@
 ..
    Copyright 2009-2011 Ram Rachum. This work is licensed under a Creative
    Commons Attribution-ShareAlike 3.0 Unported License, with attribution to
-   "Ram Rachum at cool-rr.com" including link. The license may be obtained
+   "Ram Rachum at ram.rachum.com" including link. The license may be obtained
    at http://creativecommons.org/licenses/by-sa/3.0/
 
 .. _misc-mailing-lists:
diff --git a/garlicsim/docs/ref/cruncher-api.txt b/garlicsim/docs/ref/cruncher-api.txt
@@ -1,7 +1,7 @@
 ..
    Copyright 2009-2011 Ram Rachum. This work is licensed under a Creative
    Commons Attribution-ShareAlike 3.0 Unported License, with attribution to
-   "Ram Rachum at cool-rr.com" including link. The license may be obtained
+   "Ram Rachum at ram.rachum.com" including link. The license may be obtained
    at http://creativecommons.org/licenses/by-sa/3.0/
 
 .. _ref-cruncher-api:
diff --git a/garlicsim/docs/ref/index.txt b/garlicsim/docs/ref/index.txt
@@ -1,7 +1,7 @@
 ..
    Copyright 2009-2011 Ram Rachum. This work is licensed under a Creative
    Commons Attribution-ShareAlike 3.0 Unported License, with attribution to
-   "Ram Rachum at cool-rr.com" including link. The license may be obtained
+   "Ram Rachum at ram.rachum.com" including link. The license may be obtained
    at http://creativecommons.org/licenses/by-sa/3.0/
 
 .. _ref-index:
diff --git a/garlicsim/docs/ref/simpack-api.txt b/garlicsim/docs/ref/simpack-api.txt
@@ -1,7 +1,7 @@
 ..
    Copyright 2009-2011 Ram Rachum. This work is licensed under a Creative
    Commons Attribution-ShareAlike 3.0 Unported License, with attribution to
-   "Ram Rachum at cool-rr.com" including link. The license may be obtained
+   "Ram Rachum at ram.rachum.com" including link. The license may be obtained
    at http://creativecommons.org/licenses/by-sa/3.0/
 
 .. _ref-simpack-api:
diff --git a/garlicsim/docs/theme/layout.html b/garlicsim/docs/theme/layout.html
@@ -185,7 +185,7 @@ <h3>{{ _('Quick search') }}</h3>
       {% trans path=pathto('copyright'), copyright=copyright|e %}&copy; <a href="{{ path }}">Copyright</a> {{ copyright }}.{% endtrans %}
     {%- else %}
       {% trans copyright=copyright|e %}&copy; Copyright {{ copyright }}. <br />
-      This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License, with attribution to "Ram Rachum at <a href="http://cool-rr.com">cool-rr.com</a>" including link to <a href="http://cool-rr.com">cool-rr.com</a>.<br />
+      This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License, with attribution to "Ram Rachum at <a href="http://ram.rachum.com">ram.rachum.com</a>" including link to <a href="http://ram.rachum.com">ram.rachum.com</a>.<br />
 To view a copy of this license, visit: <a href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</a><br />
       {% endtrans %}
     {%- endif %}
diff --git a/garlicsim/docs/topics/asynchronous-crunching.txt b/garlicsim/docs/topics/asynchronous-crunching.txt
@@ -1,7 +1,7 @@
 ..
    Copyright 2009-2011 Ram Rachum. This work is licensed under a Creative
    Commons Attribution-ShareAlike 3.0 Unported License, with attribution to
-   "Ram Rachum at cool-rr.com" including link. The license may be obtained
+   "Ram Rachum at ram.rachum.com" including link. The license may be obtained
    at http://creativecommons.org/licenses/by-sa/3.0/
 
 .. _topics-asynchronous-crunching:
diff --git a/garlicsim/docs/topics/history-dependent-simulations.txt b/garlicsim/docs/topics/history-dependent-simulations.txt
@@ -1,7 +1,7 @@
 ..
    Copyright 2009-2011 Ram Rachum. This work is licensed under a Creative
    Commons Attribution-ShareAlike 3.0 Unported License, with attribution to
-   "Ram Rachum at cool-rr.com" including link. The license may be obtained
+   "Ram Rachum at ram.rachum.com" including link. The license may be obtained
    at http://creativecommons.org/licenses/by-sa/3.0/
 
 .. _topics-history-dependent-simulations:
diff --git a/garlicsim/docs/topics/index.txt b/garlicsim/docs/topics/index.txt
@@ -1,7 +1,7 @@
 ..
    Copyright 2009-2011 Ram Rachum. This work is licensed under a Creative
    Commons Attribution-ShareAlike 3.0 Unported License, with attribution to
-   "Ram Rachum at cool-rr.com" including link. The license may be obtained
+   "Ram Rachum at ram.rachum.com" including link. The license may be obtained
    at http://creativecommons.org/licenses/by-sa/3.0/
 
 .. _topics-index:
diff --git a/garlicsim/docs/topics/persistent.txt b/garlicsim/docs/topics/persistent.txt
@@ -1,7 +1,7 @@
 ..
    Copyright 2009-2011 Ram Rachum. This work is licensed under a Creative
    Commons Attribution-ShareAlike 3.0 Unported License, with attribution to
-   "Ram Rachum at cool-rr.com" including link. The license may be obtained
+   "Ram Rachum at ram.rachum.com" including link. The license may be obtained
    at http://creativecommons.org/licenses/by-sa/3.0/
 
 .. _topics-persistent:
diff --git a/garlicsim/docs/topics/step-functions.txt b/garlicsim/docs/topics/step-functions.txt
@@ -1,7 +1,7 @@
 ..
    Copyright 2009-2011 Ram Rachum. This work is licensed under a Creative
    Commons Attribution-ShareAlike 3.0 Unported License, with attribution to
-   "Ram Rachum at cool-rr.com" including link. The license may be obtained
+   "Ram Rachum at ram.rachum.com" including link. The license may be obtained
    at http://creativecommons.org/licenses/by-sa/3.0/
 
 .. _topics-step-functions:
diff --git a/garlicsim/docs/topics/step-profiles.txt b/garlicsim/docs/topics/step-profiles.txt
@@ -1,7 +1,7 @@
 ..
    Copyright 2009-2011 Ram Rachum. This work is licensed under a Creative
    Commons Attribution-ShareAlike 3.0 Unported License, with attribution to
-   "Ram Rachum at cool-rr.com" including link. The license may be obtained
+   "Ram Rachum at ram.rachum.com" including link. The license may be obtained
    at http://creativecommons.org/licenses/by-sa/3.0/
 
 .. _topics-step-profiles:
diff --git a/garlicsim/docs/topics/synchronous-crunching.txt b/garlicsim/docs/topics/synchronous-crunching.txt
@@ -1,7 +1,7 @@
 ..
    Copyright 2009-2011 Ram Rachum. This work is licensed under a Creative
    Commons Attribution-ShareAlike 3.0 Unported License, with attribution to
-   "Ram Rachum at cool-rr.com" including link. The license may be obtained
+   "Ram Rachum at ram.rachum.com" including link. The license may be obtained
    at http://creativecommons.org/licenses/by-sa/3.0/
 
 .. _topics-synchronous-crunching:
diff --git a/garlicsim/docs/topics/time-tree.txt b/garlicsim/docs/topics/time-tree.txt
@@ -1,7 +1,7 @@
 ..
    Copyright 2009-2011 Ram Rachum. This work is licensed under a Creative
    Commons Attribution-ShareAlike 3.0 Unported License, with attribution to
-   "Ram Rachum at cool-rr.com" including link. The license may be obtained
+   "Ram Rachum at ram.rachum.com" including link. The license may be obtained
    at http://creativecommons.org/licenses/by-sa/3.0/
 
 .. _topics-time-tree:
diff --git a/garlicsim/docs/topics/what-is-garlicsim.txt b/garlicsim/docs/topics/what-is-garlicsim.txt
@@ -1,7 +1,7 @@
 ..
    Copyright 2009-2011 Ram Rachum. This work is licensed under a Creative
    Commons Attribution-ShareAlike 3.0 Unported License, with attribution to
-   "Ram Rachum at cool-rr.com" including link. The license may be obtained
+   "Ram Rachum at ram.rachum.com" including link. The license may be obtained
    at http://creativecommons.org/licenses/by-sa/3.0/
 
 .. _topics-what-is-garlicsim:
diff --git a/garlicsim/setup.py b/garlicsim/setup.py
@@ -97,7 +97,7 @@ def get_packages():
     tests_require=['nose>=1.0.0'],
     description='Pythonic framework for working with simulations',
     author='Ram Rachum',
-    author_email='cool-rr@cool-rr.com',
+    author_email='ram@rachum.com',
     url='http://garlicsim.org',
     packages=get_packages(),
     scripts=['garlicsim/scripts/start_simpack.py',
diff --git a/garlicsim_lib/setup.py b/garlicsim_lib/setup.py
@@ -94,7 +94,7 @@ def get_packages():
     tests_require=['nose>=1.0.0'],
     description='Collection of GarlicSim simulation packages',
     author='Ram Rachum',
-    author_email='cool-rr@cool-rr.com',
+    author_email='ram@rachum.com',
     url='http://garlicsim.org',
     packages=get_packages(),
     scripts=['test_garlicsim_lib/scripts/_test_garlicsim_lib.py'],
diff --git a/garlicsim_wx/setup.py b/garlicsim_wx/setup.py
@@ -113,7 +113,7 @@ def get_packages():
     'description': \
         'GUI for garlicsim, a Pythonic framework for computer simulations',
     'author': 'Ram Rachum',
-    'author_email': 'cool-rr@cool-rr.com',
+    'author_email': 'ram@rachum.com',
     'url': 'http://garlicsim.org',
     'packages': get_packages(),
     'scripts': ['garlicsim_wx/scripts/GarlicSim.py',
