aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-05-25 21:14:51 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-05-25 21:14:51 +0800
commitf49077cfb57ade9013674487a1f371da7c038709 (patch)
tree58ebabbe624409eed22ed13578eab3ed2d4d0206 /doc
parentd3c7420fb977fe5c337f2c917839a6e982a47902 (diff)
parent9fb0290d914e63512f6e3fc719b6b0249d787656 (diff)
downloadgsoc2013-evolution-f49077cfb57ade9013674487a1f371da7c038709.tar
gsoc2013-evolution-f49077cfb57ade9013674487a1f371da7c038709.tar.gz
gsoc2013-evolution-f49077cfb57ade9013674487a1f371da7c038709.tar.bz2
gsoc2013-evolution-f49077cfb57ade9013674487a1f371da7c038709.tar.lz
gsoc2013-evolution-f49077cfb57ade9013674487a1f371da7c038709.tar.xz
gsoc2013-evolution-f49077cfb57ade9013674487a1f371da7c038709.tar.zst
gsoc2013-evolution-f49077cfb57ade9013674487a1f371da7c038709.zip
Merge branch 'gnome-2-30' into express2
Diffstat (limited to 'doc')
-rw-r--r--doc/reference/shell/tmpl/e-extensible.sgml3
-rw-r--r--doc/reference/shell/tmpl/e-extension.sgml3
-rw-r--r--doc/reference/shell/tmpl/e-shell.sgml10
-rw-r--r--doc/reference/shell/tmpl/e-util.sgml9
-rw-r--r--doc/reference/shell/tmpl/eshell-unused.sgml8
5 files changed, 24 insertions, 9 deletions
diff --git a/doc/reference/shell/tmpl/e-extensible.sgml b/doc/reference/shell/tmpl/e-extensible.sgml
index 46104318d8..333d8238fc 100644
--- a/doc/reference/shell/tmpl/e-extensible.sgml
+++ b/doc/reference/shell/tmpl/e-extensible.sgml
@@ -17,6 +17,9 @@ EExtensible
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT EExtensible ##### -->
<para>
diff --git a/doc/reference/shell/tmpl/e-extension.sgml b/doc/reference/shell/tmpl/e-extension.sgml
index 59c3aa0edd..49a3a13b70 100644
--- a/doc/reference/shell/tmpl/e-extension.sgml
+++ b/doc/reference/shell/tmpl/e-extension.sgml
@@ -17,6 +17,9 @@ EExtension
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT EExtension ##### -->
<para>
diff --git a/doc/reference/shell/tmpl/e-shell.sgml b/doc/reference/shell/tmpl/e-shell.sgml
index 668ba80164..2287392fee 100644
--- a/doc/reference/shell/tmpl/e-shell.sgml
+++ b/doc/reference/shell/tmpl/e-shell.sgml
@@ -107,6 +107,11 @@ EShell
</para>
+<!-- ##### ARG EShell:meego-mode ##### -->
+<para>
+
+</para>
+
<!-- ##### ARG EShell:module-directory ##### -->
<para>
@@ -127,6 +132,11 @@ EShell
</para>
+<!-- ##### ARG EShell:small-screen-mode ##### -->
+<para>
+
+</para>
+
<!-- ##### FUNCTION e_shell_get_default ##### -->
<para>
diff --git a/doc/reference/shell/tmpl/e-util.sgml b/doc/reference/shell/tmpl/e-util.sgml
index 5b138cd373..e140452d0b 100644
--- a/doc/reference/shell/tmpl/e-util.sgml
+++ b/doc/reference/shell/tmpl/e-util.sgml
@@ -29,15 +29,6 @@ Miscellaneous Utilities
@Returns:
-<!-- ##### FUNCTION e_get_gnome2_user_dir ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
<!-- ##### FUNCTION e_get_accels_filename ##### -->
<para>
diff --git a/doc/reference/shell/tmpl/eshell-unused.sgml b/doc/reference/shell/tmpl/eshell-unused.sgml
index 93f3a149fa..1cb81172df 100644
--- a/doc/reference/shell/tmpl/eshell-unused.sgml
+++ b/doc/reference/shell/tmpl/eshell-unused.sgml
@@ -4,6 +4,14 @@
</para>
+<!-- ##### FUNCTION e_get_gnome2_user_dir ##### -->
+<para>
+
+</para>
+
+@void:
+@Returns:
+
<!-- ##### FUNCTION e_shell_content_get_search_name ##### -->
<para>