Update the different informative text files

diff --git a/AUTHORS b/AUTHORS
index 2ac5cbabc403d2ead72e819a6d48eccb538ee1d2..9cf0454fcfe963f67fb5b7fbc3383d99357c5e78 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -7,13 +7,21 @@ Artwork by:
 Translations:
     de: Enrico Tröger <enrico.troeger@uvena.de>
     de: Christian Dywan <christian@twotoasts.de>
+    es: Miguel Anxo Bouzada <mbouzada@gmail.com>
+    es: Christian Dywan <christian@twotoasts.de>
     fr: Christian Dywan <christian@twotoasts.de>
     fr: Adrien Nader <camaradetux@gmail.com>
+    gl: Miguel Anxo Bouzada <mbouzada@gmail.com>
     hu: SZERVÁC Attila <sas@321.hu>
     pl: Przemysław Sitek <el.pescado@gazeta.pl>
     sv: Mikael Magnusson <mikachu@comhem.se>
 
 Contributors:
-     Ori Bernstein <ori@eigenstate.org>
-     Przemek Sitek <el.pescado@gazeta.pl>
-     Enrico Tröger <enrico.troeger@uvena.de>
+    Ori Bernstein <ori@eigenstate.org>
+    Przemek Sitek <el.pescado@gazeta.pl>
+    Enrico Tröger <enrico.troeger@uvena.de>
+    Arnaud Renevier <arenevier@fdn.fr>
+    Dale Whittaker <dayul@users.sf.net>
+
+Code from other projects:
+    GTK+/ GdkPixbuf, Matthias Clasen <mclasen@redhat.com>

diff --git a/HACKING b/HACKING
index c6248360ef784ebe3b3b4c63b1f6ba3b9cbbc21a..c1fd53392db49f636ef1ade7edb56df335045324 100644 (file)
--- a/HACKING
+++ b/HACKING
@@ -18,7 +18,9 @@ Source file example:
     void
     foobar (FooEnum bar, const gchar* foo)
     {
-        if(!foo)
+        gint n, i;
+
+        if (!foo)
             return;
 
         #ifdef BAR_STRICT
@@ -29,8 +31,7 @@ Source file example:
         }
         #endif
 
-        // this is an example
-        gint n;
+        /* this is an example */
         switch (bar)
         {
         case FOO_FOO:
@@ -43,7 +44,6 @@ Source file example:
             n = 1;
         }
 
-        guint i;
         for (i = 0; i < n; i++)
         {
             g_print ("%s\n", foo);
@@ -64,7 +64,7 @@ Header file example:
         #define BAR_STRICT
     #endif
 
-    // -- Types
+    /* Types */
 
     typedef enum
     {
@@ -78,7 +78,7 @@ Header file example:
         FooEnum foo_bar;
     } FooStruct;
 
-    // -- Declarations
+    /* Declarations */
 
     void
     foo_bar           (FooEnum      bar,

diff --git a/INSTALL b/INSTALL
index cf9d62d9ca94147a7ba7b69623a9bcfb7877c0fa..9aa86c99b8f8310d80b667ca92b64663203bdf40 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,31 +1,32 @@
-If you checked out from the repository, make sure
-you have *libtool* and *intltool* installed, then run
++++ Installing Midori +++
+
+Building and installing Midori is straightforward.
+
+Make sure you have Python 2.4 or higher installed.
 
-1. ./autogen.sh
+Change to the Midori folder on your hard disk in a terminal.
 
-2. ./configure --enable-debug=yes
+Run './waf configure'
 
-3. make
+Run './waf build'
 
-If you obtained midori in the form of a release tarball,
-you need to perform the following steps in order to
-build and install the program.
+You can now run Midori from _build_/default/midori
 
-1. Unpack the archive.
+You can install it with './waf install'
 
-2. Check build options with
-      ./configure --help
+For further options run './waf --help'
 
-3. Prepare for build with
-      ./configure
++++ The alternative +++
+
+Alternatively, autotools build files are available.
+
+If you checked out from the repository, make sure
+you have *libtool* and *intltool* installed.
+Then run './autogen.sh'.
 
-4. Build midori with
-      make
+Run './configure'
 
-5. To install midori run either
-      (sudo) make install
-   or
-      (sudo) checkinstall
+Run 'make'
 
-6. For a list of command line options run
-      midori --help
\ No newline at end of file
+The usual autotools way works here, please refer to
+according documentation in case of questions.

diff --git a/README b/README
index 2537f5c3165c6e672c8e0f8b5e147b8f6ed68a76..ce6f660ff32b86911a1831172fba8c4bdf11bdea 100644 (file)
--- a/README
+++ b/README
@@ -14,7 +14,9 @@ Requirements: GTK+ 2.6, WebkitGtk, libXML2
 For installation instructions read INSTALL.
 
 Please report comments, suggestions and bugs to:
-    Christian Dywan <christian@twotoasts.de>
+    http://www.twotoasts.de/bugs
+
+And join the IRC channel #midori on irc.freenode.net
 
 Check for new versions at:
-    http://software.twotoasts.de
+    http://www.twotoasts.de

diff --git a/TODO b/TODO
index dd6fda225d4074c404bffaa516b42f53fcb22344..25ca1c19c6d70e62681136ae64330fd2d964c357 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,12 +1,15 @@
 TODO:
+ . Revamp bookmarks UI, including creating of bookmark folders
+ . Use an update timeout in KatzePropertyProxy instead of only focus-out
+ . Show a loading mouse pointer
+ . Support bookmarklets
+ . Scroll tabs w/o switching tabs
  . Import and export of the bookmarks file, or using one from a specific path
  . Save files on change as opposed to on quit
  . Middle click toolbuttons or menuitems should open new tabs
  . Implement support for userstyles
- . Actual multiple window support, some things just ignore this currently
  . Custom context menu actions, like in Thunar or Epiphany
  . Custom tab names
- . Identify and fix Gtk2.6 compatibility problems
  . Open an auto-vanishing findbox with '.'
  . Custom panels, loaded from (x)htm(l) files or websites
  . Drag tabs onto the panel to add them to the sidebar
@@ -17,7 +20,6 @@ TODO:
  . Per-site settings accessible via statusbar icons, ie. cookies, popups, plugins
  . CookieSafe like, a list of cookies, with type, block, allow
  . Support mouse gestures (extension)
- . Optional internal source view using gtksourceview?
  . Automatic update checks (browser, extensions)?
  . Auto-group tabs by opener, with colors?
  . Mark (dogear) a selection so that it isn't cleared implicitly, multiply on one page
@@ -25,7 +27,6 @@ TODO:
  . 'about:' uris: about, blank, cache, config, plugins
  . Panel of open tabs (with tree-structure), optional thumbnail-view
  . Spell check support
- . Allow text and full page zoom (how do we incorporate it in the gui?)
  . Check specific bookmarks for updates automatically (extension)
  . Mark "new" as well as "actually modified" tabs specially (even over sessions)
  . Customizable toolbars, custom buttons (uri, title, icon)?
@@ -33,7 +34,6 @@ TODO:
  . Use libnotify for events, e.g. download finished
  . Save screenshot of a document?
  . Right-click a textbox in a search form and choose 'add to websearch'
- . Support extensions written in lua, possibly also Python?
  . Reuse running instance, probably via libunique
  . Honor design principle "no warnings but undo of backups"?
  . Support widgets 1.0 spec in tool windows and standalone?
@@ -52,4 +52,3 @@ TODO:
  . Custom-mode, e.g. hide menubar and use help icon to have a help viewer
  . Prevent dead tabs: download, aborted page
  . On url load, for big files, ask "Open or save?"
- . An option to not reuse the current tab when entering an url or searching