docs: moved all content from main into manuals

- deleted not needed files - adapted script paths
bareos · May 16, 2019 · 20ceeaf · 20ceeaf
1 parent de8134f
commit 20ceeaf
Show file tree

Hide file tree

Showing 1,138 changed files with 12 additions and 359 deletions.
diff --git a/docs/manuals/main/Makefile → docs/manuals/Makefile b/docs/manuals/main/Makefile → docs/manuals/Makefile
@@ -1,18 +1,18 @@
 
 MKDIR=mkdir -p
-BAREOS_DIR=../../../../bareos-master/b/systemtests/sbin/bareos-dir
-BAREOS_SD=../../../../bareos-master/b/systemtests/sbin/bareos-sd
-BAREOS_FD=../../../../bareos-master/b/systemtests/sbin/bareos-fd
-BCONSOLE=../../../../bareos-master/b/systemtests/bin/bconsole
-BAREOS_TRAY_MONITOR=../../../../bareos-master/b/core/src/qt-tray-monitor/bareos-tray-monitor
+BAREOS_DIR=../../../bareos-master/b/systemtests/sbin/bareos-dir
+BAREOS_SD=../../../bareos-master/b/systemtests/sbin/bareos-sd
+BAREOS_FD=../../../bareos-master/b/systemtests/sbin/bareos-fd
+BCONSOLE=../../../bareos-master/b/systemtests/bin/bconsole
+BAREOS_TRAY_MONITOR=../../../bareos-master/b/core/src/qt-tray-monitor/bareos-tray-monitor
 
 GENERATED = include/autogenerated/bareos-dir-*.rst.inc \
 	include/autogenerated/bareos-sd-*.rst.inc \
 	include/autogenerated/bareos-fd-*.rst.inc \
 	include/autogenerated/bconsole-*.rst.inc \
 	include/autogenerated/bareos-tray-monitor-*.rst.inc
 
-GENERATE_RESOURCE_DESCRIPTIONS=../scripts/generate-resoure-descriptions.py --sphinx
+GENERATE_RESOURCE_DESCRIPTIONS=./scripts/generate-resoure-descriptions.py --sphinx
 
 
 # You can set these variables from the command line.

diff --git a/docs/manuals/main/autogenerated → docs/manuals/autogenerated b/docs/manuals/main/autogenerated → docs/manuals/autogenerated
diff --git a/docs/manuals/scripts/generate-bareos-package-info.py b/docs/manuals/scripts/generate-bareos-package-info.py
diff --git a/docs/manuals/scripts/generate-bareos-package-info.sh b/docs/manuals/scripts/generate-bareos-package-info.sh
diff --git a/docs/manuals/scripts/generate-resoure-descriptions.sh b/docs/manuals/scripts/generate-resoure-descriptions.sh
@@ -4,10 +4,10 @@ set -e
 set -u
 
 BASEDIR=`dirname $0`
-TARGETDIR="${BASEDIR}/../en/new_main_reference"
+TARGETDIR="${BASEDIR}"
 # relative from TARGETDIR
 SCRIPTDIR="../../scripts"
-DATADIR="../main/autogenerated"
+DATADIR="../autogenerated"
 
 cd ${TARGETDIR}
 

diff --git a/docs/manuals/main/source/Appendix.rst → docs/manuals/source/Appendix.rst b/docs/manuals/main/source/Appendix.rst → docs/manuals/source/Appendix.rst
diff --git a/...source/Appendix/BackwardCompatibility.rst → ...source/Appendix/BackwardCompatibility.rst b/...source/Appendix/BackwardCompatibility.rst → ...source/Appendix/BackwardCompatibility.rst
diff --git a/...x/BareosCopyrightTrademarkAndLicenses.rst → ...x/BareosCopyrightTrademarkAndLicenses.rst b/...x/BareosCopyrightTrademarkAndLicenses.rst → ...x/BareosCopyrightTrademarkAndLicenses.rst
diff --git a/...s/main/source/Appendix/BareosPrograms.rst → ...anuals/source/Appendix/BareosPrograms.rst b/...s/main/source/Appendix/BareosPrograms.rst → ...anuals/source/Appendix/BareosPrograms.rst
diff --git a/...ls/main/source/Appendix/CatalogTables.rst → ...manuals/source/Appendix/CatalogTables.rst b/...ls/main/source/Appendix/CatalogTables.rst → ...manuals/source/Appendix/CatalogTables.rst
diff --git a/...anuals/main/source/Appendix/Debugging.rst → docs/manuals/source/Appendix/Debugging.rst b/...anuals/main/source/Appendix/Debugging.rst → docs/manuals/source/Appendix/Debugging.rst
diff --git a/.../Appendix/DisasterRecoveryUsingBareos.rst → .../Appendix/DisasterRecoveryUsingBareos.rst b/.../Appendix/DisasterRecoveryUsingBareos.rst → .../Appendix/DisasterRecoveryUsingBareos.rst
diff --git a/docs/manuals/main/source/Appendix/Howtos.rst → docs/manuals/source/Appendix/Howtos.rst b/docs/manuals/main/source/Appendix/Howtos.rst → docs/manuals/source/Appendix/Howtos.rst
diff --git a/...main/source/Appendix/OperatingSystems.rst → ...uals/source/Appendix/OperatingSystems.rst b/...main/source/Appendix/OperatingSystems.rst → ...uals/source/Appendix/OperatingSystems.rst
diff --git a/...als/main/source/Appendix/ReleaseNotes.rst → .../manuals/source/Appendix/ReleaseNotes.rst b/...als/main/source/Appendix/ReleaseNotes.rst → .../manuals/source/Appendix/ReleaseNotes.rst
diff --git a/...in/source/Appendix/SystemRequirements.rst → ...ls/source/Appendix/SystemRequirements.rst b/...in/source/Appendix/SystemRequirements.rst → ...ls/source/Appendix/SystemRequirements.rst
diff --git a/...main/source/Appendix/TheBootstrapFile.rst → ...uals/source/Appendix/TheBootstrapFile.rst b/...main/source/Appendix/TheBootstrapFile.rst → ...uals/source/Appendix/TheBootstrapFile.rst
diff --git a/.../main/source/Appendix/Troubleshooting.rst → ...nuals/source/Appendix/Troubleshooting.rst b/.../main/source/Appendix/Troubleshooting.rst → ...nuals/source/Appendix/Troubleshooting.rst
diff --git a/...ppendix/VerifyFileIntegrityWithBareos.rst → ...ppendix/VerifyFileIntegrityWithBareos.rst b/...ppendix/VerifyFileIntegrityWithBareos.rst → ...ppendix/VerifyFileIntegrityWithBareos.rst
diff --git a/...ce/Bareos_connection_modes_overview_1.csv → ...ce/Bareos_connection_modes_overview_1.csv b/...ce/Bareos_connection_modes_overview_1.csv → ...ce/Bareos_connection_modes_overview_1.csv
diff --git a/docs/manuals/main/source/Configuration.rst → docs/manuals/source/Configuration.rst b/docs/manuals/main/source/Configuration.rst → docs/manuals/source/Configuration.rst
diff --git a/...als/main/source/Configuration/Console.rst → .../manuals/source/Configuration/Console.rst b/...als/main/source/Configuration/Console.rst → .../manuals/source/Configuration/Console.rst
diff --git a/...iguration/CustomizingTheConfiguration.rst → ...iguration/CustomizingTheConfiguration.rst b/...iguration/CustomizingTheConfiguration.rst → ...iguration/CustomizingTheConfiguration.rst
diff --git a/...ls/main/source/Configuration/Director.rst → ...manuals/source/Configuration/Director.rst b/...ls/main/source/Configuration/Director.rst → ...manuals/source/Configuration/Director.rst
diff --git a/.../main/source/Configuration/FileDaemon.rst → ...nuals/source/Configuration/FileDaemon.rst b/.../main/source/Configuration/FileDaemon.rst → ...nuals/source/Configuration/FileDaemon.rst
diff --git a/...ls/main/source/Configuration/Messages.rst → ...manuals/source/Configuration/Messages.rst b/...ls/main/source/Configuration/Messages.rst → ...manuals/source/Configuration/Messages.rst
diff --git a/...als/main/source/Configuration/Monitor.rst → .../manuals/source/Configuration/Monitor.rst b/...als/main/source/Configuration/Monitor.rst → .../manuals/source/Configuration/Monitor.rst
diff --git a/...in/source/Configuration/StorageDaemon.rst → ...ls/source/Configuration/StorageDaemon.rst b/...in/source/Configuration/StorageDaemon.rst → ...ls/source/Configuration/StorageDaemon.rst
diff --git a/docs/manuals/main/source/DeveloperGuide.rst → docs/manuals/source/DeveloperGuide.rst b/docs/manuals/main/source/DeveloperGuide.rst → docs/manuals/source/DeveloperGuide.rst
diff --git a/...anuals/main/source/DeveloperGuide/api.rst → docs/manuals/source/DeveloperGuide/api.rst b/...anuals/main/source/DeveloperGuide/api.rst → docs/manuals/source/DeveloperGuide/api.rst
diff --git a/...ls/main/source/DeveloperGuide/catalog.rst → ...manuals/source/DeveloperGuide/catalog.rst b/...ls/main/source/DeveloperGuide/catalog.rst → ...manuals/source/DeveloperGuide/catalog.rst
diff --git a/.../source/DeveloperGuide/daemonprotocol.rst → .../source/DeveloperGuide/daemonprotocol.rst b/.../source/DeveloperGuide/daemonprotocol.rst → .../source/DeveloperGuide/daemonprotocol.rst
diff --git a/...source/DeveloperGuide/directorConsole.rst → ...source/DeveloperGuide/directorConsole.rst b/...source/DeveloperGuide/directorConsole.rst → ...source/DeveloperGuide/directorConsole.rst
diff --git a/...nuals/main/source/DeveloperGuide/file.rst → docs/manuals/source/DeveloperGuide/file.rst b/...nuals/main/source/DeveloperGuide/file.rst → docs/manuals/source/DeveloperGuide/file.rst
diff --git a/...in/source/DeveloperGuide/generaldevel.rst → ...ls/source/DeveloperGuide/generaldevel.rst b/...in/source/DeveloperGuide/generaldevel.rst → ...ls/source/DeveloperGuide/generaldevel.rst
diff --git a/...ls/main/source/DeveloperGuide/jobexec.rst → ...manuals/source/DeveloperGuide/jobexec.rst b/...ls/main/source/DeveloperGuide/jobexec.rst → ...manuals/source/DeveloperGuide/jobexec.rst
diff --git a/...e/DeveloperGuide/jobexec/backup-long.puml → ...e/DeveloperGuide/jobexec/backup-long.puml b/...e/DeveloperGuide/jobexec/backup-long.puml → ...e/DeveloperGuide/jobexec/backup-long.puml
diff --git a/.../DeveloperGuide/jobexec/backup-short.puml → .../DeveloperGuide/jobexec/backup-short.puml b/.../DeveloperGuide/jobexec/backup-short.puml → .../DeveloperGuide/jobexec/backup-short.puml
diff --git a/...ce/DeveloperGuide/jobexec/job_thread.puml → ...ce/DeveloperGuide/jobexec/job_thread.puml b/...ce/DeveloperGuide/jobexec/job_thread.puml → ...ce/DeveloperGuide/jobexec/job_thread.puml
diff --git a/...eveloperGuide/jobexec/localcopy-long.puml → ...eveloperGuide/jobexec/localcopy-long.puml b/...eveloperGuide/jobexec/localcopy-long.puml → ...eveloperGuide/jobexec/localcopy-long.puml
diff --git a/...veloperGuide/jobexec/localcopy-short.puml → ...veloperGuide/jobexec/localcopy-short.puml b/...veloperGuide/jobexec/localcopy-short.puml → ...veloperGuide/jobexec/localcopy-short.puml
diff --git a/...veloperGuide/jobexec/remotecopy-long.puml → ...veloperGuide/jobexec/remotecopy-long.puml b/...veloperGuide/jobexec/remotecopy-long.puml → ...veloperGuide/jobexec/remotecopy-long.puml
diff --git a/...eloperGuide/jobexec/remotecopy-short.puml → ...eloperGuide/jobexec/remotecopy-short.puml b/...eloperGuide/jobexec/remotecopy-short.puml → ...eloperGuide/jobexec/remotecopy-short.puml
diff --git a/...source/DeveloperGuide/jobexec/runjob.puml → ...source/DeveloperGuide/jobexec/runjob.puml b/...source/DeveloperGuide/jobexec/runjob.puml → ...source/DeveloperGuide/jobexec/runjob.puml
diff --git a/...ain/source/DeveloperGuide/mediaformat.rst → ...als/source/DeveloperGuide/mediaformat.rst b/...ain/source/DeveloperGuide/mediaformat.rst → ...als/source/DeveloperGuide/mediaformat.rst
diff --git a/...ls/main/source/DeveloperGuide/mempool.rst → ...manuals/source/DeveloperGuide/mempool.rst b/...ls/main/source/DeveloperGuide/mempool.rst → ...manuals/source/DeveloperGuide/mempool.rst
diff --git a/...s/main/source/DeveloperGuide/messages.rst → ...anuals/source/DeveloperGuide/messages.rst b/...s/main/source/DeveloperGuide/messages.rst → ...anuals/source/DeveloperGuide/messages.rst
diff --git a/...ain/source/DeveloperGuide/netprotocol.rst → ...als/source/DeveloperGuide/netprotocol.rst b/...ain/source/DeveloperGuide/netprotocol.rst → ...als/source/DeveloperGuide/netprotocol.rst
diff --git a/...ain/source/DeveloperGuide/pam-techdoc.rst → ...als/source/DeveloperGuide/pam-techdoc.rst b/...ain/source/DeveloperGuide/pam-techdoc.rst → ...als/source/DeveloperGuide/pam-techdoc.rst
diff --git a/...source/DeveloperGuide/platformsupport.rst → ...source/DeveloperGuide/platformsupport.rst b/...source/DeveloperGuide/platformsupport.rst → ...source/DeveloperGuide/platformsupport.rst
diff --git a/.../main/source/DeveloperGuide/pluginAPI.rst → ...nuals/source/DeveloperGuide/pluginAPI.rst b/.../main/source/DeveloperGuide/pluginAPI.rst → ...nuals/source/DeveloperGuide/pluginAPI.rst
diff --git a/...ls/main/source/DeveloperGuide/porting.rst → ...manuals/source/DeveloperGuide/porting.rst b/...ls/main/source/DeveloperGuide/porting.rst → ...manuals/source/DeveloperGuide/porting.rst
diff --git a/...main/source/DeveloperGuide/regression.rst → ...uals/source/DeveloperGuide/regression.rst b/...main/source/DeveloperGuide/regression.rst → ...uals/source/DeveloperGuide/regression.rst
diff --git a/...ain/source/DeveloperGuide/reservation.rst → ...als/source/DeveloperGuide/reservation.rst b/...ain/source/DeveloperGuide/reservation.rst → ...als/source/DeveloperGuide/reservation.rst
diff --git a/...loperGuide/reservation/ReserveDevice.puml → ...loperGuide/reservation/ReserveDevice.puml b/...loperGuide/reservation/ReserveDevice.puml → ...loperGuide/reservation/ReserveDevice.puml
diff --git a/...eloperGuide/reservation/UseDeviceCmd.puml → ...eloperGuide/reservation/UseDeviceCmd.puml b/...eloperGuide/reservation/UseDeviceCmd.puml → ...eloperGuide/reservation/UseDeviceCmd.puml
diff --git a/...ce/DeveloperGuide/reservation/legend.puml → ...ce/DeveloperGuide/reservation/legend.puml b/...ce/DeveloperGuide/reservation/legend.puml → ...ce/DeveloperGuide/reservation/legend.puml
diff --git a/...s/main/source/DeveloperGuide/smartall.rst → ...anuals/source/DeveloperGuide/smartall.rst b/...s/main/source/DeveloperGuide/smartall.rst → ...anuals/source/DeveloperGuide/smartall.rst
diff --git a/...ls/main/source/DeveloperGuide/storage.rst → ...manuals/source/DeveloperGuide/storage.rst b/...ls/main/source/DeveloperGuide/storage.rst → ...manuals/source/DeveloperGuide/storage.rst
diff --git a/...ain/source/DeveloperGuide/tls-techdoc.rst → ...als/source/DeveloperGuide/tls-techdoc.rst b/...ain/source/DeveloperGuide/tls-techdoc.rst → ...als/source/DeveloperGuide/tls-techdoc.rst
diff --git a/...s/main/source/DocumentationStyleGuide.rst → ...anuals/source/DocumentationStyleGuide.rst b/...s/main/source/DocumentationStyleGuide.rst → ...anuals/source/DocumentationStyleGuide.rst
diff --git a/...onStyleGuide/BareosSpecificFormatting.rst → ...onStyleGuide/BareosSpecificFormatting.rst b/...onStyleGuide/BareosSpecificFormatting.rst → ...onStyleGuide/BareosSpecificFormatting.rst
diff --git a/...pecificFormatting/BareosConfiguration.rst → ...pecificFormatting/BareosConfiguration.rst b/...pecificFormatting/BareosConfiguration.rst → ...pecificFormatting/BareosConfiguration.rst
@@ -88,7 +88,7 @@ Resource Directive
 Resource Directive Definition
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The documenation outline for resource directives is autogenerated (by https://github.com/bareos/bareos/blob/master/docs/manuals/scripts/generate-resoure-descriptions.py) and stored into the https://github.com/bareos/bareos/tree/master/docs/manuals/main/source/include/autogenerated/ directory.
+The documenation outline for resource directives is autogenerated (by https://github.com/bareos/bareos/blob/master/docs/manuals/scripts/generate-resoure-descriptions.py) and stored into the https://github.com/bareos/bareos/tree/master/docs/manuals/source/include/autogenerated/ directory.
 
 Internally, they can be referenced by the ``:config:option:`` directive.
 From extern, the URL to access them is

diff --git a/...eosSpecificFormatting/BareosHostNames.rst → ...eosSpecificFormatting/BareosHostNames.rst b/...eosSpecificFormatting/BareosHostNames.rst → ...eosSpecificFormatting/BareosHostNames.rst
diff --git a/...areosSpecificFormatting/BareosLogging.rst → ...areosSpecificFormatting/BareosLogging.rst b/...areosSpecificFormatting/BareosLogging.rst → ...areosSpecificFormatting/BareosLogging.rst
diff --git a/...ide/BareosSpecificFormatting/Bconsole.rst → ...ide/BareosSpecificFormatting/Bconsole.rst b/...ide/BareosSpecificFormatting/Bconsole.rst → ...ide/BareosSpecificFormatting/Bconsole.rst
diff --git a/...cificFormatting/DocumentFileStructure.rst → ...cificFormatting/DocumentFileStructure.rst b/...cificFormatting/DocumentFileStructure.rst → ...cificFormatting/DocumentFileStructure.rst
diff --git a/...e/BareosSpecificFormatting/Limitation.rst → ...e/BareosSpecificFormatting/Limitation.rst b/...e/BareosSpecificFormatting/Limitation.rst → ...e/BareosSpecificFormatting/Limitation.rst
diff --git a/...uide/BareosSpecificFormatting/Release.rst → ...uide/BareosSpecificFormatting/Release.rst b/...uide/BareosSpecificFormatting/Release.rst → ...uide/BareosSpecificFormatting/Release.rst
diff --git a/...Guide/BareosSpecificFormatting/Ticket.rst → ...Guide/BareosSpecificFormatting/Ticket.rst b/...Guide/BareosSpecificFormatting/Ticket.rst → ...Guide/BareosSpecificFormatting/Ticket.rst
diff --git a/...e/DocumentationStyleGuide/CommonNames.rst → ...e/DocumentationStyleGuide/CommonNames.rst b/...e/DocumentationStyleGuide/CommonNames.rst → ...e/DocumentationStyleGuide/CommonNames.rst
diff --git a/...ource/DocumentationStyleGuide/Gotchas.rst → ...ource/DocumentationStyleGuide/Gotchas.rst b/...ource/DocumentationStyleGuide/Gotchas.rst → ...ource/DocumentationStyleGuide/Gotchas.rst