Skip to content

Commit

Permalink
Tweak RST formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
jcbrand committed Nov 19, 2012
1 parent 3932f40 commit 87a0ed1
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 13 deletions.
10 changes: 3 additions & 7 deletions README.rst
Original file line number Original file line Diff line number Diff line change
@@ -1,13 +1,11 @@
============
Introduction Introduction
============ ============


``collective.chat.xmpp`` provides instant messaging for Plone_. It uses the ``collective.chat.xmpp`` provides instant messaging for Plone_. It uses the
XMPP_ protocol and requires an XMPP server (such as ejabberd_) for the message handling. XMPP_ protocol and requires an XMPP server (such as ejabberd_) for the message handling.


--------
Features Features
-------- ========


* Manually or automically subscribe to other users. * Manually or automically subscribe to other users.
* With manual roster subscriptions, you can accept or decline contact requests. * With manual roster subscriptions, you can accept or decline contact requests.
Expand All @@ -19,9 +17,8 @@ Features
* Topics can be set for chatrooms * Topics can be set for chatrooms
* Full name and profile picture support * Full name and profile picture support


------------
Installation Installation
------------ ============


XMPP integration with Plone is provided by the `collective.xmpp.core`_ package. XMPP integration with Plone is provided by the `collective.xmpp.core`_ package.
Please refer to its README on how to set it up. Please refer to its README on how to set it up.
Expand All @@ -41,9 +38,8 @@ Your XMPP server will have to support the following extensions
* `XEP-0124`_ Bidirectional-streams Over Synchronous HTTP (BOSH) * `XEP-0124`_ Bidirectional-streams Over Synchronous HTTP (BOSH)
* `XEP-0206`_ XMPP over BOSH * `XEP-0206`_ XMPP over BOSH


-------------
Configuration Configuration
------------- =============


You'll need to have an administrator account on the Jabber server you'll be You'll need to have an administrator account on the Jabber server you'll be
using. Refer to the `collective.xmpp.core`_ README for information on how to using. Refer to the `collective.xmpp.core`_ README for information on how to
Expand Down
13 changes: 7 additions & 6 deletions docs/HISTORY.txt
Original file line number Original file line Diff line number Diff line change
@@ -1,8 +1,6 @@
=========
Changelog Changelog
========= =========


------------------
0.2a3 (unreleased) 0.2a3 (unreleased)
------------------ ------------------


Expand All @@ -13,12 +11,15 @@ Changelog
0.2a2 (2012-11-09) 0.2a2 (2012-11-09)
------------------ ------------------


- Add support for chatting with having multiple tabs open. [jcbrand] - Add support for chatting with having multiple tabs open.
- Chatboxes now show the user's profile photo and a link to their profile. [jcbrand]
- Chatboxes now show the user's profile photo and a link to their profile.
[jcbrand]
- Some CSS and JS fixes.
[jcbrand] [jcbrand]
- Some CSS and JS fixes. [jcbrand]


0.1 (2012-10-18) 0.1 (2012-10-18)
---------------- ----------------


- Initial release. (Please consider this an alpha release). [jcbrand] - Initial release. (Please consider this an alpha release).
[jcbrand]

0 comments on commit 87a0ed1

Please sign in to comment.