fix infos

diff --git a/INSTALL.rst b/INSTALL.rst
index fa7cde263a1cdfaf17f78519ec1db92263267b8e..c450ae1bb3717fd26ecb50d0b0a521714e032b42 100644 (file)
--- a/INSTALL.rst
+++ b/INSTALL.rst
@@ -19,28 +19,28 @@ Install the system dependencies
 --------------------------------
 
 * On Debian (Squeeze recommended) or Ubuntu Lucid:
-    
+
     Install all dependencies like this::
-        
+
         sudo aptitude install python python-dev python-django python-xml python-mysqldb mysql-server \
         python-ctypes python-setuptools python-support python-docutils \
         python-libxml2 python-django-registration python-lxml python-numpy \
         python-scipy python-imaging python-mutagen python-gobject python-gst0.10 \
         gstreamer0.10-plugins-base gobject-introspection
-        
+
     To get MP3 reading and writing, just add these lines to your /etc/apt/sources-list::
-            
+
         deb http://www.debian-multimedia.org stable main
 
     Then::
 
         sudo apt-get update
         sudo aptitude install gstreamer0.10-fluendo-mp3 gstreamer0.10-lame
-                
+
 * On other linux platforms:
-                    
+
     Please install all dependencies thanks to your application manager.
-                    
+
 
 Install Telemeta
 ------------------
@@ -59,7 +59,7 @@ Install Telemeta
     tar xzf telemeta-1.0.tar.gz
     cd telemeta-1.0
     sudo python setup.py install
-        
+
 
 Install TimeSide
 -----------------
@@ -71,7 +71,7 @@ Otherwise, you have to download and install it from source.
 So, download the last archive at :
 http://code.google.com/p/timeside/downloads/list
 
-Uncompress it and read README and INSTALL to install the dependencies 
+Uncompress it and read README and INSTALL to install the dependencies
 and then the module.
 
 
@@ -81,12 +81,12 @@ Install JSON-RPC server
 The JSON module provided by django-json-rpc have been automatically installed if you used pip or setup.py to install Telemeta. In this case only, you can pass this stage.
 
 Otherwise, you have to download and install it from source::
-    
+
     git clone git://github.com/samuraisam/django-json-rpc.git
     cd django-json-rpc
     python setup.py install
 
-    
+
 -------------------------
 Testing (sandbox)
 -------------------------
@@ -108,18 +108,6 @@ If you haven't already done it, start a new django project::
     django-admin startproject mysite
 
 
-Create the media and cache directories
------------------------------------------
-
-We need 2 directories for media and caching::
-
-    cd mysite
-    mkdir media cache cache/data cache/export
-
-
-You might want to place these data directories somewhere else, no pb.
-
-
 Create the database
 ------------------------
 
@@ -137,7 +125,7 @@ Modifiy the following variables::
     MEDIA_ROOT =        absolute path to the media directory you just created
 
 Set the app lists as follow::
-    
+
     INSTALLED_APPS = (
     'django.contrib.auth',
     'django.contrib.contenttypes',
@@ -150,14 +138,14 @@ Set the app lists as follow::
     )
 
 Set the following languages::
-    
+
     LANGUAGES = [ ('fr', 'French'),
                   ('en', 'English'),
     ]
 
 
 Set the following Middlewares::
-    
+
     MIDDLEWARE_CLASSES = (
         'django.middleware.common.CommonMiddleware',
         'django.contrib.sessions.middleware.SessionMiddleware',
@@ -168,7 +156,7 @@ Set the following Middlewares::
     )
 
 Add the following variables::
-    
+
     TEMPLATE_CONTEXT_PROCESSORS = (
         'django.core.context_processors.request',
         'django.contrib.auth.context_processors.auth',)
@@ -182,8 +170,8 @@ Add the following variables::
     TELEMETA_STREAMING_FORMATS =    tuple of authoized streaming formats. Ex : ('mp3', 'ogg')
     TELEMETA_PUBLIC_ACCESS_PERIOD = number of years above which item files are automagically published
     EMAIL_HOST =                    your default SMTP server
-    DEFAULT_FROM_EMAIL =            the default sending email address 
-    
+    DEFAULT_FROM_EMAIL =            the default sending email address
+
 Just paste the lines below::
 
     LOGIN_URL = '/login'
@@ -194,16 +182,16 @@ Just paste the lines below::
     CACHE_BACKEND = "file://" + TELEMETA_CACHE_DIR + "/data"
 
 If you want some personal templates, for example::
-    
+
     TEMPLATE_DIRS = (
     '/home/dev/telemeta/sandboxes/sandbox_generic/templates/',
     )
 
 You can find an example for settings.py there::
-    
+
     example/sandbox/settings.py
 
-    
+
 Initialize the database
 --------------------------
 
@@ -216,7 +204,7 @@ Configure your urls
 ----------------------
 
 Add this dictionary to get Javascript translation::
-    
+
     js_info_dict = {
         'packages': ('telemeta',),
     }
@@ -225,22 +213,22 @@ The simplest case is to have telemeta running at public root. To do so, add this
 
     # Telemeta
     (r'^', include('telemeta.urls')),
-    
+
     # Languages
-    (r'^i18n/', include('django.conf.urls.i18n')),    
+    (r'^i18n/', include('django.conf.urls.i18n')),
     (r'^jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict),
-    
+
 You should also bring the django admin::
-    
+
     (r'^admin/django/', include(admin.site.urls)),
-    
+
 Please also uncomment::
-    
+
     from django.contrib import admin
     admin.autodiscover()
 
 You can find an example for url.py there::
-    
+
     example/sandbox/urls.py
 
 
@@ -255,6 +243,10 @@ By default, the server starts on the port 8000. You can override this with, for
 
     python manage.py runserver 9000
 
+To get it on your network interface::
+
+    python manage.py runserver 192.168.0.10:9000
+
 
 Test it
 -----------
@@ -267,6 +259,10 @@ or::
 
     http://localhost:9000
 
+or::
+
+    http://192.168.0.10:9000
+
 
 Configure the site domain name in admin > general admin > sites
 
@@ -278,16 +274,16 @@ Template customization
 --------------------------
 
 Please see ::
-    
+
     http://telemeta.org/wiki/InterfaceCustomization
-    
-    
+
+
 --------------------------
 Deploy it with Apache 2
 --------------------------
 
 If you want to use Telemeta through a web server, it is highly recommended to use Apache 2
-with the mod_wsgi module as explained in the following page :
+with the mod_wsgi module as explained in the following page ::
 
     http://docs.djangoproject.com/en/1.1/howto/deployment/modwsgi/#howto-deployment-modwsgi
 

diff --git a/README.rst b/README.rst
index 3923aa61b938b157112aecee01f99c78dfe43833..9b72f72c6e794dba4a7c8adc1b390223641cfbed 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -27,8 +27,6 @@ This web audio CMS is exclusively based on open source modules and can be run on
 Installation, upgrade and usage
 ================================
 
-**WARNING** : sorry the setup process of 1.1 was just wrong, please upgrade to 1.2 !
-
 See `INSTALL.rst <http://telemeta.org/browser/INSTALL.rst>`_ and `telemeta.org <http://telemeta.org>`_ for more informations.
 
 
@@ -87,7 +85,7 @@ Twitter:
 
  * http://twitter.com/telemeta
  * http://twitter.com/parisson_studio
- 
+
 
 Sponsors
 ========