[nautilus-actions] Rename doc/ subdirectory to docs/



commit 37d9f3bb6d8530c7ffdedb48f00027f90990ad0f
Author: Pierre Wieser <pwieser trychlos org>
Date:   Fri Dec 3 20:54:51 2010 +0100

    Rename doc/ subdirectory to docs/

 ChangeLog                                          |    6 ++++
 Makefile.am                                        |    2 +-
 configure.ac                                       |   12 ++++----
 {doc => docs}/.gitignore                           |    0
 {doc => docs}/Makefile.am                          |    0
 {doc => docs}/README                               |    0
 {doc => docs}/api/.gitignore                       |    0
 {doc => docs}/api/Makefile.am                      |    0
 {doc => docs}/api/nautilus-actions-docs.xml        |    0
 {doc => docs}/api/nautilus-actions-sections.txt    |    0
 {doc => docs}/api/version.xml.in                   |    0
 {doc => docs}/des-ema/des-ema-0.12                 |    0
 {doc => docs}/des-ema/des-ema-0.13                 |    0
 {doc => docs}/des-ema/des-ema-0.14                 |    0
 {doc => docs}/des-ema/des-ema-0.15                 |    0
 {doc => docs}/export-format-id                     |    0
 {doc => docs}/internals/Makefile.am                |    0
 {doc => docs}/io-provider-id                       |    0
 {doc => docs}/nact/.gitignore                      |    0
 {doc => docs}/nact/C/appendix-gnu-fdl-1.3.xml      |    0
 {doc => docs}/nact/C/articleinfo.xml               |    0
 {doc => docs}/nact/C/figures/add.png               |  Bin 685 -> 685 bytes
 {doc => docs}/nact/C/figures/nact-action-tab.png   |  Bin 49521 -> 49521 bytes
 .../nact/C/figures/nact-basenames-tab.png          |  Bin 42631 -> 42631 bytes
 .../nact/C/figures/nact-capabilities-tab.png       |  Bin 41077 -> 41077 bytes
 {doc => docs}/nact/C/figures/nact-command-tab.png  |  Bin 49332 -> 49332 bytes
 .../C/figures/nact-desktop-environment-frame.png   |  Bin 33139 -> 33139 bytes
 .../nact/C/figures/nact-environment-tab.png        |  Bin 63606 -> 63606 bytes
 .../nact/C/figures/nact-exec-mode-frame.png        |  Bin 25664 -> 25664 bytes
 .../nact/C/figures/nact-execute-as-frame.png       |  Bin 13855 -> 13855 bytes
 .../C/figures/nact-execution-environment-frame.png |  Bin 26667 -> 26667 bytes
 .../nact/C/figures/nact-execution-tab.png          |  Bin 42871 -> 42871 bytes
 {doc => docs}/nact/C/figures/nact-folders-tab.png  |  Bin 43157 -> 43157 bytes
 {doc => docs}/nact/C/figures/nact-legend.png       |  Bin 28801 -> 28801 bytes
 {doc => docs}/nact/C/figures/nact-main-empty.png   |  Bin 43137 -> 43137 bytes
 .../nact/C/figures/nact-mimetypes-tab.png          |  Bin 41550 -> 41550 bytes
 .../nact/C/figures/nact-new-capability.png         |  Bin 14472 -> 14472 bytes
 {doc => docs}/nact/C/figures/nact-new-scheme.png   |  Bin 13267 -> 13267 bytes
 .../nact/C/figures/nact-preferences-export.png     |  Bin 18269 -> 18269 bytes
 .../nact/C/figures/nact-preferences-import.png     |  Bin 21810 -> 21810 bytes
 .../C/figures/nact-preferences-io-providers.png    |  Bin 24044 -> 24044 bytes
 .../nact/C/figures/nact-preferences-runtime.png    |  Bin 21957 -> 21957 bytes
 .../nact/C/figures/nact-preferences-schemes.png    |  Bin 20406 -> 20406 bytes
 .../nact/C/figures/nact-preferences-ui.png         |  Bin 28383 -> 28383 bytes
 .../nact/C/figures/nact-properties-tab.png         |  Bin 42168 -> 42168 bytes
 {doc => docs}/nact/C/figures/nact-schemes-tab.png  |  Bin 42468 -> 42468 bytes
 .../nact/C/figures/nact-selection-count-frame.png  |  Bin 24839 -> 24839 bytes
 .../nact/C/figures/nact-startup-mode-frame.png     |  Bin 16873 -> 16873 bytes
 .../nact/C/figures/nact-target-location.png        |  Bin 43383 -> 43383 bytes
 .../C/figures/nact-working-directory-frame.png     |  Bin 19930 -> 19930 bytes
 {doc => docs}/nact/C/figures/read-only.png         |  Bin 1363 -> 1363 bytes
 {doc => docs}/nact/C/figures/remove.png            |  Bin 559 -> 559 bytes
 {doc => docs}/nact/C/figures/sort-asc.png          |  Bin 923 -> 923 bytes
 .../nact/C/figures/sort-buttons-frame.png          |  Bin 14202 -> 14202 bytes
 {doc => docs}/nact/C/figures/sort-desc.png         |  Bin 940 -> 940 bytes
 {doc => docs}/nact/C/figures/sort-manual.png       |  Bin 1051 -> 1051 bytes
 .../nact/C/figures/start-context-menu-nautilus.png |  Bin 56462 -> 56462 bytes
 .../nact/C/figures/start-context-menu.png          |  Bin 150831 -> 150831 bytes
 .../nact/C/figures/start-zenity-result.png         |  Bin 9882 -> 9882 bytes
 {doc => docs}/nact/C/legalnotice.xml               |    0
 {doc => docs}/nact/C/nact-bugs.xml                 |    0
 {doc => docs}/nact/C/nact-conditions.xml           |    0
 {doc => docs}/nact/C/nact-edit.xml                 |    0
 {doc => docs}/nact/C/nact-execution.xml            |    0
 {doc => docs}/nact/C/nact-export.xml               |    0
 {doc => docs}/nact/C/nact-import.xml               |    0
 {doc => docs}/nact/C/nact-menus.xml                |    0
 {doc => docs}/nact/C/nact-misc.xml                 |    0
 {doc => docs}/nact/C/nact-prefs.xml                |    0
 {doc => docs}/nact/C/nact-profiles.xml             |    0
 {doc => docs}/nact/C/nact-save.xml                 |    0
 {doc => docs}/nact/C/nact-sorting.xml              |    0
 {doc => docs}/nact/C/nact-starting.xml             |    0
 {doc => docs}/nact/C/nact-where.xml                |    0
 .../nact/C/nautilus-actions-config-tool.xml        |    0
 {doc => docs}/nact/ChangeLog                       |    0
 {doc => docs}/nact/Makefile.am                     |   25 +++++++++++--------
 {doc => docs}/nact/de/de.po                        |    0
 {doc => docs}/nact/es/es.po                        |    0
 .../nact/nautilus-actions-config-tool.omf.in       |    0
 {doc => docs}/nact/sl/sl.po                        |    0
 {doc => docs}/objects-hierarchy.odg                |  Bin 17518 -> 17518 bytes
 {doc => docs}/product/Makefile.am                  |    0
 83 files changed, 27 insertions(+), 18 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 1837ce9..9a71cfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-12-03 Pierre Wieser <pwieser trychlos org>
 
+	Rename doc/ subdirectory to docs/.
+
+	* Makefile.am:
+	* configure.ac:
+	* docs/nact/Makefile.am: Updated accordingly.
+
 	* configure.ac: Post release version bump.
 
 	Releasing 3.0.2
diff --git a/Makefile.am b/Makefile.am
index a6dd514..6b7faa6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,7 +34,7 @@ SUBDIRS = \
 	src									\
 	po									\
 	data								\
-	doc									\
+	docs								\
 	$(NULL)
 
 # a foo directory so that make distcheck has a vpath which is prefixed
diff --git a/configure.ac b/configure.ac
index 4a23ea2..db91607 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,12 +44,12 @@ AC_CONFIG_FILES([
 	data/actions/Makefile
 	data/exports/Makefile
 	data/gconf-schemas/Makefile
-	doc/Makefile
-	doc/api/Makefile
-	doc/api/version.xml
-	doc/internals/Makefile
-	doc/nact/Makefile
-	doc/product/Makefile
+	docs/Makefile
+	docs/api/Makefile
+	docs/api/version.xml
+	docs/internals/Makefile
+	docs/nact/Makefile
+	docs/product/Makefile
 	m4/Makefile
 	icons/Makefile
 	icons/16x16/Makefile
diff --git a/doc/.gitignore b/docs/.gitignore
similarity index 100%
rename from doc/.gitignore
rename to docs/.gitignore
diff --git a/doc/Makefile.am b/docs/Makefile.am
similarity index 100%
rename from doc/Makefile.am
rename to docs/Makefile.am
diff --git a/doc/README b/docs/README
similarity index 100%
rename from doc/README
rename to docs/README
diff --git a/doc/api/.gitignore b/docs/api/.gitignore
similarity index 100%
rename from doc/api/.gitignore
rename to docs/api/.gitignore
diff --git a/doc/api/Makefile.am b/docs/api/Makefile.am
similarity index 100%
rename from doc/api/Makefile.am
rename to docs/api/Makefile.am
diff --git a/doc/api/nautilus-actions-docs.xml b/docs/api/nautilus-actions-docs.xml
similarity index 100%
rename from doc/api/nautilus-actions-docs.xml
rename to docs/api/nautilus-actions-docs.xml
diff --git a/doc/api/nautilus-actions-sections.txt b/docs/api/nautilus-actions-sections.txt
similarity index 100%
rename from doc/api/nautilus-actions-sections.txt
rename to docs/api/nautilus-actions-sections.txt
diff --git a/doc/api/version.xml.in b/docs/api/version.xml.in
similarity index 100%
rename from doc/api/version.xml.in
rename to docs/api/version.xml.in
diff --git a/doc/des-ema/des-ema-0.12 b/docs/des-ema/des-ema-0.12
similarity index 100%
rename from doc/des-ema/des-ema-0.12
rename to docs/des-ema/des-ema-0.12
diff --git a/doc/des-ema/des-ema-0.13 b/docs/des-ema/des-ema-0.13
similarity index 100%
rename from doc/des-ema/des-ema-0.13
rename to docs/des-ema/des-ema-0.13
diff --git a/doc/des-ema/des-ema-0.14 b/docs/des-ema/des-ema-0.14
similarity index 100%
rename from doc/des-ema/des-ema-0.14
rename to docs/des-ema/des-ema-0.14
diff --git a/doc/des-ema/des-ema-0.15 b/docs/des-ema/des-ema-0.15
similarity index 100%
rename from doc/des-ema/des-ema-0.15
rename to docs/des-ema/des-ema-0.15
diff --git a/doc/export-format-id b/docs/export-format-id
similarity index 100%
rename from doc/export-format-id
rename to docs/export-format-id
diff --git a/doc/internals/Makefile.am b/docs/internals/Makefile.am
similarity index 100%
rename from doc/internals/Makefile.am
rename to docs/internals/Makefile.am
diff --git a/doc/io-provider-id b/docs/io-provider-id
similarity index 100%
rename from doc/io-provider-id
rename to docs/io-provider-id
diff --git a/doc/nact/.gitignore b/docs/nact/.gitignore
similarity index 100%
rename from doc/nact/.gitignore
rename to docs/nact/.gitignore
diff --git a/doc/nact/C/appendix-gnu-fdl-1.3.xml b/docs/nact/C/appendix-gnu-fdl-1.3.xml
similarity index 100%
rename from doc/nact/C/appendix-gnu-fdl-1.3.xml
rename to docs/nact/C/appendix-gnu-fdl-1.3.xml
diff --git a/doc/nact/C/articleinfo.xml b/docs/nact/C/articleinfo.xml
similarity index 100%
rename from doc/nact/C/articleinfo.xml
rename to docs/nact/C/articleinfo.xml
diff --git a/doc/nact/C/figures/add.png b/docs/nact/C/figures/add.png
similarity index 100%
rename from doc/nact/C/figures/add.png
rename to docs/nact/C/figures/add.png
diff --git a/doc/nact/C/figures/nact-action-tab.png b/docs/nact/C/figures/nact-action-tab.png
similarity index 100%
rename from doc/nact/C/figures/nact-action-tab.png
rename to docs/nact/C/figures/nact-action-tab.png
diff --git a/doc/nact/C/figures/nact-basenames-tab.png b/docs/nact/C/figures/nact-basenames-tab.png
similarity index 100%
rename from doc/nact/C/figures/nact-basenames-tab.png
rename to docs/nact/C/figures/nact-basenames-tab.png
diff --git a/doc/nact/C/figures/nact-capabilities-tab.png b/docs/nact/C/figures/nact-capabilities-tab.png
similarity index 100%
rename from doc/nact/C/figures/nact-capabilities-tab.png
rename to docs/nact/C/figures/nact-capabilities-tab.png
diff --git a/doc/nact/C/figures/nact-command-tab.png b/docs/nact/C/figures/nact-command-tab.png
similarity index 100%
rename from doc/nact/C/figures/nact-command-tab.png
rename to docs/nact/C/figures/nact-command-tab.png
diff --git a/doc/nact/C/figures/nact-desktop-environment-frame.png b/docs/nact/C/figures/nact-desktop-environment-frame.png
similarity index 100%
rename from doc/nact/C/figures/nact-desktop-environment-frame.png
rename to docs/nact/C/figures/nact-desktop-environment-frame.png
diff --git a/doc/nact/C/figures/nact-environment-tab.png b/docs/nact/C/figures/nact-environment-tab.png
similarity index 100%
rename from doc/nact/C/figures/nact-environment-tab.png
rename to docs/nact/C/figures/nact-environment-tab.png
diff --git a/doc/nact/C/figures/nact-exec-mode-frame.png b/docs/nact/C/figures/nact-exec-mode-frame.png
similarity index 100%
rename from doc/nact/C/figures/nact-exec-mode-frame.png
rename to docs/nact/C/figures/nact-exec-mode-frame.png
diff --git a/doc/nact/C/figures/nact-execute-as-frame.png b/docs/nact/C/figures/nact-execute-as-frame.png
similarity index 100%
rename from doc/nact/C/figures/nact-execute-as-frame.png
rename to docs/nact/C/figures/nact-execute-as-frame.png
diff --git a/doc/nact/C/figures/nact-execution-environment-frame.png b/docs/nact/C/figures/nact-execution-environment-frame.png
similarity index 100%
rename from doc/nact/C/figures/nact-execution-environment-frame.png
rename to docs/nact/C/figures/nact-execution-environment-frame.png
diff --git a/doc/nact/C/figures/nact-execution-tab.png b/docs/nact/C/figures/nact-execution-tab.png
similarity index 100%
rename from doc/nact/C/figures/nact-execution-tab.png
rename to docs/nact/C/figures/nact-execution-tab.png
diff --git a/doc/nact/C/figures/nact-folders-tab.png b/docs/nact/C/figures/nact-folders-tab.png
similarity index 100%
rename from doc/nact/C/figures/nact-folders-tab.png
rename to docs/nact/C/figures/nact-folders-tab.png
diff --git a/doc/nact/C/figures/nact-legend.png b/docs/nact/C/figures/nact-legend.png
similarity index 100%
rename from doc/nact/C/figures/nact-legend.png
rename to docs/nact/C/figures/nact-legend.png
diff --git a/doc/nact/C/figures/nact-main-empty.png b/docs/nact/C/figures/nact-main-empty.png
similarity index 100%
rename from doc/nact/C/figures/nact-main-empty.png
rename to docs/nact/C/figures/nact-main-empty.png
diff --git a/doc/nact/C/figures/nact-mimetypes-tab.png b/docs/nact/C/figures/nact-mimetypes-tab.png
similarity index 100%
rename from doc/nact/C/figures/nact-mimetypes-tab.png
rename to docs/nact/C/figures/nact-mimetypes-tab.png
diff --git a/doc/nact/C/figures/nact-new-capability.png b/docs/nact/C/figures/nact-new-capability.png
similarity index 100%
rename from doc/nact/C/figures/nact-new-capability.png
rename to docs/nact/C/figures/nact-new-capability.png
diff --git a/doc/nact/C/figures/nact-new-scheme.png b/docs/nact/C/figures/nact-new-scheme.png
similarity index 100%
rename from doc/nact/C/figures/nact-new-scheme.png
rename to docs/nact/C/figures/nact-new-scheme.png
diff --git a/doc/nact/C/figures/nact-preferences-export.png b/docs/nact/C/figures/nact-preferences-export.png
similarity index 100%
rename from doc/nact/C/figures/nact-preferences-export.png
rename to docs/nact/C/figures/nact-preferences-export.png
diff --git a/doc/nact/C/figures/nact-preferences-import.png b/docs/nact/C/figures/nact-preferences-import.png
similarity index 100%
rename from doc/nact/C/figures/nact-preferences-import.png
rename to docs/nact/C/figures/nact-preferences-import.png
diff --git a/doc/nact/C/figures/nact-preferences-io-providers.png b/docs/nact/C/figures/nact-preferences-io-providers.png
similarity index 100%
rename from doc/nact/C/figures/nact-preferences-io-providers.png
rename to docs/nact/C/figures/nact-preferences-io-providers.png
diff --git a/doc/nact/C/figures/nact-preferences-runtime.png b/docs/nact/C/figures/nact-preferences-runtime.png
similarity index 100%
rename from doc/nact/C/figures/nact-preferences-runtime.png
rename to docs/nact/C/figures/nact-preferences-runtime.png
diff --git a/doc/nact/C/figures/nact-preferences-schemes.png b/docs/nact/C/figures/nact-preferences-schemes.png
similarity index 100%
rename from doc/nact/C/figures/nact-preferences-schemes.png
rename to docs/nact/C/figures/nact-preferences-schemes.png
diff --git a/doc/nact/C/figures/nact-preferences-ui.png b/docs/nact/C/figures/nact-preferences-ui.png
similarity index 100%
rename from doc/nact/C/figures/nact-preferences-ui.png
rename to docs/nact/C/figures/nact-preferences-ui.png
diff --git a/doc/nact/C/figures/nact-properties-tab.png b/docs/nact/C/figures/nact-properties-tab.png
similarity index 100%
rename from doc/nact/C/figures/nact-properties-tab.png
rename to docs/nact/C/figures/nact-properties-tab.png
diff --git a/doc/nact/C/figures/nact-schemes-tab.png b/docs/nact/C/figures/nact-schemes-tab.png
similarity index 100%
rename from doc/nact/C/figures/nact-schemes-tab.png
rename to docs/nact/C/figures/nact-schemes-tab.png
diff --git a/doc/nact/C/figures/nact-selection-count-frame.png b/docs/nact/C/figures/nact-selection-count-frame.png
similarity index 100%
rename from doc/nact/C/figures/nact-selection-count-frame.png
rename to docs/nact/C/figures/nact-selection-count-frame.png
diff --git a/doc/nact/C/figures/nact-startup-mode-frame.png b/docs/nact/C/figures/nact-startup-mode-frame.png
similarity index 100%
rename from doc/nact/C/figures/nact-startup-mode-frame.png
rename to docs/nact/C/figures/nact-startup-mode-frame.png
diff --git a/doc/nact/C/figures/nact-target-location.png b/docs/nact/C/figures/nact-target-location.png
similarity index 100%
rename from doc/nact/C/figures/nact-target-location.png
rename to docs/nact/C/figures/nact-target-location.png
diff --git a/doc/nact/C/figures/nact-working-directory-frame.png b/docs/nact/C/figures/nact-working-directory-frame.png
similarity index 100%
rename from doc/nact/C/figures/nact-working-directory-frame.png
rename to docs/nact/C/figures/nact-working-directory-frame.png
diff --git a/doc/nact/C/figures/read-only.png b/docs/nact/C/figures/read-only.png
similarity index 100%
rename from doc/nact/C/figures/read-only.png
rename to docs/nact/C/figures/read-only.png
diff --git a/doc/nact/C/figures/remove.png b/docs/nact/C/figures/remove.png
similarity index 100%
rename from doc/nact/C/figures/remove.png
rename to docs/nact/C/figures/remove.png
diff --git a/doc/nact/C/figures/sort-asc.png b/docs/nact/C/figures/sort-asc.png
similarity index 100%
rename from doc/nact/C/figures/sort-asc.png
rename to docs/nact/C/figures/sort-asc.png
diff --git a/doc/nact/C/figures/sort-buttons-frame.png b/docs/nact/C/figures/sort-buttons-frame.png
similarity index 100%
rename from doc/nact/C/figures/sort-buttons-frame.png
rename to docs/nact/C/figures/sort-buttons-frame.png
diff --git a/doc/nact/C/figures/sort-desc.png b/docs/nact/C/figures/sort-desc.png
similarity index 100%
rename from doc/nact/C/figures/sort-desc.png
rename to docs/nact/C/figures/sort-desc.png
diff --git a/doc/nact/C/figures/sort-manual.png b/docs/nact/C/figures/sort-manual.png
similarity index 100%
rename from doc/nact/C/figures/sort-manual.png
rename to docs/nact/C/figures/sort-manual.png
diff --git a/doc/nact/C/figures/start-context-menu-nautilus.png b/docs/nact/C/figures/start-context-menu-nautilus.png
similarity index 100%
rename from doc/nact/C/figures/start-context-menu-nautilus.png
rename to docs/nact/C/figures/start-context-menu-nautilus.png
diff --git a/doc/nact/C/figures/start-context-menu.png b/docs/nact/C/figures/start-context-menu.png
similarity index 100%
rename from doc/nact/C/figures/start-context-menu.png
rename to docs/nact/C/figures/start-context-menu.png
diff --git a/doc/nact/C/figures/start-zenity-result.png b/docs/nact/C/figures/start-zenity-result.png
similarity index 100%
rename from doc/nact/C/figures/start-zenity-result.png
rename to docs/nact/C/figures/start-zenity-result.png
diff --git a/doc/nact/C/legalnotice.xml b/docs/nact/C/legalnotice.xml
similarity index 100%
rename from doc/nact/C/legalnotice.xml
rename to docs/nact/C/legalnotice.xml
diff --git a/doc/nact/C/nact-bugs.xml b/docs/nact/C/nact-bugs.xml
similarity index 100%
rename from doc/nact/C/nact-bugs.xml
rename to docs/nact/C/nact-bugs.xml
diff --git a/doc/nact/C/nact-conditions.xml b/docs/nact/C/nact-conditions.xml
similarity index 100%
rename from doc/nact/C/nact-conditions.xml
rename to docs/nact/C/nact-conditions.xml
diff --git a/doc/nact/C/nact-edit.xml b/docs/nact/C/nact-edit.xml
similarity index 100%
rename from doc/nact/C/nact-edit.xml
rename to docs/nact/C/nact-edit.xml
diff --git a/doc/nact/C/nact-execution.xml b/docs/nact/C/nact-execution.xml
similarity index 100%
rename from doc/nact/C/nact-execution.xml
rename to docs/nact/C/nact-execution.xml
diff --git a/doc/nact/C/nact-export.xml b/docs/nact/C/nact-export.xml
similarity index 100%
rename from doc/nact/C/nact-export.xml
rename to docs/nact/C/nact-export.xml
diff --git a/doc/nact/C/nact-import.xml b/docs/nact/C/nact-import.xml
similarity index 100%
rename from doc/nact/C/nact-import.xml
rename to docs/nact/C/nact-import.xml
diff --git a/doc/nact/C/nact-menus.xml b/docs/nact/C/nact-menus.xml
similarity index 100%
rename from doc/nact/C/nact-menus.xml
rename to docs/nact/C/nact-menus.xml
diff --git a/doc/nact/C/nact-misc.xml b/docs/nact/C/nact-misc.xml
similarity index 100%
rename from doc/nact/C/nact-misc.xml
rename to docs/nact/C/nact-misc.xml
diff --git a/doc/nact/C/nact-prefs.xml b/docs/nact/C/nact-prefs.xml
similarity index 100%
rename from doc/nact/C/nact-prefs.xml
rename to docs/nact/C/nact-prefs.xml
diff --git a/doc/nact/C/nact-profiles.xml b/docs/nact/C/nact-profiles.xml
similarity index 100%
rename from doc/nact/C/nact-profiles.xml
rename to docs/nact/C/nact-profiles.xml
diff --git a/doc/nact/C/nact-save.xml b/docs/nact/C/nact-save.xml
similarity index 100%
rename from doc/nact/C/nact-save.xml
rename to docs/nact/C/nact-save.xml
diff --git a/doc/nact/C/nact-sorting.xml b/docs/nact/C/nact-sorting.xml
similarity index 100%
rename from doc/nact/C/nact-sorting.xml
rename to docs/nact/C/nact-sorting.xml
diff --git a/doc/nact/C/nact-starting.xml b/docs/nact/C/nact-starting.xml
similarity index 100%
rename from doc/nact/C/nact-starting.xml
rename to docs/nact/C/nact-starting.xml
diff --git a/doc/nact/C/nact-where.xml b/docs/nact/C/nact-where.xml
similarity index 100%
rename from doc/nact/C/nact-where.xml
rename to docs/nact/C/nact-where.xml
diff --git a/doc/nact/C/nautilus-actions-config-tool.xml b/docs/nact/C/nautilus-actions-config-tool.xml
similarity index 100%
rename from doc/nact/C/nautilus-actions-config-tool.xml
rename to docs/nact/C/nautilus-actions-config-tool.xml
diff --git a/doc/nact/ChangeLog b/docs/nact/ChangeLog
similarity index 100%
rename from doc/nact/ChangeLog
rename to docs/nact/ChangeLog
diff --git a/doc/nact/Makefile.am b/docs/nact/Makefile.am
similarity index 94%
rename from doc/nact/Makefile.am
rename to docs/nact/Makefile.am
index de45e74..dba7a1c 100644
--- a/doc/nact/Makefile.am
+++ b/docs/nact/Makefile.am
@@ -44,7 +44,7 @@
 # are always included in the distributed tarball.
 #
 # Note that gnome-doc-tool generates and distributes the translated xml
-# files in doc/nact/<lang>/. When installing, g-d-t installs these help
+# files in $(nactdir)/<lang>/. When installing, g-d-t installs these help
 # files in <datadir>/gnome/help/nautilus-actions-config-tool/<lang>.
 # At install time, missing tranlated images are replace with symlinks to
 # ../../C/figures/<image.png>.
@@ -118,6 +118,8 @@ DOC_LINGUAS = de es sl
 
 pkgdocdir = $(datarootdir)/doc/@PACKAGE -@VERSION@
 
+nactdir := docs/nact
+
 all-local: all-manuals
 
 .PHONY: all-manuals
@@ -216,7 +218,8 @@ install-html-manuals: all-html-manuals install-html-figs install-html-admon
 		else \
 			_instdir="$(DESTDIR)$(htmldir)/$$lc/nact"; \
 		fi; \
-		_srcdir="$(top_builddir)/doc/nact/$$lc/html"; \
+		_srcdir="$(top_builddir)/$(nactdir)/$$lc/html"; \
+		echo "_srcdir=$$_srcdir"; \
 		if test -f "$$_srcdir/$(DOC_MODULE).html"; then \
 			cp -vrp $$_srcdir/* $$_instdir/; \
 		fi; \
@@ -230,10 +233,10 @@ install-html-figs:
 	else \
 		_instdir="$(DESTDIR)$(htmldir)"; \
 	fi; \
-	_srcdir="$(top_srcdir)/doc/nact"; \
+	_srcdir="$(top_srcdir)/$(nactdir)"; \
 	list='$(patsubst C/%,%,$(_DOC_C_FIGURES))'; \
 	for lc in C $(_DOC_REAL_LINGUAS); do \
-	  if test -f "$(top_builddir)/doc/nact/$$lc/html/$(DOC_MODULE).html"; then \
+	  if test -f "$(top_builddir)/$(nactdir)/$$lc/html/$(DOC_MODULE).html"; then \
 		for fig in $$list; do \
 			figsymlink=false; \
 			if test -f "$$_srcdir/$$lc/$$fig" -a ! -h "$$_srcdir/$$lc/$$fig"; then \
@@ -267,7 +270,7 @@ install-html-admon:
 			_instdir="$(DESTDIR)$(htmldir)"; \
 		fi; \
 		for lc in C $(_DOC_REAL_LINGUAS); do \
-			if test -f "$(top_builddir)/doc/nact/$$lc/html/$(DOC_MODULE).html"; then \
+			if test -f "$(top_builddir)/$(nactdir)/$$lc/html/$(DOC_MODULE).html"; then \
 				$(mkinstalldirs) "$$_instdir/$$lc/nact/admon"; \
 				cp -v $(admon_png) "$$_instdir/$$lc/nact/admon/"; \
 			fi; \
@@ -288,8 +291,8 @@ uninstall-html-manuals:
 # - distribute admon-* icons
 dist-html-manuals-hook: all-html-manuals
 	for lc in C $(_DOC_REAL_LINGUAS); do \
-		if test -f $(top_builddir)/doc/nact/$$lc/html/$(DOC_MODULE).html; then \
-			cp -rpv $(top_builddir)/doc/nact/$$lc/html $(distdir)/$$lc/; \
+		if test -f $(top_builddir)/$(nactdir)/$$lc/html/$(DOC_MODULE).html; then \
+			cp -rpv $(top_builddir)/$(nactdir)/$$lc/html $(distdir)/$$lc/; \
 		fi; \
 		if test -d "$(admon_dir)"; then \
 			$(mkinstalldirs) "$(distdir)/$$lc/html/admon"; \
@@ -327,8 +330,8 @@ pdf.stamp: $(_DOC_LC_DOCS)
 	        fi; \
 	      done; \
 	    fi; \
-		echo "dblatex --output $$_target $(top_srcdir)/doc/nact/$$lc/$(DOC_MODULE).xml"; \
-		dblatex --output $$_target $(top_srcdir)/doc/nact/$$lc/$(DOC_MODULE).xml; \
+		echo "dblatex --output $$_target $(top_srcdir)/$(nactdir)/$$lc/$(DOC_MODULE).xml"; \
+		dblatex --output $$_target $(top_srcdir)/$(nactdir)/$$lc/$(DOC_MODULE).xml; \
 		if [ "$$lc" != "C" ]; then \
 		  for i in `find $$lc/figures -type l`; do rm -f $$i; done; \
 		fi; \
@@ -341,7 +344,7 @@ pdf.stamp: $(_DOC_LC_DOCS)
 # as pdf are monobloc documents, we do not create a per-document subdir
 install-pdf-manuals: all-pdf-manuals
 	@-for lc in C $(_DOC_REAL_LINGUAS); do \
-		_srcdir=$(top_builddir)/doc/nact/$$lc; \
+		_srcdir=$(top_builddir)/$(nactdir)/$$lc; \
 		if test "$(pdfdir)" = "$(docdir)"; then \
 			_instdir=$(DESTDIR)$(pkgdocdir)/pdf/$$lc; \
 		else \
@@ -362,7 +365,7 @@ uninstall-pdf-manuals:
 
 dist-pdf-manuals-hook: all-pdf-manuals
 	for _lc in C $(_DOC_REAL_LINGUAS); do \
-		cp -v $(top_builddir)/doc/nact/$$_lc/$(DOC_MODULE).pdf $(distdir)/$$_lc/ || :; \
+		cp -v $(top_builddir)/$(nactdir)/$$_lc/$(DOC_MODULE).pdf $(distdir)/$$_lc/ || :; \
 	done
 
 dist-manuals-hooks:
diff --git a/doc/nact/de/de.po b/docs/nact/de/de.po
similarity index 100%
rename from doc/nact/de/de.po
rename to docs/nact/de/de.po
diff --git a/doc/nact/es/es.po b/docs/nact/es/es.po
similarity index 100%
rename from doc/nact/es/es.po
rename to docs/nact/es/es.po
diff --git a/doc/nact/nautilus-actions-config-tool.omf.in b/docs/nact/nautilus-actions-config-tool.omf.in
similarity index 100%
rename from doc/nact/nautilus-actions-config-tool.omf.in
rename to docs/nact/nautilus-actions-config-tool.omf.in
diff --git a/doc/nact/sl/sl.po b/docs/nact/sl/sl.po
similarity index 100%
rename from doc/nact/sl/sl.po
rename to docs/nact/sl/sl.po
diff --git a/doc/objects-hierarchy.odg b/docs/objects-hierarchy.odg
similarity index 100%
rename from doc/objects-hierarchy.odg
rename to docs/objects-hierarchy.odg
diff --git a/doc/product/Makefile.am b/docs/product/Makefile.am
similarity index 100%
rename from doc/product/Makefile.am
rename to docs/product/Makefile.am



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]