Skip to content

Commit

Permalink
re-arrange and improve the docs
Browse files Browse the repository at this point in the history
  • Loading branch information
meejah committed Mar 22, 2016
1 parent 29372a0 commit 80b0b32
Show file tree
Hide file tree
Showing 8 changed files with 362 additions and 384 deletions.
225 changes: 0 additions & 225 deletions README.rst

This file was deleted.

1 change: 1 addition & 0 deletions README.rst
1 change: 0 additions & 1 deletion docs/README.rst

This file was deleted.

3 changes: 3 additions & 0 deletions docs/conf.py
Expand Up @@ -27,6 +27,9 @@
# If your documentation needs a minimal Sphinx version, state it here.
#needs_sphinx = '1.0'

#keep_warnings = True
pygments_style = 'monokai'

## trying to set t his somewhere...
autodoc_member_order = 'bysource'
autodoc_default_flags = ['members', 'show-inheritance', 'undoc-members']
Expand Down
2 changes: 2 additions & 0 deletions docs/examples.rst
@@ -1,3 +1,5 @@
.. _examples:

Examples
========

Expand Down
59 changes: 59 additions & 0 deletions docs/hacking.rst
@@ -0,0 +1,59 @@
.. _hacking:
.. _getting help:

Contributions
=============

You can help contribute to txtorcon by filing bugs, reporting success
stories or by adding a feature or fixing a bug. Even asking that
"silly" question helps me with documentation writing.

.. _contact info:

Contact Information
-------------------

Discussing txtorcon is welcome in the following places:

- IRC: ``#tor-dev`` on `OFTC <http://www.oftc.net/oftc/>`_ (please
prefix lines with ``meejah:`` to get my attention, and be patient
for replies).
- email: preferably on the `tor-dev
<https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev>`_
list, or see `meejah.ca <https://meejah.ca/contact>`_ for other ways
to contact me.
- bugs: use `txtorcon's issues
<https://github.com/meejah/txtorcon/issues>`_ tracker on GitHub.
- `@txtorcon <https://twitter.com/txtorcon>`_ on Twitter (announcements only)

Public Key
----------

You can download my key from a keyserver (`0xC2602803128069A7
<http://pgp.mit.edu:11371/pks/lookup?op=get&search=0xC2602803128069A7>`_)
or see :download:`meejah.asc <../meejah.asc>` in the repository. The fingerprint
is ``9D5A 2BD5 688E CB88 9DEB CD3F C260 2803 1280 69A7``.

Also available at `https://meejah.ca/meejah.asc <https://meejah.ca/meejah.asc>`_.
For convenience: ``curl https://meejah.ca/meejah.asc | gpg --import``


Pull Requests
-------------

Yes, please! If you have a new feature or a bug fix, the very best way
is to submit a pull-request on GitHub. Since we have 100% coverage,
all new lines of code should at least be covered by unit-tests. You
can also include a note about the change in ``docs/releases.rst`` if
you like (or I can make one up after the merge).

I prefer if you rebase/squash commits into logical chunks. Discussion
of any implementation details can simply occur on the pull-request
itself. Force-pushing to the same branch/PR are fine by me if you want
to re-order commits etcetera (but, it's also fine if you just want to
push new "fix issues" commits instead).

Here is a good example of discussion + more commits: `PR #150
<https://github.com/meejah/txtorcon/pull/150>`_, or just a simple
"ready-to-go" one: `PR #51
<https://github.com/meejah/txtorcon/pull/51>`_.

0 comments on commit 80b0b32

Please sign in to comment.