summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2013-10-31 14:10:34 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2013-10-31 14:15:01 +0000
commita287aef2ae7c401b082dca0dfa00e9996d69b9a1 (patch)
tree6b012a463e8ea854b3d160a2de7ac4035a62f0d2
parent9bde9a0b3cf6e1971705308ca2cba5cdcd0cd9b2 (diff)
Move doc/ to docs/
This is consistent with telepathy-glib.
-rw-r--r--.gitignore26
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac6
-rw-r--r--docs/Makefile.am (renamed from doc/Makefile.am)0
-rw-r--r--docs/reference/Makefile.am (renamed from doc/reference/Makefile.am)0
-rw-r--r--docs/reference/libtelepathy-logger/Makefile.am (renamed from doc/reference/libtelepathy-logger/Makefile.am)0
-rw-r--r--docs/reference/libtelepathy-logger/docs.xml (renamed from doc/reference/libtelepathy-logger/docs.xml)0
-rw-r--r--docs/templates/devhelp.devhelp2 (renamed from doc/templates/devhelp.devhelp2)0
-rw-r--r--docs/templates/errors.html (renamed from doc/templates/errors.html)0
-rw-r--r--docs/templates/fullindex.html (renamed from doc/templates/fullindex.html)0
-rw-r--r--docs/templates/generic-types.html (renamed from doc/templates/generic-types.html)0
-rw-r--r--docs/templates/index.html (renamed from doc/templates/index.html)0
-rw-r--r--docs/templates/interface.html (renamed from doc/templates/interface.html)0
-rw-r--r--docs/templates/interfaces.html (renamed from doc/templates/interfaces.html)0
-rw-r--r--docs/templates/style.css (renamed from doc/templates/style.css)0
15 files changed, 17 insertions, 17 deletions
diff --git a/.gitignore b/.gitignore
index b9e474d6a..6aa207b1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,19 +54,19 @@ cscope.out
/data/org.freedesktop.Telepathy.Logger.gschema.valid
/data/org.freedesktop.Telepathy.Logger.gschema.xml
-/doc/reference/libtelepathy-logger/*.stamp
-/doc/reference/libtelepathy-logger/*.bak
-/doc/reference/libtelepathy-logger/html/
-/doc/reference/libtelepathy-logger/telepathy-logger-*.bak
-/doc/reference/libtelepathy-logger/telepathy-logger-*.txt
-/doc/reference/libtelepathy-logger/telepathy-logger.args
-/doc/reference/libtelepathy-logger/telepathy-logger.hierarchy
-/doc/reference/libtelepathy-logger/telepathy-logger.interfaces
-/doc/reference/libtelepathy-logger/telepathy-logger.prerequisites
-/doc/reference/libtelepathy-logger/telepathy-logger.signals
-/doc/reference/libtelepathy-logger/telepathy-logger.types
-/doc/reference/libtelepathy-logger/tmpl/
-/doc/reference/libtelepathy-logger/xml/
+/docs/reference/libtelepathy-logger/*.stamp
+/docs/reference/libtelepathy-logger/*.bak
+/docs/reference/libtelepathy-logger/html/
+/docs/reference/libtelepathy-logger/telepathy-logger-*.bak
+/docs/reference/libtelepathy-logger/telepathy-logger-*.txt
+/docs/reference/libtelepathy-logger/telepathy-logger.args
+/docs/reference/libtelepathy-logger/telepathy-logger.hierarchy
+/docs/reference/libtelepathy-logger/telepathy-logger.interfaces
+/docs/reference/libtelepathy-logger/telepathy-logger.prerequisites
+/docs/reference/libtelepathy-logger/telepathy-logger.signals
+/docs/reference/libtelepathy-logger/telepathy-logger.types
+/docs/reference/libtelepathy-logger/tmpl/
+/docs/reference/libtelepathy-logger/xml/
/extensions/tpl-extensions.pc
/extensions/_gen/
diff --git a/Makefile.am b/Makefile.am
index 168d20d0d..c025ab047 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = tools extensions telepathy-logger data src tests doc po
+SUBDIRS = tools extensions telepathy-logger data src tests docs po
ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index d8fe0cc41..16a297fde 100644
--- a/configure.ac
+++ b/configure.ac
@@ -203,9 +203,9 @@ AM_CONDITIONAL([ENABLE_INSTALLED_TESTS], false)
AC_CONFIG_FILES([
Makefile
data/Makefile
- doc/Makefile
- doc/reference/Makefile
- doc/reference/libtelepathy-logger/Makefile
+ docs/Makefile
+ docs/reference/Makefile
+ docs/reference/libtelepathy-logger/Makefile
extensions/Makefile
extensions/tpl-extensions.pc
po/Makefile.in
diff --git a/doc/Makefile.am b/docs/Makefile.am
index 9fc661826..9fc661826 100644
--- a/doc/Makefile.am
+++ b/docs/Makefile.am
diff --git a/doc/reference/Makefile.am b/docs/reference/Makefile.am
index 84b5d8be1..84b5d8be1 100644
--- a/doc/reference/Makefile.am
+++ b/docs/reference/Makefile.am
diff --git a/doc/reference/libtelepathy-logger/Makefile.am b/docs/reference/libtelepathy-logger/Makefile.am
index 472e6b24e..472e6b24e 100644
--- a/doc/reference/libtelepathy-logger/Makefile.am
+++ b/docs/reference/libtelepathy-logger/Makefile.am
diff --git a/doc/reference/libtelepathy-logger/docs.xml b/docs/reference/libtelepathy-logger/docs.xml
index dd1d09da2..dd1d09da2 100644
--- a/doc/reference/libtelepathy-logger/docs.xml
+++ b/docs/reference/libtelepathy-logger/docs.xml
diff --git a/doc/templates/devhelp.devhelp2 b/docs/templates/devhelp.devhelp2
index af327fa6d..af327fa6d 100644
--- a/doc/templates/devhelp.devhelp2
+++ b/docs/templates/devhelp.devhelp2
diff --git a/doc/templates/errors.html b/docs/templates/errors.html
index 907d6601c..907d6601c 100644
--- a/doc/templates/errors.html
+++ b/docs/templates/errors.html
diff --git a/doc/templates/fullindex.html b/docs/templates/fullindex.html
index 2c465e1dd..2c465e1dd 100644
--- a/doc/templates/fullindex.html
+++ b/docs/templates/fullindex.html
diff --git a/doc/templates/generic-types.html b/docs/templates/generic-types.html
index 0bb209e43..0bb209e43 100644
--- a/doc/templates/generic-types.html
+++ b/docs/templates/generic-types.html
diff --git a/doc/templates/index.html b/docs/templates/index.html
index efc38d4e8..efc38d4e8 100644
--- a/doc/templates/index.html
+++ b/docs/templates/index.html
diff --git a/doc/templates/interface.html b/docs/templates/interface.html
index 42ad0cee6..42ad0cee6 100644
--- a/doc/templates/interface.html
+++ b/docs/templates/interface.html
diff --git a/doc/templates/interfaces.html b/docs/templates/interfaces.html
index a93334c65..a93334c65 100644
--- a/doc/templates/interfaces.html
+++ b/docs/templates/interfaces.html
diff --git a/doc/templates/style.css b/docs/templates/style.css
index 964d88bd4..964d88bd4 100644
--- a/doc/templates/style.css
+++ b/docs/templates/style.css