[packagekit] packagekit: Branch 'master' - 14 commits

Richard Hughes hughsient at kemper.freedesktop.org
Wed Oct 17 13:24:04 PDT 2007


 backends/box/pk-backend-box.c |   53 +++++++++++++---------------
 client/pk-console.c           |   35 ++++++++++---------
 docs/pk-introduction.xml      |   66 ------------------------------------
 html/index.html               |    6 +--
 html/pk-download.html         |   77 ++++++++++++++++++++++++++++++++----------
 html/pk-intro.html            |   40 ++++++++++-----------
 html/pk-screenshots.html      |    4 +-
 html/pk-using.html            |   22 ++++++++++--
 html/style.css                |    2 +
 9 files changed, 149 insertions(+), 156 deletions(-)

New commits:
commit fff17704c64ef9e95014f29fce62e343e6581107
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Oct 17 21:22:03 2007 +0100

    fix the link to the wiki

diff --git a/html/index.html b/html/index.html
index 36a1ed3..6973d62 100644
--- a/html/index.html
+++ b/html/index.html
@@ -30,12 +30,12 @@
 <tr>
  <td align="middle"><a href="pk-help.html"><img src="img/large-system-users.png" width="128"/></a></td>
  <td align="middle"><a href="pk-screenshots.html"><img src="img/large-emblem-photos.png" width="128"/></a></td>
- <td align="middle"><a href="wiki/FAQ"><img src="img/large-help-browser.png" width="128"/></a></td>
+ <td align="middle"><a href="wiki/index.php/FAQ"><img src="img/large-help-browser.png" width="128"/></a></td>
 </tr>
 <tr>
  <td><a href="pk-help.html"><p class="indextitle">How can I help?</p></a></td>
  <td><a href="pk-screenshots.html"><p class="indextitle">Screenshots</p></a></td>
- <td><a href="wiki/FAQ"><p class="indextitle">Frequently<br>asked questions</p></a></td>
+ <td><a href="wiki/index.php/FAQ"><p class="indextitle">Frequently<br>asked questions</p></a></td>
 </tr>
 </table>
 
commit b8be738984c9d205449716c8157ae2ca4012d51e
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Oct 17 21:08:17 2007 +0100

    remove some stuff now on the website

diff --git a/docs/pk-introduction.xml b/docs/pk-introduction.xml
index 4676fd2..913b321 100644
--- a/docs/pk-introduction.xml
+++ b/docs/pk-introduction.xml
@@ -22,11 +22,6 @@
           Automatically installing new or add-on software.
         </para>
       </listitem>
-      <listitem>
-        <para>
-          Monitoring the state of the system.
-        </para>
-      </listitem>
     </itemizedlist>
 
     <para>
@@ -39,67 +34,6 @@
         <imagedata format="PNG" fileref="pk-structure.png" align="center"/>
       </imageobject>
     </mediaobject>
- 
-    <para>
-      PackageKit is GPL licensed.
-    </para>
-
-    <para>
-      PackageKit comprises:
-    </para>
-    <itemizedlist>
-      <listitem>
-        <para>
-          The <literal>packagekitd</literal> system daemon which runs using
-          system activation as the root user and queues and performs the package
-          actions. It quits after a small period of inactivity.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-           The <literal>pkcon</literal> text client access program.
-           This allows you to interact with PackageKit on the command line
-           either in an async or sync mode. e.g.
-           <literal>pkcon async check updates</literal> or
-           <literal>pkcon sync search description power</literal>.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-           The <literal>pkmon</literal> text client monitor program.
-           This allows you to monitor what PackageKit is doing on the command
-           line.
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para>
-      What PackageKit is not:
-    </para>
-    <itemizedlist>
-      <listitem>
-        <para>
-          A huge daemon with lots of dependencies.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          API or ABI stable. Expect the ABI and API to change on a regular
-          basis until we ship 1.0.0.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Targeted to a particular architecture or platform.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Produced by any one vendor.
-          There are many contributors helping to get this done.
-        </para>
-      </listitem>
-    </itemizedlist>
   </sect1>
 
   <sect1 id="introduction-backends">
commit ee6314a6adfe1e781872a0ab95065d829fc267a0
Merge: bd2a6fc... 31148d9...
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Oct 17 21:04:03 2007 +0100

    Merge branch 'master' of git+ssh://hughsie@git.packagekit.org/srv/git/PackageKit

commit bd2a6fc28a7837ca56a9dcf65e1d3a724954d2c3
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Oct 17 21:03:50 2007 +0100

    fix the spacing in pkcon

diff --git a/client/pk-console.c b/client/pk-console.c
index eac675b..0682502 100644
--- a/client/pk-console.c
+++ b/client/pk-console.c
@@ -36,12 +36,13 @@
 static GMainLoop *loop = NULL;
 
 /**
- * pk_console_make_space:
+ * pk_console_pad_string:
  **/
 static gchar *
-pk_console_make_space (const gchar *data, guint length, guint *extra)
+pk_console_pad_string (const gchar *data, guint length, guint *extra)
 {
 	gint size;
+	gchar *text;
 	gchar *padding;
 
 	if (extra != NULL) {
@@ -59,7 +60,12 @@ pk_console_make_space (const gchar *data, guint length, guint *extra)
 		}
 	}
 	padding = g_strnfill (size, ' ');
-	return padding;
+	if (data == NULL) {
+		return padding;
+	}
+	text = g_strdup_printf ("%s%s", data, padding);
+	g_free (padding);
+	return text;
 }
 
 /**
@@ -71,28 +77,27 @@ pk_console_package_cb (PkClient *client, PkInfoEnum info, const gchar *package_i
 	PkPackageId *ident;
 	PkPackageId *spacing;
 	gchar *info_text;
-	guint extra;
+	guint extra = 0;
+
+	/* pass this out */
+	info_text = pk_console_pad_string (pk_info_enum_to_text (info), 12, NULL);
 
-	info_text = pk_console_make_space (pk_info_enum_to_text (info), 10, NULL);
 	spacing = pk_package_id_new ();
 	ident = pk_package_id_new_from_string (package_id);
 
 	/* these numbers are guesses */
 	extra = 0;
-	spacing->name = pk_console_make_space (ident->name, 20, &extra);
-	spacing->version = pk_console_make_space (ident->version, 15-extra, &extra);
-	spacing->arch = pk_console_make_space (ident->arch, 7-extra, &extra);
-	spacing->data = pk_console_make_space (ident->data, 7-extra, &extra);
+	spacing->name = pk_console_pad_string (ident->name, 20, &extra);
+	spacing->arch = pk_console_pad_string (ident->arch, 7-extra, &extra);
+	spacing->version = pk_console_pad_string (ident->version, 15-extra, &extra);
+	spacing->data = pk_console_pad_string (ident->data, 12-extra, &extra);
 
 	/* pretty print */
-	g_print ("%s %s%s %s%s %s%s %s%s %s\n", info_text,
-		 ident->name, spacing->name,
-		 ident->version, spacing->version,
-		 ident->arch, spacing->arch,
-		 ident->data, spacing->data,
-		 summary);
+	g_print ("%s %s %s %s %s %s\n", info_text, spacing->name,
+		 spacing->arch, spacing->version, spacing->data, summary);
 
 	/* free all the data */
+	g_free (info_text);
 	pk_package_id_free (ident);
 	pk_package_id_free (spacing);
 }
diff --git a/html/pk-using.html b/html/pk-using.html
index bb1bfe7..077b375 100644
--- a/html/pk-using.html
+++ b/html/pk-using.html
@@ -20,8 +20,26 @@
 <h2>Using the command line</h2>
 <p>
 The <code>pkcon</code> text-mode program allows you to interact with
-PackageKit on the command. e.g. <code>pkcon get updates</code> or
-<code>pkcon search description power</code>.
+PackageKit on the command. For example:
+<pre>
+[hughsie at laptop ~]$ pkcon get updates
+normal       powertop             i386    1.8-1.fc8       fedora    Power consumption monitor
+security     kernel               i386    2.6.23-0.115.rc3.git1.fc8 installed The Linux kernel
+security     gtkhtml2             i386    2.19.1-4.fc8    fedora    An HTML widget for GTK+ 2.0
+Runtime was 0 seconds
+</pre>
+<p>or</p>
+<pre>
+[hughsie at laptop ~]$ pkcon search name power
+installed    powerman             i386    1.0.25-2.fc7    installed   PowerMan - Power to the Cluster
+installed    powertop             i386    1.8-1.fc8       installed   Power consumption monitor
+installed    gnome-power-manager  i386    2.20.0-5.fc8    installed   GNOME Power Manager
+available    kpowersave           i386    0.7.3-0.2svn20070828.fc8 development KPowersave is the KDE frontend for powermanagement
+available    kadu-powerkadu       i386    0.5.0-4.fc8     development Powerkadu module for Kadu
+available    powermanga           i386    0.90-1          development Arcade 2D shoot-them-up game
+Runtime was 2 seconds
+</pre>
+<p>
 The <code>pkmon</code> program allows you to monitor what PackageKit is
 doing on the command line and is mainly used for debugging.
 </p>
commit 31148d99ec9b090311476f9fd06f83aea62f1c8f
Merge: ea96db7... bc2977f...
Author: Robin Norwood <rnorwood at redhat.com>
Date:   Wed Oct 17 16:01:17 2007 -0400

    Merge branch 'master' of git+ssh://rnorwood@git.packagekit.org/srv/git/PackageKit
    
    Conflicts:
    
    	html/pk-screenshots.html

commit ea96db74e40985a1f365aa60547e59a5030e4b82
Author: Robin Norwood <rnorwood at redhat.com>
Date:   Wed Oct 17 15:58:14 2007 -0400

    a few more minor wording tweaks.

diff --git a/html/pk-intro.html b/html/pk-intro.html
index f8582cd..633c0a1 100644
--- a/html/pk-intro.html
+++ b/html/pk-intro.html
@@ -84,7 +84,7 @@ you can redistrubute and/or modify PackageKit and gnome-packagekit
 under the terms of the GNU General Public License as published by the
 Free Software foundation; either version 2 of the License, or (at your
 option) any later version.  See the license information included with
-software for more details.
+the software for more details.
 </p>
 
 <p>
diff --git a/html/pk-screenshots.html b/html/pk-screenshots.html
index 8ceca1c..5c6ca16 100644
--- a/html/pk-screenshots.html
+++ b/html/pk-screenshots.html
@@ -8,7 +8,7 @@
 <table align="center" class="title">
 <tr>
  <td><center><img src="img/packagekit.png"/></center></td>
- <td width="95%" valign="middle"><p class="title">Screenshots of latest stuff</p></td>
+ <td width="95%" valign="middle"><p class="title">Screenshots of the latest stuff</p></td>
  <td><center><img src="img/packagekit.png"/></center></td>
 </tr>
 </table>
commit bc2977f31cdd346a9d21f7d11594db9efe26ccc2
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Oct 17 20:41:55 2007 +0100

    fix the screenshots title

diff --git a/html/pk-screenshots.html b/html/pk-screenshots.html
index 8ceca1c..c65c539 100644
--- a/html/pk-screenshots.html
+++ b/html/pk-screenshots.html
@@ -8,14 +8,14 @@
 <table align="center" class="title">
 <tr>
  <td><center><img src="img/packagekit.png"/></center></td>
- <td width="95%" valign="middle"><p class="title">Screenshots of latest stuff</p></td>
+ <td width="95%" valign="middle"><p class="title">Screenshots</p></td>
  <td><center><img src="img/packagekit.png"/></center></td>
 </tr>
 </table>
 
 <p>Back to the <a href="index.html">main page</a></p>
 
-<h1>Screenshots of graphical tools</h1>
+<h1>Screenshots</h1>
 
 
 <center><img src="img/pk-application.png"/></center>
commit a815f444b823de201652d08659c7e93a2e3014a5
Merge: fa611eb... b19f4ba...
Author: Grzegorz Dabrowski <gdx at o2.pl>
Date:   Wed Oct 17 21:38:15 2007 +0000

    Merge branch 'master' of git+ssh://kaliber@git.packagekit.org/srv/git/PackageKit

commit fa611eba7278760410d7a54ba68fa27198f632dc
Author: Grzegorz Dabrowski <gdx at o2.pl>
Date:   Wed Oct 17 21:37:52 2007 +0000

    [box] read files list

diff --git a/backends/box/pk-backend-box.c b/backends/box/pk-backend-box.c
index 2d16f6b..9fbe433 100644
--- a/backends/box/pk-backend-box.c
+++ b/backends/box/pk-backend-box.c
@@ -229,25 +229,6 @@ find_packages (PkBackend *backend, const gchar *search, const gchar *filter, gin
 	}
 }
 
-static GList*
-find_package_by_id (PkPackageId *pi)
-{
-	sqlite3 *db = NULL;
-	GList *list;
-
-	db = db_open();
-
-	/* only one element is returned */
-	list = box_db_repos_packages_search_by_data(db, pi->name, pi->version);
-	if (list == NULL)
-		return NULL;
-
-	db_close(db);
-
-	return list;
-}
-
-
 static gboolean
 backend_get_updates_thread (PkBackend *backend, gpointer data)
 {
@@ -273,28 +254,40 @@ backend_get_description_thread (PkBackend *backend, gpointer data)
 	PackageSearch *ps;
 	GList *list;
 	ThreadData *d = (ThreadData*) data;
+	gchar *files;
+	sqlite3 *db;
+
+	db = db_open();
 
 	pi = pk_package_id_new_from_string (d->package_id);
 	if (pi == NULL) {
 		pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_ID_INVALID, "invalid package id");
+		db_close(db);
 		return FALSE;
 	}
 
 	pk_backend_change_status (backend, PK_STATUS_ENUM_QUERY);
-	list = find_package_by_id (pi);
+
+	/* only one element is returned */
+	list = box_db_repos_packages_search_by_data(db, pi->name, pi->version);
+
 	ps = (PackageSearch*) list->data;
 	if (list == NULL) {
 		pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_ID_INVALID, "cannot find package by id");
+		db_close(db);
 		return FALSE;
 	}
 
-	/* Package size and file list go here, but I don't know how to find those for 'boxes'. */
-	/* Also, if I ever write a packaging system, they will be called 'presents'. Or perhaps 'parcels'. */
-	pk_backend_description (backend, pi->name, "unknown", PK_GROUP_ENUM_OTHER, ps->description, "", 0, "");
+	files = box_db_repos_get_files_string (db, pi->name, pi->version);
+
+	pk_backend_description (backend, pi->name, "unknown", PK_GROUP_ENUM_OTHER, ps->description, "", 0, files);
 
 	pk_package_id_free (pi);
 	box_db_repos_package_list_free (list);
 
+	db_close(db);
+
+	g_free (files);
 	g_free (d->package_id);
 	g_free (d);
 
commit 4cca750da92cd3fc2573c5c47415df6642bee1b9
Author: Grzegorz Dabrowski <gdx at o2.pl>
Date:   Wed Oct 17 20:21:55 2007 +0000

    [box] use correct enum for updates

diff --git a/backends/box/pk-backend-box.c b/backends/box/pk-backend-box.c
index 61847d9..2d16f6b 100644
--- a/backends/box/pk-backend-box.c
+++ b/backends/box/pk-backend-box.c
@@ -71,7 +71,7 @@ db_close(sqlite3 *db)
 
 
 static void
-add_packages_from_list (PkBackend *backend, GList *list)
+add_packages_from_list (PkBackend *backend, GList *list, gboolean updates)
 {
 	PackageSearch *package = NULL;
 	GList *li = NULL;
@@ -81,7 +81,9 @@ add_packages_from_list (PkBackend *backend, GList *list)
 	for (li = list; li != NULL; li = li->next) {
 		package = (PackageSearch*)li->data;
 		pkg_string = pk_package_id_build(package->package, package->version, package->arch, package->reponame);
-		if (package->installed)
+		if (updates == TRUE)
+			info = PK_INFO_ENUM_NORMAL;
+		else if (package->installed)
 			info = PK_INFO_ENUM_INSTALLED;
 		else
 			info = PK_INFO_ENUM_AVAILABLE;
@@ -167,11 +169,11 @@ find_packages_real (PkBackend *backend, const gchar *search, const gchar *filter
 	if (mode == SEARCH_TYPE_FILE) {
 		/* TODO: allow filtering */
 		list = box_db_repos_search_file (db, search);
-		add_packages_from_list (backend, list);
+		add_packages_from_list (backend, list, FALSE);
 		box_db_repos_package_list_free (list);
 	} else if (mode == SEARCH_TYPE_RESOLVE) {
 		list = box_db_repos_packages_search_one (db, (gchar *)search);
-		add_packages_from_list (backend, list);
+		add_packages_from_list (backend, list, FALSE);
 		box_db_repos_package_list_free (list);
 	} else {
 		if (installed == FALSE && available == FALSE) {
@@ -184,7 +186,7 @@ find_packages_real (PkBackend *backend, const gchar *search, const gchar *filter
 			} else if (available == TRUE) {
 				list = box_db_repos_packages_search_available(db, (gchar *)search, search_filter);
 			}
-			add_packages_from_list (backend, list);
+			add_packages_from_list (backend, list, FALSE);
 			box_db_repos_package_list_free (list);
 		}
 	}
@@ -257,7 +259,7 @@ backend_get_updates_thread (PkBackend *backend, gpointer data)
 	db = db_open ();
 
 	list = box_db_repos_packages_for_upgrade (db);
-	add_packages_from_list (backend, list);
+	add_packages_from_list (backend, list, TRUE);
 	box_db_repos_package_list_free (list);
 
 	db_close (db);
commit b19f4ba61beed87390d98dce0ccacd3f8fe5841e
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Oct 17 20:29:18 2007 +0100

    add more stuff with downloads

diff --git a/html/pk-download.html b/html/pk-download.html
index 6a03d77..05e3a5c 100644
--- a/html/pk-download.html
+++ b/html/pk-download.html
@@ -17,23 +17,70 @@
 
 <h1>Where do I download it?</h1>
 
+<h2>Precompiled Packages</h2>
 <p>
 Your distribution may already have compiled packages that are much
 easier to install.
 <ul>
-  <li>Conary: Yes, just run: <code>sudo conary update-all</code></li>
+  <li>Conary: Yes, just run: <code>sudo conary update PackageKit gnome-packagekit</code></li>
   <li>Fedora 8: Yes, just install <a href="http://people.freedesktop.org/~hughsient/fedora/">this</a> repository file and run: <code>yum install PackageKit gnome-packagekit</code> (as root)</li>
-  <li>Others: Probably not, although you can compile from source. See the download <a href="">page</a> for more details.</li>
+  <li>Others: Probably not, although you can compile from source. See below for more details.</li>
 </ul>
 </p>
 
+<h2>Released Versions</h2>
+<p>
+Released versions are found on
+<a href="http://people.freedesktop.org/~hughsient/releases/">people.freedesktop.org</a>.
+</p>
+<table>
+<tr><td><b>Version</b></td><td>&nbsp;&nbsp;</td><td><b>Date</b></td></tr>
+<tr><td>0.1.0</td><td></td><td>2007-10-16</td></tr>
+</table>
+
+<h2>Dependencies</h2>
+<p>
+The actual PackageKit daemon needs:
+</p>
+<ul>
+<li><code>glib</code> 2.14.0</li>
+<li><code>dbus</code> newer than 1.1.3 (20070819 or later)</li>
+<li><code>dbus-glib</code> 0.74</li>
+<li><code>libnm</code> 0.6.4</li>
+<li><code>polkit-dbus</code> 0.5</li>
+<li><code>polkit-grant</code> 0.5</li>
+</ul>
+
+<p>
+gnome-packagekit will need all the usual GNOME libs as well.
+Just make sure you install PackageKit before gnome-packagekit!
+</p>
+
+<h2>Compiling the latest code</h2>
+<p>
+You can get the latest code from the public git repo on freedesktop.
+</p>
+<pre>
+git clone git://anongit.freedesktop.org/git/packagekit
+git clone git://people.freedesktop.org/~hughsient/gnome-packagekit
+</pre>
+<p>
+If you want to commit changes or a new backend, then please email the
+mailing list and we can give you access to a developer server.
+The developer server is always up to date, and the anonymous git is synced
+about twice a day.
+Having a two tier server lets developers review code for correctness and
+security problems before it's used in the real world.
+</p>
+
+<h2>Adding backends to PackageKit</h2>
 <p>
 PackageKit itself is an abstract daemon, the only bits that are distro
 specific are the backends.<br/>
 To make PackageKit work on a new distribution, you have to write a
 "backend" which is basically a shim layer from the distro tool to
 packagekitd. A backend can have one or more threads and also spawn other processes.<br/>
-See the developer information <a href="moo">here</a> for loads more
+See the developer information <a href="pk-reference.html">here</a> for loads more
 information.
 </p>
 
@@ -58,8 +105,6 @@ I think it's important that installing and updating software should be
 as easy as possible.
 </p>
 
-Use Wiki:/Downloads
-
 <p>Back to the <a href="index.html">main page</a></p>
 
 </body>
commit f3ea99566d9b60aadc6d546c21395f70e4a70eed
Author: Robin Norwood <rnorwood at redhat.com>
Date:   Wed Oct 17 14:41:13 2007 -0400

    Fix some minor grammatical issues, get rid of an icky table, and add a few more details about the license.

diff --git a/html/pk-intro.html b/html/pk-intro.html
index 48687a5..f8582cd 100644
--- a/html/pk-intro.html
+++ b/html/pk-intro.html
@@ -25,10 +25,10 @@ like PolicyKit to make the process suck less.
 </p>
 
 <p>
-The actual nuts-and-bolts distro tool (yum, apt, conary etc-) is used in
+The actual nuts-and-bolts distro tool (yum, apt, conary, etc) is used by
 PackageKit using compiled and scripted helpers.
 PackageKit isn't meant to replace these tools, instead providing a
-common set abstraction that can be used by standard GUI and text mode
+common set of abstractions that can be used by standard GUI and text mode
 package managers.
 </p>
 
@@ -49,24 +49,17 @@ There are also QT applications being designed, although these are not
 fully functional yet.
 </p>
 
-<table>
-<tr>
- <td><img src="img/dialog-information.png" alt="[NOTE]"></td>
- <td>
-  <p>
-   By default, PackageKit uses PolicyKit for user authentication.
-   This means as an admin you can specify with fine-grained control what
-your users can and cannot do.
-   For instance, an admin could specify that unprivileged users can
-update the system and do searching, but are not allowed to install or
-remove packages.
-   For home users it's typical to ask the user for their own, or the
-administrator "root" password.
-   With PolicyKit, all these options are possible.
-  </p>
- </td>
-</tr>
-</table>
+<p>
+  <img style="float: left" src="img/dialog-information.png" alt="[NOTE]">
+  By default, PackageKit uses PolicyKit for user authentication.  This
+  means that you, as an admin, can specify with fine-grained control
+  what your users can and cannot do.  For instance, an admin could
+  specify that unprivileged users can update the system and do
+  searching, but are not allowed to install or remove packages.  For
+  home users it's typical to ask the user for their own, or the
+  administrator's "root" password.  With PolicyKit, all these options
+  are possible.
+</p>
 
 <p>
 Use cases for PackageKit exist for the following scenarios:
@@ -86,7 +79,12 @@ More details can be found on the wiki.
 </p>
 
 <p>
-PackageKit and gnome-packagekit is GPL2+ licensed.
+PackageKit and gnome-packagekit are GPLv2+ licensed.  This means that
+you can redistrubute and/or modify PackageKit and gnome-packagekit
+under the terms of the GNU General Public License as published by the
+Free Software foundation; either version 2 of the License, or (at your
+option) any later version.  See the license information included with
+software for more details.
 </p>
 
 <p>
commit 55f1f5dfe54c901479c907222707d5d8ff6ee094
Author: Robin Norwood <rnorwood at redhat.com>
Date:   Wed Oct 17 14:27:26 2007 -0400

    A few more minor tweaks

diff --git a/html/pk-download.html b/html/pk-download.html
index d784b9b..6a03d77 100644
--- a/html/pk-download.html
+++ b/html/pk-download.html
@@ -20,30 +20,26 @@
 <p>
 Your distribution may already have compiled packages that are much
 easier to install.
-Conary:
-Yes, just do sudo conary update-all
-Fedora 8:
-Yes, just install this repo and do yum install PackageKit
-gnome-packagekit
-Others:
-Probably not, although you can compile from source. See the download <a
-href="">page</a> for more details.
+<ul>
+  <li>Conary: Yes, just run: <code>sudo conary update-all</code></li>
+  <li>Fedora 8: Yes, just install <a href="http://people.freedesktop.org/~hughsient/fedora/">this</a> repository file and run: <code>yum install PackageKit gnome-packagekit</code> (as root)</li>
+  <li>Others: Probably not, although you can compile from source. See the download <a href="">page</a> for more details.</li>
+</ul>
 </p>
 
 <p>
 PackageKit itself is an abstract daemon, the only bits that are distro
-specific are the backends.
-To make PackageKit work on your unknown distribution you have to write a
+specific are the backends.<br/>
+To make PackageKit work on a new distribution, you have to write a
 "backend" which is basically a shim layer from the distro tool to
-packagekitd.
-A backend can have one or more threads and also spawn other processes.
+packagekitd. A backend can have one or more threads and also spawn other processes.<br/>
 See the developer information <a href="moo">here</a> for loads more
 information.
 </p>
 
 <p>
 Backends do not have to be complete; often they just contain basic
-functionality to install and remove but not provide dependency or file
+functionality to install and remove but do not provide dependency or file
 lists for example.
 For instance:
 </p>
@@ -56,8 +52,8 @@ For instance:
 </ul>
 
 <p>
-We need people to create a backend, and then package (pardon the pun)
-PackageKit and gnome-packagekit for distributions.
+We need people to create backends, and then package (pardon the pun)
+PackageKit and gnome-packagekit for more distributions.
 I think it's important that installing and updating software should be
 as easy as possible.
 </p>
diff --git a/html/style.css b/html/style.css
index d254dd6..d229818 100644
--- a/html/style.css
+++ b/html/style.css
@@ -51,6 +51,8 @@ img.caption {
 code {
 	color: #000000;
 	font: 1.1em 'Courier New', Courier, Fixed;
+	margin-left: .3em;
+	margin-right: .3em;
 	}
 
 pre {
commit 73bd1daae8889809e117b0183e1e7251145db307
Author: Robin Norwood <rnorwood at redhat.com>
Date:   Wed Oct 17 14:17:48 2007 -0400

    'Screenshots' sounds better than 'Screenshots of graphical tools'.  What else would the screenshots be of?

diff --git a/html/index.html b/html/index.html
index 470d485..36a1ed3 100644
--- a/html/index.html
+++ b/html/index.html
@@ -34,7 +34,7 @@
 </tr>
 <tr>
  <td><a href="pk-help.html"><p class="indextitle">How can I help?</p></a></td>
- <td><a href="pk-screenshots.html"><p class="indextitle">Screenshots of<br>graphical tools</p></a></td>
+ <td><a href="pk-screenshots.html"><p class="indextitle">Screenshots</p></a></td>
  <td><a href="wiki/FAQ"><p class="indextitle">Frequently<br>asked questions</p></a></td>
 </tr>
 </table>



More information about the PackageKit mailing list