The big rename; pybee->beeware.

BeeWare.lektorproject

@@ -1,6 +1,6 @@
 [project]
 name = BeeWare
-url = http://pybee.org
+url = http://beeware.org
 url_style = absolute
 
 # `name` in alternatives should be in english. This is used for translations
@@ -51,8 +51,8 @@ lektor-atom = 0.2
 lektor-gravatar = 0.1.2
 
 [servers.ghpages]
-target = ghpages://pybee/pybee.github.io?cname=pybee.org
+target = ghpages://beeware/beeware.github.io?cname=beeware.org
 default = yes
 
 [servers.ghpages-https]
-target = ghpages+https://pybee/pybee.github.io?cname=pybee.org
+target = ghpages+https://beeware/beeware.github.io?cname=beeware.org

CNAME

@@ -1 +1 @@
-pybee.org
+beeware.org

CONTRIBUTING.md

@@ -4,5 +4,5 @@ BeeWare <3's contributions!
 
 Please be aware, BeeWare operates under a Code of Conduct.
 
-See [CONTRIBUTING to BeeWare](http://pybee.org/contributing)
+See [CONTRIBUTING to BeeWare](http://beeware.org/contributing)
 

README.rst

@@ -1,9 +1,9 @@
-.. image:: http://pybee.org/static/images/brutus-270.png
+.. image:: http://beeware.org/static/images/brutus-270.png
     :width: 72px
-    :target: https://pybee.org
+    :target: https://beeware.org
 
-pybee.github.io
-===============
+beeware.github.io
+=================
 
 This is the homepage for the `BeeWare project`_.
 
@@ -13,7 +13,7 @@ If you want to contribute a modification, you can fork this repository and
 submit a pull request. However, **do not fork the master branch** - fork the
 `lektor branch`_ and make changes there instead.
 
-.. _lektor branch: https://github.com/pybee/pybee.github.io/tree/lektor
+.. _lektor branch: https://github.com/beeware/beeware.github.io/tree/lektor
 
 If you want to test out a change before you submit it, download and install
 `Lektor`_ (note: currently it's better to use Lektor with Python 2.7):
@@ -38,9 +38,9 @@ You can talk to the community through:
 
 * `@pybeeware on Twitter`_
 
-* BeeWare Gitter channel: `pybee/general`_
+* BeeWare Gitter channel: `beeware/general`_
 
-* `Tickets on the pybee.github.io issue tracker`_
+* `Tickets on the beeware.github.io issue tracker`_
 
 Contributing
 ------------
@@ -53,7 +53,7 @@ to date with the original branch. To do this:
 
 - set your upstream remote::
 
-    $ git remote add upstream https://github.com/pybee/pybee.github.io.git
+    $ git remote add upstream https://github.com/beeware/beeware.github.io.git
 
 - make sure you have the latest changes from upstream::
 
@@ -65,29 +65,29 @@ to date with the original branch. To do this:
     $ git rebase upstream/lektor
 
 
-.. _BeeWare project: http://pybee.org
+.. _BeeWare project: http://beeware.org
 .. _@pybeeware on Twitter: https://twitter.com/pybeeware
-.. _pybee/general: https://gitter.im/pybee/general
-.. _Tickets on the pybee.github.io issue tracker: https://github.com/pybee/pybee.github.io/issues
-.. _log them on Github: https://github.com/pybee/pybee.github.io/issues
-.. _fork the code: https://github.com/pybee/pybee.github.io/tree/lektor
-.. _submit a pull request: https://github.com/pybee/pybee.github.io/pulls
+.. _beeware/general: https://gitter.im/beeware/general
+.. _Tickets on the beeware.github.io issue tracker: https://github.com/beeware/beeware.github.io/issues
+.. _log them on Github: https://github.com/beeware/beeware.github.io/issues
+.. _fork the code: https://github.com/beeware/beeware.github.io/tree/lektor
+.. _submit a pull request: https://github.com/beeware/beeware.github.io/pulls
 
 
 Translating
 -----------
 
 Want to make BeeWare more accessible to non-English-speakers?  Help translate the site!  Steps are as follows:
 
-1. Add language specification to `BeeWare.lektorproject <https://github.com/pybee/pybee.github.io/blob/lektor/BeeWare.lektorproject>`_.
+1. Add language specification to `BeeWare.lektorproject <https://github.com/beeware/beeware.github.io/blob/lektor/BeeWare.lektorproject>`_.
 
    Fill out the name of the language, its url prefix, and the locale. Make sure you use the correct `ISO 639-1 <https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes>`_ locale code - for many countries, it's not the same as
    the national TLD. For example, the ISO 639-1 Danish locale is 'da', but Denmark uses the '.dk' TLD.
 
-2. Add an entry for your language to the `Atom configuration <https://github.com/pybee/pybee.github.io/blob/lektor/configs/atom.ini>`_.
+2. Add an entry for your language to the `Atom configuration <https://github.com/beeware/beeware.github.io/blob/lektor/configs/atom.ini>`_.
 
-3. Add your first translation, by translating the names for the menus at the top of each page. Edit `the menus translation file <https://github.com/pybee/pybee.github.io/blob/lektor/databags/menu.ini>`_, adding a block for your language.
+3. Add your first translation, by translating the names for the menus at the top of each page. Edit `the menus translation file <https://github.com/beeware/beeware.github.io/blob/lektor/databags/menu.ini>`_, adding a block for your language.
 
 4. Start adding translations for content pages ont he site. Translated files are at the same directory level as the primary English files, but have a language suffix. For example, Arabic's locale is 'ar', so you would add `contents+ar.lr` wherever the original file name is `contents.lr`
 
-A great place to start translating is the `contributing section <pybee.github.io/content/contributing>`_.
+A great place to start translating is the `contributing section <beeware.github.io/content/contributing>`_.

assets/CONTRIBUTING.md

@@ -1,8 +1,8 @@
 # Contributing
 
-PyBee <3's contributions!
+BeeWare <3's contributions!
 
-Please be aware, PyBee operates under a Code of Conduct.
+Please be aware, BeeWare operates under a Code of Conduct.
 
-See [CONTRIBUTING to PyBee](http://pybee.org/contributing)
+See [CONTRIBUTING to BeeWare](http://beeware.org/contributing)
 

assets/README.rst

@@ -1,30 +1,35 @@
-pybee.github.io
-===============
+.. image:: http://beeware.org/static/images/brutus-270.png
+    :width: 72px
+    :target: https://beeware.org
 
-This is the homepage for the `BeeWare project`_.
+beeware.github.io
+=================
 
-**This is the autogenerated, deployed version of the site.** To make
-modifications, see the `lektor branch`_ of the codebase.
+This is the homepage for the `BeeWare project`_.
 
 It is a `Lektor`_-based site.
 
-.. _Lektor: https://getlektor.com
-
 If you want to contribute a modification, you can fork this repository and
 submit a pull request. However, **do not fork the master branch** - fork the
-`lektor branch`_ and make changes thereinstead.
+`lektor branch`_ and make changes there instead.
 
-.. _lektor branch: https://github.com/pybee/pybee.github.io/tree/lektor
+.. _lektor branch: https://github.com/beeware/beeware.github.io/tree/lektor
 
 If you want to test out a change before you submit it, download and install
-Lektor; then from the root directory of the checkout, run:
+`Lektor`_ (note: currently it's better to use Lektor with Python 2.7):
+
+    $ pip install lektor
+
+Then from the root directory of the checkout, run:
 
     $ lektor server
 
+.. _Lektor: https://getlektor.com
+
 This will `start a webserver`_ that will autoreload whenever you make a change
 to site content.
 
-.. _start a webserver: http://127.0.0.1:8000
+.. _start a webserver: http://127.0.0.1:5000
 
 Community
 ---------
@@ -33,7 +38,9 @@ You can talk to the community through:
 
 * `@pybeeware on Twitter`_
 
-* `Tickets on the pybee.github.io issue tracker`_
+* BeeWare Gitter channel: `beeware/general`_
+
+* `Tickets on the beeware.github.io issue tracker`_
 
 Contributing
 ------------
@@ -46,22 +53,41 @@ to date with the original branch. To do this:
 
 - set your upstream remote::
 
-    $ git remote add upstream https://github.com/pybee/pybee.github.io.git
+    $ git remote add upstream https://github.com/beeware/beeware.github.io.git
 
 - make sure you have the latest changes from upstream::
 
     $ git fetch upstream
 
-- rebase your **master** branch to **upstream** before pushing to git and
+- rebase your **lektor** branch to **upstream** before pushing to git and
   submitting a pull request::
 
-    $ git rebase upstream/master
+    $ git rebase upstream/lektor
 
 
-.. _BeeWare project: http://pybee.org
+.. _BeeWare project: http://beeware.org
 .. _@pybeeware on Twitter: https://twitter.com/pybeeware
-.. _Tickets on the pybee.github.io issue tracker: https://github.com/pybee/pybee.github.io/issues
-.. _log them on Github: https://github.com/pybee/pybee.github.io/issues
-.. _fork the code: https://github.com/pybee/pybee.github.io/tree/lektor
-.. _submit a pull request: https://github.com/pybee/pybee.github.io/pulls
+.. _beeware/general: https://gitter.im/beeware/general
+.. _Tickets on the beeware.github.io issue tracker: https://github.com/beeware/beeware.github.io/issues
+.. _log them on Github: https://github.com/beeware/beeware.github.io/issues
+.. _fork the code: https://github.com/beeware/beeware.github.io/tree/lektor
+.. _submit a pull request: https://github.com/beeware/beeware.github.io/pulls
+
+
+Translating
+-----------
+
+Want to make BeeWare more accessible to non-English-speakers?  Help translate the site!  Steps are as follows:
+
+1. Add language specification to `BeeWare.lektorproject <https://github.com/beeware/beeware.github.io/blob/lektor/BeeWare.lektorproject>`_.
+
+   Fill out the name of the language, its url prefix, and the locale. Make sure you use the correct `ISO 639-1 <https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes>`_ locale code - for many countries, it's not the same as
+   the national TLD. For example, the ISO 639-1 Danish locale is 'da', but Denmark uses the '.dk' TLD.
+
+2. Add an entry for your language to the `Atom configuration <https://github.com/beeware/beeware.github.io/blob/lektor/configs/atom.ini>`_.
+
+3. Add your first translation, by translating the names for the menus at the top of each page. Edit `the menus translation file <https://github.com/beeware/beeware.github.io/blob/lektor/databags/menu.ini>`_, adding a block for your language.
+
+4. Start adding translations for content pages ont he site. Translated files are at the same directory level as the primary English files, but have a language suffix. For example, Arabic's locale is 'ar', so you would add `contents+ar.lr` wherever the original file name is `contents.lr`
 
+A great place to start translating is the `contributing section <beeware.github.io/content/contributing>`_.