Commit a9da15bb authored by JC Brand's avatar JC Brand

New BOSH service address

Conflicts:
	docs/doctrees/index.doctree
	docs/html/_sources/index.txt
	docs/html/index.html
	docs/html/searchindex.js
parent 01d8047f
...@@ -43,7 +43,7 @@ bottom of your page (after the closing *</body>* element). ...@@ -43,7 +43,7 @@ bottom of your page (after the closing *</body>* element).
converse.initialize({ converse.initialize({
auto_list_rooms: false, auto_list_rooms: false,
auto_subscribe: false, auto_subscribe: false,
bosh_service_url: 'https://bind.opkode.im', // Please use this connection manager only for testing purposes bosh_service_url: 'https://bind.conversejs.org', // Please use this connection manager only for testing purposes
hide_muc_server: false, hide_muc_server: false,
i18n: locales.en, // Refer to ./locale/locales.js to see which locales are supported i18n: locales.en, // Refer to ./locale/locales.js to see which locales are supported
prebind: false, prebind: false,
...@@ -138,7 +138,7 @@ This is the job of a connection manager. A connection manager can be either a ...@@ -138,7 +138,7 @@ This is the job of a connection manager. A connection manager can be either a
standalone application or part of an XMPP server. `ejabberd`_ for example, standalone application or part of an XMPP server. `ejabberd`_ for example,
includes a connection manager (but you have to enable it). includes a connection manager (but you have to enable it).
The demo on the `Converse.js homepage`_ uses a a connection manager located at https://bind.opkode.im. The demo on the `Converse.js homepage`_ uses a a connection manager located at https://bind.conversejs.org.
This connection manager is for testing purposes only, please don't use it in This connection manager is for testing purposes only, please don't use it in
production. production.
...@@ -318,7 +318,7 @@ Converse.js/Strophe.js and Facebook's XMPP server. That is because Facebook's ...@@ -318,7 +318,7 @@ Converse.js/Strophe.js and Facebook's XMPP server. That is because Facebook's
XMPP server doesn't support BOSH natively. XMPP server doesn't support BOSH natively.
The BOSH connection manager that I make available for The BOSH connection manager that I make available for
testing purposes (at https://bind.opkode.im) uses `Punjab <https://github.com/twonds/punjab>`_, testing purposes (at https://bind.conversejs.org) uses `Punjab <https://github.com/twonds/punjab>`_,
although there are quite a few other options available as well. although there are quite a few other options available as well.
When you configure Converse.js, via its ``initialize`` method, you must specify the When you configure Converse.js, via its ``initialize`` method, you must specify the
...@@ -401,7 +401,9 @@ which depend on Node.js and npm (the Node package manager). ...@@ -401,7 +401,9 @@ which depend on Node.js and npm (the Node package manager).
If you don't have Node.js installed, you can download and install the latest If you don't have Node.js installed, you can download and install the latest
version `here <https://nodejs.org/download>`_. version `here <https://nodejs.org/download>`_.
Once you have Node.js installed, run the following command inside the Converse.js Also make sure you have ``git`` installed. `Details <http://git-scm.com/book/en/Getting-Started-Installing-Git>`_.
Once you have *Node.js* and *git* installed, run the following command inside the Converse.js
directory: directory:
:: ::
...@@ -414,7 +416,7 @@ and then use Bower to install all of Converse.js's front-end dependencies. ...@@ -414,7 +416,7 @@ and then use Bower to install all of Converse.js's front-end dependencies.
The front-end dependencies are those javascript files on which The front-end dependencies are those javascript files on which
Converse.js directly depends and which will therefore be loaded in the browser. Converse.js directly depends and which will therefore be loaded in the browser.
If you are curious to know what these different dependencies are: If you are curious to know what the different dependencies are:
* Development dependencies: * Development dependencies:
Take a look at whats under the *devDependencies* key in Take a look at whats under the *devDependencies* key in
...@@ -424,7 +426,6 @@ If you are curious to know what these different dependencies are: ...@@ -424,7 +426,6 @@ If you are curious to know what these different dependencies are:
See *dependencies* in See *dependencies* in
`bower.json <https://github.com/jcbrand/converse.js/blob/master/bower.json>`_. `bower.json <https://github.com/jcbrand/converse.js/blob/master/bower.json>`_.
.. Note: .. Note:
After running ```make dev```, you should now have a new directory *components*, After running ```make dev```, you should now have a new directory *components*,
which contains all the front-end dependencies of Converse.js. which contains all the front-end dependencies of Converse.js.
......
...@@ -169,7 +169,7 @@ bottom of your page (after the closing <em>&lt;/body&gt;</em> element).</p> ...@@ -169,7 +169,7 @@ bottom of your page (after the closing <em>&lt;/body&gt;</em> element).</p>
converse.initialize({ converse.initialize({
auto_list_rooms: false, auto_list_rooms: false,
auto_subscribe: false, auto_subscribe: false,
bosh_service_url: 'https://bind.opkode.im', // Please use this connection manager only for testing purposes bosh_service_url: 'https://bind.conversejs.org', // Please use this connection manager only for testing purposes
hide_muc_server: false, hide_muc_server: false,
i18n: locales.en, // Refer to ./locale/locales.js to see which locales are supported i18n: locales.en, // Refer to ./locale/locales.js to see which locales are supported
prebind: false, prebind: false,
...@@ -236,7 +236,7 @@ protocols.</p> ...@@ -236,7 +236,7 @@ protocols.</p>
<p>This is the job of a connection manager. A connection manager can be either a <p>This is the job of a connection manager. A connection manager can be either a
standalone application or part of an XMPP server. <a class="reference external" href="http://www.ejabberd.im">ejabberd</a> for example, standalone application or part of an XMPP server. <a class="reference external" href="http://www.ejabberd.im">ejabberd</a> for example,
includes a connection manager (but you have to enable it).</p> includes a connection manager (but you have to enable it).</p>
<p>The demo on the <a class="reference external" href="http://conversejs.org">Converse.js homepage</a> uses a a connection manager located at <a class="reference external" href="https://bind.opkode.im">https://bind.opkode.im</a>. <p>The demo on the <a class="reference external" href="http://conversejs.org">Converse.js homepage</a> uses a a connection manager located at <a class="reference external" href="https://bind.conversejs.org">https://bind.conversejs.org</a>.
This connection manager is for testing purposes only, please don&#8217;t use it in This connection manager is for testing purposes only, please don&#8217;t use it in
production.</p> production.</p>
<div class="section" id="overcoming-cross-domain-request-restrictions"> <div class="section" id="overcoming-cross-domain-request-restrictions">
...@@ -390,7 +390,7 @@ can be extended via <a class="reference external" href="http://github.com/stroph ...@@ -390,7 +390,7 @@ can be extended via <a class="reference external" href="http://github.com/stroph
Converse.js/Strophe.js and Facebook&#8217;s XMPP server. That is because Facebook&#8217;s Converse.js/Strophe.js and Facebook&#8217;s XMPP server. That is because Facebook&#8217;s
XMPP server doesn&#8217;t support BOSH natively.</p> XMPP server doesn&#8217;t support BOSH natively.</p>
<p>The BOSH connection manager that I make available for <p>The BOSH connection manager that I make available for
testing purposes (at <a class="reference external" href="https://bind.opkode.im">https://bind.opkode.im</a>) uses <a class="reference external" href="https://github.com/twonds/punjab">Punjab</a>, testing purposes (at <a class="reference external" href="https://bind.conversejs.org">https://bind.conversejs.org</a>) uses <a class="reference external" href="https://github.com/twonds/punjab">Punjab</a>,
although there are quite a few other options available as well.</p> although there are quite a few other options available as well.</p>
<p>When you configure Converse.js, via its <tt class="docutils literal"><span class="pre">initialize</span></tt> method, you must specify the <p>When you configure Converse.js, via its <tt class="docutils literal"><span class="pre">initialize</span></tt> method, you must specify the
<a class="reference internal" href="#bosh-service-url">bosh_service_url</a> value, which is to be your BOSH connection manager.</p> <a class="reference internal" href="#bosh-service-url">bosh_service_url</a> value, which is to be your BOSH connection manager.</p>
...@@ -452,7 +452,8 @@ follow the instructions below to create this folder and fetch Converse&#8217;s ...@@ -452,7 +452,8 @@ follow the instructions below to create this folder and fetch Converse&#8217;s
which depend on Node.js and npm (the Node package manager).</p> which depend on Node.js and npm (the Node package manager).</p>
<p>If you don&#8217;t have Node.js installed, you can download and install the latest <p>If you don&#8217;t have Node.js installed, you can download and install the latest
version <a class="reference external" href="https://nodejs.org/download">here</a>.</p> version <a class="reference external" href="https://nodejs.org/download">here</a>.</p>
<p>Once you have Node.js installed, run the following command inside the Converse.js <p>Also make sure you have <tt class="docutils literal"><span class="pre">git</span></tt> installed. <a class="reference external" href="http://git-scm.com/book/en/Getting-Started-Installing-Git">Details</a>.</p>
<p>Once you have <em>Node.js</em> and <em>git</em> installed, run the following command inside the Converse.js
directory:</p> directory:</p>
<div class="highlight-python"><pre>make dev</pre> <div class="highlight-python"><pre>make dev</pre>
</div> </div>
...@@ -460,7 +461,7 @@ directory:</p> ...@@ -460,7 +461,7 @@ directory:</p>
and then use Bower to install all of Converse.js&#8217;s front-end dependencies.</p> and then use Bower to install all of Converse.js&#8217;s front-end dependencies.</p>
<p>The front-end dependencies are those javascript files on which <p>The front-end dependencies are those javascript files on which
Converse.js directly depends and which will therefore be loaded in the browser.</p> Converse.js directly depends and which will therefore be loaded in the browser.</p>
<p>If you are curious to know what these different dependencies are:</p> <p>If you are curious to know what the different dependencies are:</p>
<ul> <ul>
<li><dl class="first docutils"> <li><dl class="first docutils">
<dt>Development dependencies:</dt> <dt>Development dependencies:</dt>
......
This diff is collapsed.
...@@ -43,7 +43,7 @@ bottom of your page (after the closing *</body>* element). ...@@ -43,7 +43,7 @@ bottom of your page (after the closing *</body>* element).
converse.initialize({ converse.initialize({
auto_list_rooms: false, auto_list_rooms: false,
auto_subscribe: false, auto_subscribe: false,
bosh_service_url: 'https://bind.opkode.im', // Please use this connection manager only for testing purposes bosh_service_url: 'https://bind.conversejs.org', // Please use this connection manager only for testing purposes
hide_muc_server: false, hide_muc_server: false,
i18n: locales.en, // Refer to ./locale/locales.js to see which locales are supported i18n: locales.en, // Refer to ./locale/locales.js to see which locales are supported
prebind: false, prebind: false,
...@@ -138,7 +138,7 @@ This is the job of a connection manager. A connection manager can be either a ...@@ -138,7 +138,7 @@ This is the job of a connection manager. A connection manager can be either a
standalone application or part of an XMPP server. `ejabberd`_ for example, standalone application or part of an XMPP server. `ejabberd`_ for example,
includes a connection manager (but you have to enable it). includes a connection manager (but you have to enable it).
The demo on the `Converse.js homepage`_ uses a a connection manager located at https://bind.opkode.im. The demo on the `Converse.js homepage`_ uses a a connection manager located at https://bind.conversejs.org.
This connection manager is for testing purposes only, please don't use it in This connection manager is for testing purposes only, please don't use it in
production. production.
...@@ -318,7 +318,7 @@ Converse.js/Strophe.js and Facebook's XMPP server. That is because Facebook's ...@@ -318,7 +318,7 @@ Converse.js/Strophe.js and Facebook's XMPP server. That is because Facebook's
XMPP server doesn't support BOSH natively. XMPP server doesn't support BOSH natively.
The BOSH connection manager that I make available for The BOSH connection manager that I make available for
testing purposes (at https://bind.opkode.im) uses `Punjab <https://github.com/twonds/punjab>`_, testing purposes (at https://bind.conversejs.org) uses `Punjab <https://github.com/twonds/punjab>`_,
although there are quite a few other options available as well. although there are quite a few other options available as well.
When you configure Converse.js, via its ``initialize`` method, you must specify the When you configure Converse.js, via its ``initialize`` method, you must specify the
......
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
allow_otr: true, allow_otr: true,
auto_list_rooms: false, auto_list_rooms: false,
auto_subscribe: false, auto_subscribe: false,
bosh_service_url: 'https://bind.opkode.im', // Please use this connection manager only for testing purposes bosh_service_url: 'https://bind.conversejs.org', // Please use this connection manager only for testing purposes
debug: true , debug: true ,
hide_muc_server: false, hide_muc_server: false,
i18n: locales['en'], // Refer to ./locale/locales.js to see which locales are supported i18n: locales['en'], // Refer to ./locale/locales.js to see which locales are supported
......
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
converse.initialize({ converse.initialize({
auto_list_rooms: false, auto_list_rooms: false,
auto_subscribe: false, auto_subscribe: false,
bosh_service_url: 'https://bind.opkode.im', // Please use this connection manager only for testing purposes bosh_service_url: 'https://bind.conversejs.org', // Please use this connection manager only for testing purposes
hide_muc_server: false, hide_muc_server: false,
i18n: locales.en, // Refer to ./locale/locales.js to see which locales are supported i18n: locales.en, // Refer to ./locale/locales.js to see which locales are supported
prebind: false, prebind: false,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment