diff --git a/docs/Makefile.am b/docs/Makefile.am
index c163172de..fe7451102 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -2,6 +2,25 @@ SUBDIRS = libnm-glib libnm-util
if WITH_DOCS
+INCLUDES = \
+ -I$(top_srcdir)/include \
+ -I$(top_srcdir)/libnm-util
+
+noinst_PROGRAMS = \
+ generate-settings-spec
+
+generate_settings_spec_SOURCES = \
+ generate-settings-spec.c
+
+generate_settings_spec_CPPFLAGS = \
+ $(GLIB_CFLAGS) \
+ $(DBUS_CFLAGS)
+
+generate_settings_spec_LDADD = \
+ $(top_builddir)/libnm-util/libnm-util.la \
+ $(GLIB_LIBS) \
+ $(DBUS_LIBS)
+
XSLTPROC = xsltproc --xinclude --nonet
XMLS = $(wildcard $(top_srcdir)/introspection/nm-*.xml)
@@ -13,11 +32,14 @@ OTHER_FILES= \
$(top_srcdir)/tools/doc-generator.xsl \
$(top_srcdir)/introspection/generic-types.xml
-GENERATED_FILES = spec.html
+GENERATED_FILES = spec.html settings-spec.html
spec.html: $(XMLS) $(OTHER_FILES)
$(XSLTPROC) $(top_srcdir)/tools/doc-generator.xsl $(top_srcdir)/introspection/all.xml > $@
+settings-spec.html: generate-settings-spec $(top_builddir)/libnm-util/libnm-util.la
+ $(builddir)/generate-settings-spec $(builddir)/settings-spec.html
+
all: $(GENERATED_FILES)
EXTRA_DIST = $(GENERATED_FILES)
diff --git a/docs/generate-settings-spec.c b/docs/generate-settings-spec.c
new file mode 100644
index 000000000..e66a30a45
--- /dev/null
+++ b/docs/generate-settings-spec.c
@@ -0,0 +1,194 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/*
+ * Dan Williams
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ * (C) Copyright 2009 Red Hat, Inc.
+ */
+
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include "config.h"
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+typedef NMSetting* (*SettingNewFunc) (void);
+
+static SettingNewFunc funcs[] = {
+ nm_setting_802_1x_new,
+ nm_setting_bluetooth_new,
+ nm_setting_cdma_new,
+ nm_setting_connection_new,
+ nm_setting_gsm_new,
+ nm_setting_ip4_config_new,
+ nm_setting_ip6_config_new,
+ nm_setting_olpc_mesh_new,
+ nm_setting_ppp_new,
+ nm_setting_pppoe_new,
+ nm_setting_serial_new,
+ nm_setting_vpn_new,
+ nm_setting_wired_new,
+ nm_setting_wireless_new,
+ nm_setting_wireless_security_new,
+ NULL
+};
+
+typedef struct {
+ const char *gvalue_name;
+ const char *new_name;
+} TypeNameElement;
+
+static TypeNameElement name_map[] = {
+ { "gchararray", "string" },
+ { "GSList_gchararray_", "array of string" },
+ { "GArray_guchar_", "byte array" },
+ { "gboolean", "boolean" },
+ { "guint64", "uint64" },
+ { "gint", "int32" },
+ { "guint", "uint32" },
+ { "GPtrArray_GArray_guint__", "array of array of uint32" },
+ { "GPtrArray_GArray_guchar__", "array of byte array" },
+ { "GHashTable_gchararray+gchararray_", "dict of (string::string)" },
+ { NULL, NULL }
+};
+
+static void
+write_one_setting (FILE *f, SettingNewFunc func)
+{
+ int w;
+ NMSetting *s;
+ GParamSpec **props, **iter;
+ guint num;
+
+ s = func ();
+
+ /* write out section header */
+ w = fprintf (f, "Setting name: '%s'
\n", nm_setting_get_name (s));
+
+ w = fprintf (f, "\n");
+ w = fprintf (f, "Key Name | \n");
+ w = fprintf (f, "Value Type | \n");
+ w = fprintf (f, "Default Value | \n");
+ w = fprintf (f, "Value Description | \n");
+ props = g_object_class_list_properties (G_OBJECT_GET_CLASS (G_OBJECT (s)), &num);
+ for (iter = props; iter && *iter; iter++) {
+ const char *key_name, *value_type, *value_desc;
+ char *default_value;
+ TypeNameElement *name_iter;
+ GValue value = { 0, };
+
+ value_type = g_type_name (G_PARAM_SPEC_VALUE_TYPE (*iter));
+ for (name_iter = &name_map[0]; name_iter && name_iter->gvalue_name; name_iter++) {
+ if (!strcmp (value_type, name_iter->gvalue_name)) {
+ value_type = name_iter->new_name;
+ break;
+ }
+ }
+
+ key_name = g_param_spec_get_name (*iter);
+ value_desc = g_param_spec_get_blurb (*iter);
+
+ g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (*iter));
+ default_value = g_strdup_value_contents (&value);
+ if (default_value && !strcmp (default_value, "NULL")) {
+ g_free (default_value);
+ default_value = NULL;
+ }
+
+ if (!strcmp (key_name, NM_SETTING_NAME)) {
+ g_free (default_value);
+ default_value = NULL;
+ g_object_get (G_OBJECT (s), NM_SETTING_NAME, &default_value, NULL);
+ }
+
+ w = fprintf (f, "\n");
+ w = fprintf (f, "%s | \n", key_name);
+ w = fprintf (f, "%s | \n", value_type);
+ w = fprintf (f, "%s | \n", default_value ? default_value : "");
+ w = fprintf (f, "%s | \n", value_desc);
+ w = fprintf (f, "
\n");
+
+ g_free (default_value);
+ }
+
+ w = fprintf (f, "
\n");
+ g_object_unref (s);
+}
+
+int
+main (int argc, char *argv[])
+{
+ GError *error = NULL;
+ DBusGConnection *bus;
+ FILE *f;
+ int w;
+ SettingNewFunc *fptr;
+
+ if (argc != 2) {
+ fprintf (stderr, "Usage: %s